Chat muting/unmuting (#63)

lib/ui/page/home/tab/chats/controller.dart

@@ -17,7 +17,6 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:async/async.dart';
 import 'package:get/get.dart';
 
 import '/domain/model/chat.dart';
@@ -57,26 +56,6 @@ class ChatsTabController extends GetxController {
   /// Reactive list of sorted [Chat]s.
   late final RxList<RxChat> chats;
 
-  /// List of the mute periods.
-  ///
-  /// `null` meaning mute forever.
-  final List<Duration?> muteDateTimes = [
-    const Duration(minutes: 15),
-    const Duration(minutes: 30),
-    const Duration(hours: 1),
-    const Duration(hours: 6),
-    const Duration(hours: 12),
-    const Duration(days: 1),
-    const Duration(days: 7),
-    null,
-  ];
-
-  /// Indicates whether the mute chat dialog is opened or not.
-  final Rx<ChatId?> openedMuteDialogChatId = Rx<ChatId?>(null);
-
-  /// [CancelableOperation] of mute popup.
-  final Rx<CancelableOperation?> mutePopup = Rx<CancelableOperation?>(null);
-
   /// [Chat]s service used to update the [chats].
   final ChatService _chatService;
 
@@ -122,9 +101,6 @@ class ChatsTabController extends GetxController {
           break;
 
         case OperationKind.removed:
-          if (openedMuteDialogChatId.value == event.key) {
-            mutePopup.value?.cancel();
-          }
           _sortingData.remove(event.key)?.dispose();
           chats.removeWhere((e) => e.chat.value.id == event.key);
           break;

lib/ui/page/home/tab/chats/view.dart

@@ -21,12 +21,12 @@ import 'package:get/get.dart';
 import '/domain/repository/chat.dart';
 import '/l10n/l10n.dart';
 import '/ui/page/home/widget/app_bar.dart';
-import '/ui/page/home/widget/confirm_dialog.dart';
 import '/ui/widget/menu_interceptor/menu_interceptor.dart';
 import '/ui/widget/svg/svg.dart';
 import '/ui/widget/widget_button.dart';
 import 'controller.dart';
 import 'create_group/controller.dart';
+import 'widget/mute_chat_popup.dart';
 import 'widget/recent_chat.dart';
 
 /// View of the `HomeTab.chats` tab.
@@ -100,38 +100,15 @@ class ChatsTabView extends StatelessWidget {
                                   onLeave: () => c.leaveChat(chat.id),
                                   onHide: () => c.hideChat(chat.id),
                                   inCall: () => c.inCall(chat.id),
-                                  muteDialogOpened: () async {
-                                    c.openedMuteDialogChatId.value = chat.id;
-                                    c.mutePopup.value =
-                                        await ConfirmDialog.showCancelable(
-                                      context,
-                                      title: 'label_mute_chat_for'.l10n,
-                                      onClosed: () {
-                                        c.openedMuteDialogChatId.value = null;
-                                      },
-                                      variants: c.muteDateTimes
-                                          .map(
-                                            (e) => ConfirmDialogVariant(
-                                              onProceed: () => c.muteChat(
-                                                chat.id,
-                                                duration: e,
-                                              ),
-                                              child: Text(
-                                                'label_mute_for'.l10nfmt({
-                                                  'days': e?.inDays ?? 0,
-                                                  'hours': e?.inHours ?? 0,
-                                                  'minutes': e?.inMinutes ?? 0,
-                                                }),
-                                                key: e == null
-                                                    ? const Key('MuteForever')
-                                                    : null,
-                                              ),
-                                            ),
-                                          )
-                                          .toList(),
-                                    );
-                                  },
-                                  unmuteChat: () => c.unmuteChat(chat.id),
+                                  onMuteDialogOpened: () => MuteChatPopup.show(
+                                    context,
+                                    chatId: chat.id,
+                                    onMute: (duration) => c.muteChat(
+                                      chat.id,
+                                      duration: duration,
+                                    ),
+                                  ),
+                                  onUnmuteChat: () => c.unmuteChat(chat.id),
                                 ),
                               ),
                             ),

lib/ui/page/home/tab/chats/widget/mute_chat_popup.dart

@@ -0,0 +1,76 @@
+// Copyright © 2022 IT ENGINEERING MANAGEMENT INC, <https://github.com/team113>
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Affero General Public License v3.0 as published by the
+// Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License v3.0 for
+// more details.
+//
+// You should have received a copy of the GNU Affero General Public License v3.0
+// along with this program. If not, see
+// <https://www.gnu.org/licenses/agpl-3.0.html>.
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import '/domain/model/chat.dart';
+import '/domain/service/chat.dart';
+import '/l10n/l10n.dart';
+import '/ui/page/home/widget/confirm_dialog.dart';
+import '/ui/widget/modal_popup.dart';
+import '/util/obs/obs.dart';
+
+class MuteChatPopup {
+  static void show(
+    BuildContext context, {
+    Function(Duration? duration)? onMute,
+    required ChatId chatId,
+  }) async {
+    // [Chat]s service.
+    final ChatService chatService = Get.find();
+
+    // Subscription for [ChatService.chats] changes.
+    final chatsSubscription = chatService.chats.changes.listen((event) {
+      if (event.op == OperationKind.removed && chatId == event.key) {
+        Navigator.of(context).pop();
+      }
+    });
+
+    await ModalPopup.show<ConfirmDialog?>(
+      context: context,
+      child: ConfirmDialog(
+        title: 'label_mute_chat_for'.l10n,
+        variants: const [
+          Duration(minutes: 15),
+          Duration(minutes: 30),
+          Duration(hours: 1),
+          Duration(hours: 6),
+          Duration(hours: 12),
+          Duration(days: 1),
+          Duration(days: 7),
+          null,
+        ]
+            .map(
+              (e) => ConfirmDialogVariant(
+                onProceed: () => onMute?.call(e),
+                child: Text(
+                  'label_mute_for'.l10nfmt({
+                    'days': e?.inDays ?? 0,
+                    'hours': e?.inHours ?? 0,
+                    'minutes': e?.inMinutes ?? 0,
+                  }),
+                  key: e == null ? const Key('MuteForever') : null,
+                ),
+              ),
+            )
+            .toList(),
+      ),
+    );
+
+    chatsSubscription.cancel();
+  }
+}

lib/ui/page/home/tab/chats/widget/recent_chat.dart

@@ -50,8 +50,8 @@ class RecentChatTile extends StatelessWidget {
     this.onHide,
     this.onDrop,
     this.onJoin,
-    this.muteDialogOpened,
-    this.unmuteChat,
+    this.onMuteDialogOpened,
+    this.onUnmuteChat,
   }) : super(key: key);
 
   /// [RxChat] this [RecentChatTile] is about.
