feat: add new archive animations

Feichtmeier · Feichtmeier · commit d07309d6d5f8 · 2026-02-18T09:25:24.000+01:00
diff --git a/lib/app/view/mouse_and_keyboard_command_wrapper.dart b/lib/app/view/mouse_and_keyboard_command_wrapper.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter_it/flutter_it.dart';
 
 import '../../chat_room/input/draft_manager.dart';
@@ -25,18 +24,13 @@ class MouseAndKeyboardCommandWrapper extends StatelessWidget {
         _PasteIntent: CallbackAction<_PasteIntent>(
           onInvoke: (intent) async {
             if (di<ChatManager>().selectedRoom != null) {
-              await showFutureLoadingDialog(
-                context: context,
-                backLabel: context.l10n.cancel,
-                title: context.l10n.loadingPleaseWait,
-                future: () => di<DraftManager>().addAttachMentFromClipboard(
-                  di<ChatManager>().selectedRoom!.id,
-                  fileIsTooLarge: context.l10n.fileIsTooLarge,
-                  clipboardNotAvailable: context.l10n.clipboardNotAvailable,
-                  noSupportedFormatFoundInClipboard:
-                      context.l10n.noSupportedFormatFoundInClipboard,
-                ),
-              );
+              di<DraftManager>().addAttachmentFromClipboardCommand.run((
+                roomId: di<ChatManager>().selectedRoom!.id,
+                fileIsTooLarge: context.l10n.fileIsTooLarge,
+                clipboardNotAvailable: context.l10n.clipboardNotAvailable,
+                noSupportedFormatFoundInClipboard:
+                    context.l10n.noSupportedFormatFoundInClipboard,
+              ));
             }
             return null;
           },
diff --git a/lib/chat_master/view/chat_edit_room_mixin.dart b/lib/chat_master/view/chat_edit_room_mixin.dart
@@ -25,6 +25,7 @@ mixin ChatEditRoomMixin {
             ..clearSnackBars()
             ..showSnackBar(
               SnackBar(
+                showCloseIcon: true,
                 duration: const Duration(seconds: 3),
                 content: Text(
                   'Left: ${newValue.data?.getLocalizedDisplayname() ?? ''}',
@@ -89,13 +90,20 @@ mixin ChatEditRoomMixin {
             context,
             '${context.l10n.oopsSomethingWentWrong}: ${newValue.error}',
           );
-        } else if (newValue.hasData) {
+        }
+      },
+    );
+
+    registerHandler(
+      select: (EditRoomManager m) => m.forgetAllRoomsCommand.progress,
+      handler: (context, newValue, cancel) {
+        if (newValue == 1) {
           ScaffoldMessenger.of(context)
             ..clearSnackBars()
             ..showSnackBar(
               const SnackBar(
                 duration: Duration(seconds: 3),
-                content: Text('Deleted all archived rooms'),
+                content: Text('Clearing archive is complete'),
               ),
             );
         }
diff --git a/lib/chat_master/view/chat_master_clear_archive_button.dart b/lib/chat_master/view/chat_master_clear_archive_button.dart
@@ -6,16 +6,24 @@ import '../../chat_room/create_or_edit/edit_room_manager.dart';
 import '../../common/chat_manager.dart';
 import '../../l10n/l10n.dart';
 
-class ChatMasterClearArchiveButton extends StatelessWidget {
+class ChatMasterClearArchiveButton extends StatelessWidget with WatchItMixin {
   const ChatMasterClearArchiveButton({super.key});
 
   @override
-  Widget build(BuildContext context) => IconButton(
-    tooltip: context.l10n.clearArchive,
-    onPressed: () {
-      di<ChatManager>().setSelectedRoom(null);
-      di<EditRoomManager>().forgetAllRoomsCommand.run();
-    },
-    icon: const Icon(YaruIcons.edit_clear_all),
-  );
+  Widget build(BuildContext context) {
+    final result = watchValue(
+      (ChatManager m) => m.toggleArchiveCommand.results,
+    );
+
+    return IconButton(
+      tooltip: context.l10n.clearArchive,
+      onPressed: result.isRunning || result.data!.archivedRooms.isEmpty
+          ? null
+          : () {
+              di<ChatManager>().setSelectedRoom(null);
+              di<EditRoomManager>().forgetAllRoomsCommand.run();
+            },
+      icon: const Icon(YaruIcons.edit_clear_all),
+    );
+  }
 }
diff --git a/lib/chat_master/view/chat_master_title_bar.dart b/lib/chat_master/view/chat_master_title_bar.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:flutter_it/flutter_it.dart';
 import 'package:yaru/yaru.dart';
 
@@ -26,6 +25,11 @@ class ChatMasterTitleBar extends StatelessWidget with WatchItMixin {
     final archiveActive = watchPropertyValue(
       (ChatManager m) => m.archiveActive,
     );
+
+    final loadingArchive = watchValue(
+      (ChatManager m) => m.toggleArchiveCommand.isRunning,
+    );
+
     return YaruWindowTitleBar(
       heroTag: '<Left hero tag>',
       title: Text(archiveActive ? l10n.archive : l10n.chats),
@@ -52,10 +56,9 @@ class ChatMasterTitleBar extends StatelessWidget with WatchItMixin {
             tooltip: context.l10n.archive,
             selectedIcon: const Icon(YaruIcons.trash_filled),
             isSelected: watchPropertyValue((ChatManager m) => m.archiveActive),
-            onPressed: () => showFutureLoadingDialog(
-              context: context,
-              future: di<ChatManager>().toggleArchive,
-            ),
+            onPressed: loadingArchive
+                ? null
+                : () => di<ChatManager>().toggleArchiveCommand.run(),
             icon: const Icon(YaruIcons.trash),
           ),
         ],
diff --git a/lib/chat_master/view/chat_rooms_list.dart b/lib/chat_master/view/chat_rooms_list.dart
@@ -9,6 +9,14 @@ class ChatRoomsList extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
+    final loadingArchive = watchValue(
+      (ChatManager m) => m.toggleArchiveCommand.isRunning,
+    );
+
+    if (loadingArchive) {
+      return const SizedBox.shrink();
+    }
+
     final filteredRooms =
         watchStream(
           (ChatManager m) => m.filteredRoomsStream,
diff --git a/lib/chat_room/common/view/chat_no_selected_room_page.dart b/lib/chat_room/common/view/chat_no_selected_room_page.dart
@@ -3,11 +3,13 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_it/flutter_it.dart';
+import 'package:liquid_progress_indicator_v2/liquid_progress_indicator.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../../common/chat_manager.dart';
 import '../../../common/view/build_context_x.dart';
 import '../../../common/view/ui_constants.dart';
+import '../../../l10n/l10n.dart';
 import '../../create_or_edit/edit_room_manager.dart';
 import '../../titlebar/side_bar_button.dart';
 
@@ -40,6 +42,18 @@ class ChatNoSelectedRoomPage extends StatelessWidget with WatchItMixin {
       },
     );
 
+    final loadingArchive = watchValue(
+      (ChatManager m) => m.toggleArchiveCommand.isRunning,
+    );
+
+    final clearingArchive = watchValue(
+      (EditRoomManager m) => m.forgetAllRoomsCommand.isRunning,
+    );
+
+    final progress = watchValue(
+      (EditRoomManager m) => m.forgetAllRoomsCommand.progress,
+    );
+
     return Scaffold(
       appBar: YaruWindowTitleBar(
         heroTag: '<Right hero tag>',
@@ -61,12 +75,79 @@ class ChatNoSelectedRoomPage extends StatelessWidget with WatchItMixin {
             mainAxisSize: MainAxisSize.min,
             spacing: kBigPadding,
             children: [
-              Image.asset('assets/nebuchadnezzar.png', width: 100),
-              const Text('Please select a chatroom from the side panel.'),
+              loadingArchive
+                  ? LiquidCustomProgressIndicator(
+                      backgroundColor:
+                          context.theme.colorScheme.surfaceContainerHighest,
+                      direction: Axis.vertical,
+                      value: 0.5,
+                      shapePath: _buildArchiveIconPath(),
+                    )
+                  : clearingArchive
+                  ? LiquidCustomProgressIndicator(
+                      backgroundColor:
+                          context.theme.colorScheme.surfaceContainerHighest,
+                      direction: Axis.vertical,
+                      value: progress,
+                      shapePath: _buildBoatPath(),
+                    )
+                  : Image.asset('assets/nebuchadnezzar.png', width: 100),
+              Text(
+                loadingArchive || clearingArchive
+                    ? context.l10n.loadingPleaseWait
+                    : 'Please select a chatroom from the side panel.',
+              ),
             ],
           ),
         ),
       ),
     );
   }
+
+  Path _buildBoatPath() {
+    return Path()
+      ..moveTo(15, 120)
+      ..lineTo(0, 85)
+      ..lineTo(50, 85)
+      ..lineTo(50, 0)
+      ..lineTo(105, 80)
+      ..lineTo(60, 80)
+      ..lineTo(60, 85)
+      ..lineTo(120, 85)
+      ..lineTo(105, 120)
+      ..close();
+  }
+
+  Path _buildArchiveIconPath() {
+    final path = Path()
+      // 1. THE LID (Top Part)
+      // Starting at the bottom-left of the lid
+      ..moveTo(10, 35)
+      ..lineTo(90, 35) // Bottom edge of lid
+      ..lineTo(90, 20) // Right side
+      ..quadraticBezierTo(90, 10, 80, 10) // Top-right corner
+      ..lineTo(20, 10) // Top edge
+      ..quadraticBezierTo(10, 10, 10, 20) // Top-left corner
+      ..close()
+      // 2. THE BODY (Bottom Part)
+      ..moveTo(15, 40)
+      ..lineTo(85, 40) // Top edge of body
+      ..lineTo(85, 80) // Right side
+      ..quadraticBezierTo(85, 90, 75, 90) // Bottom-right corner
+      ..lineTo(25, 90) // Bottom edge
+      ..quadraticBezierTo(15, 90, 15, 80) // Bottom-left corner
+      ..close()
+      // 3. THE HANDLE (Slot)
+      // Adding a rounded rectangle cutout in the center
+      ..addRRect(
+        RRect.fromRectAndRadius(
+          const Rect.fromLTWH(35, 50, 30, 10),
+          const Radius.circular(5),
+        ),
+      )
+      // Set the fill type to evenOdd so the handle appears as a "hole"
+      ..fillType = PathFillType.evenOdd;
+
+    return path;
+  }
 }
diff --git a/lib/chat_room/input/draft_manager.dart b/lib/chat_room/input/draft_manager.dart
@@ -395,6 +395,25 @@ class DraftManager extends SafeChangeNotifier {
   bool isMessageSelected({required String eventId}) =>
       _selectedMessages[eventId] ?? false;
 
+  late final Command<
+    ({
+      String roomId,
+      String clipboardNotAvailable,
+      String noSupportedFormatFoundInClipboard,
+      String fileIsTooLarge,
+    }),
+    List<void>
+  >
+  addAttachmentFromClipboardCommand = Command.createAsync(
+    (param) => addAttachMentFromClipboard(
+      param.roomId,
+      clipboardNotAvailable: param.clipboardNotAvailable,
+      noSupportedFormatFoundInClipboard:
+          param.noSupportedFormatFoundInClipboard,
+      fileIsTooLarge: param.fileIsTooLarge,
+    ),
+    initialValue: [],
+  );
   Future<List<void>> addAttachMentFromClipboard(
     String roomId, {
     required String clipboardNotAvailable,
diff --git a/lib/chat_room/input/view/chat_input.dart b/lib/chat_room/input/view/chat_input.dart
@@ -86,9 +86,9 @@ class _ChatInputState extends State<ChatInput> {
         _sendNode.requestFocus();
       });
     } else {
-      di<DraftManager>().sendCommand.run(widget.room);
       _sendController.clear();
       _sendNode.requestFocus();
+      di<DraftManager>().sendCommand.run(widget.room);
     }
   }
 
@@ -104,6 +104,10 @@ class _ChatInputState extends State<ChatInput> {
       (ChatManager m) => m.archiveActive,
     );
 
+    final isPastingFromClipboard = watchValue(
+      (DraftManager m) => m.addAttachmentFromClipboardCommand.isRunning,
+    );
+
     final isSending = watchValue((DraftManager m) => m.sendCommand.isRunning);
 
     final sendingFile = draftFiles.isNotEmpty && isSending;
@@ -177,7 +181,7 @@ class _ChatInputState extends State<ChatInput> {
                   maxLines: 10,
                   focusNode: _sendNode,
                   controller: _sendController,
-                  enabled: sendingFile
+                  enabled: sendingFile || isPastingFromClipboard
                       ? false
                       : !archiveActive && !unAcceptedDirectChat,
                   autofocus: true,
@@ -258,15 +262,21 @@ class _ChatInputState extends State<ChatInput> {
                     suffixIcon: Row(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        IconButton(
-                          tooltip: l10n.send,
-                          padding: EdgeInsets.zero,
-                          icon: transform,
-                          onPressed:
-                              attaching || archiveActive || unAcceptedDirectChat
-                              ? null
-                              : () => send(),
-                        ),
+                        if (isPastingFromClipboard ||
+                            attaching ||
+                            unAcceptedDirectChat)
+                          const SizedBox(
+                            width: 20,
+                            height: 20,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        else
+                          IconButton(
+                            tooltip: l10n.send,
+                            padding: EdgeInsets.zero,
+                            icon: transform,
+                            onPressed: () => send(),
+                          ),
                       ],
                     ),
                   ),
diff --git a/lib/common/chat_manager.dart b/lib/common/chat_manager.dart
@@ -170,14 +170,27 @@ class ChatManager extends SafeChangeNotifier {
 
   bool _archiveActive = false;
   bool get archiveActive => _archiveActive;
-  Future<void> toggleArchive() async {
+
+  late final Command<
+    void,
+    ({bool archiveActive, List<ArchivedRoom> archivedRooms})
+  >
+  toggleArchiveCommand = Command.createAsyncNoParam(
+    _toggleArchive,
+    initialValue: (archiveActive: false, archivedRooms: _client.archivedRooms),
+  );
+
+  Future<({bool archiveActive, List<ArchivedRoom> archivedRooms})>
+  _toggleArchive() async {
     _archiveActive = !_archiveActive;
     if (_archiveActive) {
+      setSelectedRoom(null);
       await _client.loadArchive();
-    } else {
-      await Future.value();
     }
-    setSelectedRoom(null);
+    return (
+      archiveActive: _archiveActive,
+      archivedRooms: _client.archivedRooms,
+    );
   }
 
   Stream<bool> getPendingDirectChatStream(Room room) => _client
