krille-chan#84 FluffyChat: read receipt icon added to chat input row …

…on mobile
OpenSchulcampusTools · Mar 29, 2023 · de95407 · de95407
1 parent af12ca4
commit de95407
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 23 deletions.
diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
@@ -13,6 +13,7 @@ import 'package:fluffychat/widgets/matrix.dart';
 import '../../config/themes.dart';
 import 'chat.dart';
 import 'input_bar.dart';
+import 'read_receipt/chat_input_row_read_receipt_button.dart';
 
 class ChatInputRow extends StatelessWidget {
   final ChatController controller;
@@ -253,36 +254,22 @@ class ChatInputRow extends StatelessWidget {
                 Container(
                   height: 56,
                   alignment: Alignment.center,
-                  child: IconButton(
-                    tooltip: L10n.of(context)!.voiceMessage,
-                    icon: const Icon(Icons.mic_none_outlined),
-                    onPressed: controller.voiceMessageAction,
-                  ),
+                  child: Row(children: [
+                    ChatInputRowReadReceiptButton(controller),
+                    IconButton(
+                      tooltip: L10n.of(context)!.voiceMessage,
+                      icon: const Icon(Icons.mic_none_outlined),
+                      onPressed: controller.voiceMessageAction,
+                    )
+                  ]),
                 ),
               if (!PlatformInfos.isMobile || controller.inputText.isNotEmpty)
                 Container(
                   height: 56,
                   alignment: Alignment.center,
                   child: Row(
                     children: [
-                      if (controller.showReadReceiptButton())
-                        controller.requireReadReceipt
-                            ? IconButton(
-                                tooltip: L10n.of(context)!.readReceiptOff,
-                                icon: const Icon(
-                                  Icons.mark_chat_read,
-                                  color: AppConfig.primaryColor,
-                                ),
-                                onPressed: controller.toggleReadReceiptAction,
-                              )
-                            : IconButton(
-                                tooltip: L10n.of(context)!.readReceiptOn,
-                                icon: const Icon(
-                                  Icons.mark_chat_read_outlined,
-                                  color: Colors.grey,
-                                ),
-                                onPressed: controller.toggleReadReceiptAction,
-                              ),
+                      ChatInputRowReadReceiptButton(controller),
                       IconButton(
                           icon: const Icon(Icons.send_outlined),
                           onPressed: controller.send,

diff --git a/lib/pages/chat/read_receipt/chat_input_row_read_receipt_button.dart b/lib/pages/chat/read_receipt/chat_input_row_read_receipt_button.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_gen/gen_l10n/l10n.dart';
+
+import 'package:fluffychat/config/app_config.dart';
+import '../chat.dart';
+
+class ChatInputRowReadReceiptButton extends StatelessWidget {
+  final ChatController controller;
+
+  const ChatInputRowReadReceiptButton(this.controller, {Key? key})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (controller.showReadReceiptButton()) {
+      if (controller.requireReadReceipt) {
+        return IconButton(
+          tooltip: L10n.of(context)!.readReceiptOff,
+          icon: const Icon(
+            Icons.mark_chat_read,
+            color: AppConfig.primaryColor,
+          ),
+          onPressed: controller.toggleReadReceiptAction,
+        );
+      } else {
+        return IconButton(
+          tooltip: L10n.of(context)!.readReceiptOn,
+          icon: const Icon(
+            Icons.mark_chat_read_outlined,
+            color: Colors.grey,
+          ),
+          onPressed: controller.toggleReadReceiptAction,
+        );
+      }
+    } else {
+      return Container();
+    }
+  }
+}