@@ -83,10 +83,10 @@ class RecentChatTile extends StatelessWidget {
   final void Function()? onJoin;
 
   /// Callback, called when open mute dialog action is triggered.
-  final void Function()? muteDialogOpened;
+  final void Function()? onMuteDialogOpened;
 
   /// Callback, called when this [rxChat] unmute action is triggered.
-  final void Function()? unmuteChat;
+  final void Function()? onUnmuteChat;
 
   @override
   Widget build(BuildContext context) {
@@ -174,12 +174,12 @@ class RecentChatTile extends StatelessWidget {
               ? ContextMenuButton(
                   key: const Key('MuteChatButton'),
                   label: 'btn_mute_chat'.l10n,
-                  onPressed: muteDialogOpened,
+                  onPressed: onMuteDialogOpened,
                 )
               : ContextMenuButton(
                   key: const Key('UnmuteChatButton'),
                   label: 'btn_unmute_chat'.l10n,
-                  onPressed: unmuteChat,
+                  onPressed: onUnmuteChat,
                 ),
         ],
         selected: selected,

lib/ui/page/home/widget/confirm_dialog.dart

@@ -14,7 +14,6 @@
 // along with this program. If not, see
 // <https://www.gnu.org/licenses/agpl-3.0.html>.
 
-import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 
 import '/l10n/l10n.dart';
@@ -54,37 +53,6 @@ class ConfirmDialog extends StatefulWidget {
   /// Optional description to display above the [variants].
   final String? description;
 
-  /// Returns [CancelableOperation] and displays a [ConfirmDialog] wrapped in
-  /// a [ModalPopup].
-  static Future<CancelableOperation> showCancelable(
-    BuildContext context, {
-    String? description,
-    Function? onClosed,
-    required String title,
-    required List<ConfirmDialogVariant> variants,
-  }) async {
-    bool isClosed = false;
-    return CancelableOperation.fromFuture(
-      Future(() async {
-        await ModalPopup.show<ConfirmDialog?>(
-          context: context,
-          child: ConfirmDialog(
-            description: description,
-            title: title,
-            variants: variants,
-          ),
-        );
-        isClosed = true;
-        onClosed?.call();
-      }),
-      onCancel: () {
-        if (!isClosed) {
-          Navigator.of(context).pop();
-        }
-      },
-    );
-  }
-
   /// Displays a [ConfirmDialog] wrapped in a [ModalPopup].
   static Future<ConfirmDialog?> show(
     BuildContext context, {