feat: enhance threads, bubble UI and download commands (#131)

Feichtmeier · web-flow · commit 3f157a7c9d72 · 2026-02-14T16:18:25.000Z
diff --git a/lib/chat_room/common/view/chat_room_page.dart b/lib/chat_room/common/view/chat_room_page.dart
@@ -72,6 +72,8 @@ class _ChatRoomPageState extends State<ChatRoomPage> {
       (TimelineManager m) => m.getUpdatingTimeline(widget.room.id),
     );
 
+    final threadeMode = watchPropertyValue((DraftManager m) => m.threadMode);
+
     registerStreamHandler(
       select: (ChatManager m) => m.getLeftRoomStream(widget.room.id),
       handler: (context, leftRoomUpdate, cancel) {
@@ -133,12 +135,13 @@ class _ChatRoomPageState extends State<ChatRoomPage> {
               key: chatRoomScaffoldKey,
               endDrawer: ChatRoomInfoDrawer(room: widget.room),
               appBar: ChatRoomTitleBar(room: widget.room),
-              bottomNavigationBar: widget.room.isArchived || widget.room.isSpace
-                  ? null
-                  : ChatInput(
-                      key: ValueKey('${widget.room.id}input'),
-                      room: widget.room,
-                    ),
+              bottomNavigationBar: AnimatedSwitcher(
+                duration: const Duration(milliseconds: 400),
+                child:
+                    widget.room.isArchived || widget.room.isSpace || threadeMode
+                    ? const SizedBox.shrink()
+                    : ChatInput(room: widget.room),
+              ),
               body: FutureBuilder<Timeline>(
                 key: ValueKey(widget.room.id),
                 future: _timelineFuture,
diff --git a/lib/chat_room/input/draft_manager.dart b/lib/chat_room/input/draft_manager.dart
@@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:collection/collection.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:file_selector/file_selector.dart';
+import 'package:flutter_it/flutter_it.dart';
 import 'package:matrix/matrix.dart';
 import 'package:mime/mime.dart';
 import 'package:path/path.dart' as p;
@@ -21,11 +22,24 @@ class DraftManager extends SafeChangeNotifier {
     required Client client,
     required LocalImageService localImageService,
   }) : _client = client,
-       _localImageService = localImageService;
+       _localImageService = localImageService {
+    sendCommand = Command.createAsync(
+      (room) => send(room: room),
+      initialValue: null,
+    );
+  }
 
   final Client _client;
   final LocalImageService _localImageService;
 
+  bool _threadMode = false;
+  bool get threadMode => _threadMode;
+  void setThreadMode(bool value) {
+    if (value == _threadMode) return;
+    _threadMode = value;
+    notifyListeners();
+  }
+
   Event? _replyEvent;
   Event? get replyEvent => _replyEvent;
   void setReplyEvent(Event? event, {bool notify = true}) {
@@ -74,7 +88,9 @@ class DraftManager extends SafeChangeNotifier {
     _threadRootEventId = null;
   }
 
-  Future<void> send({required Room room, String? text}) async {
+  late final Command<Room, void> sendCommand;
+
+  Future<void> send({required Room room}) async {
     try {
       await room.setTyping(false);
     } on Exception catch (e, s) {
diff --git a/lib/chat_room/input/view/chat_input.dart b/lib/chat_room/input/view/chat_input.dart
@@ -4,7 +4,6 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_it/flutter_it.dart';
-import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
 import 'package:yaru/yaru.dart';
 
@@ -48,8 +47,6 @@ class _ChatInputState extends State<ChatInput> {
         // Check if the "@"-Key has been pressed
         if (_sendController.text.contains('@')) {
           printMessageInDebugMode('@ key pressed');
-
-          return KeyEventResult.handled;
         }
 
         final enterPressedWithoutShift =
@@ -63,7 +60,7 @@ class _ChatInputState extends State<ChatInput> {
             );
 
         if (enterPressedWithoutShift) {
-          send(context);
+          send();
           return KeyEventResult.handled;
         } else if (event is KeyRepeatEvent) {
           // Disable holding enter
@@ -82,33 +79,14 @@ class _ChatInputState extends State<ChatInput> {
     super.dispose();
   }
 
-  Future<void> send(BuildContext context) async =>
-      di<DraftManager>().filesDrafts.containsKey(widget.room.id) &&
-          di<DraftManager>().filesDrafts[widget.room.id]!.isNotEmpty
-      ? showFutureLoadingDialog(
-          context: context,
-          title: context.l10n.sendingAttachment,
-          future: () => di<DraftManager>()
-              .send(room: widget.room)
-              .timeout(const Duration(seconds: 30)),
-          barrierDismissible: true,
-          backLabel: context.l10n.close,
-          onError: (error) {
-            if (error is TimeoutException) {
-              return context.l10n.oopsSomethingWentWrong;
-            }
-            return error.toString();
-          },
-        ).then((res) {
-          if (res.isValue) {
-            _sendController.clear();
-            _sendNode.requestFocus();
-          }
-        })
-      : di<DraftManager>().send(room: widget.room).then((_) {
-          _sendController.clear();
-          _sendNode.requestFocus();
-        });
+  void send() {
+    final isRunning = di<DraftManager>().sendCommand.isRunning;
+    if (isRunning.value) return;
+    di<DraftManager>().sendCommand.runAsync(widget.room).then((_) {
+      _sendController.clear();
+      _sendNode.requestFocus();
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -122,6 +100,8 @@ class _ChatInputState extends State<ChatInput> {
       (ChatManager m) => m.archiveActive,
     );
 
+    final sending = watchValue((DraftManager m) => m.sendCommand.isRunning);
+
     final replyEvent = watchPropertyValue((DraftManager m) => m.replyEvent);
 
     final editEvent = watchPropertyValue(
@@ -274,9 +254,12 @@ class _ChatInputState extends State<ChatInput> {
                           padding: EdgeInsets.zero,
                           icon: transform,
                           onPressed:
-                              attaching || archiveActive || unAcceptedDirectChat
+                              sending ||
+                                  attaching ||
+                                  archiveActive ||
+                                  unAcceptedDirectChat
                               ? null
-                              : () async => send(context),
+                              : () => send(),
                         ),
                       ],
                     ),
diff --git a/lib/chat_room/timeline/chat_room_pinned_events_dialog.dart b/lib/chat_room/timeline/chat_room_pinned_events_dialog.dart
@@ -81,7 +81,7 @@ class _ChatRoomPinnedEventTileState extends State<ChatRoomPinnedEventTile> {
               event: s.data!,
               timeline: widget.timeline,
               onReplyOriginClick: (p0) async {},
-              eventPosition: EventPosition.semanticSingle,
+              eventPosition: EventPosition.single,
             )
           : const Text(''),
     );
diff --git a/lib/chat_room/timeline/chat_room_timeline_list.dart b/lib/chat_room/timeline/chat_room_timeline_list.dart
@@ -111,24 +111,27 @@ class _ChatRoomTimelineListState extends State<ChatRoomTimelineList> {
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       if (!event.hideInTimeline(
-                            showAvatarChanges: showAvatarChanges,
-                            showDisplayNameChanges: showDisplayNameChanges,
-                          ) &&
-                          !event
-                              .getDisplayEvent(widget.timeline)
-                              .hideInTimeline(
-                                showAvatarChanges: showAvatarChanges,
-                                showDisplayNameChanges: showDisplayNameChanges,
-                              )) ...[
+                        showAvatarChanges: showAvatarChanges,
+                        showDisplayNameChanges: showDisplayNameChanges,
+                      )) ...[
                         if (previous != null &&
+                            !previous.hideInTimeline(
+                              showAvatarChanges: showAvatarChanges,
+                              showDisplayNameChanges: showDisplayNameChanges,
+                            ) &&
                             event.originServerTs.toLocal().day !=
                                 previous.originServerTs.toLocal().day)
-                          Text(
-                            previous.originServerTs
-                                .toLocal()
-                                .formatAndLocalizeDay(context),
-                            textAlign: TextAlign.center,
-                            style: theme.textTheme.labelSmall,
+                          Padding(
+                            padding: const EdgeInsets.all(8.0),
+                            child: Text(
+                              previous.originServerTs
+                                  .toLocal()
+                                  .formatAndLocalizeDay(context),
+                              textAlign: TextAlign.center,
+                              style: theme.textTheme.labelSmall?.copyWith(
+                                color: theme.colorScheme.onSurfaceVariant,
+                              ),
+                            ),
                           ),
                         RepaintBoundary(
                           child: ChatEventTile(
diff --git a/lib/chat_room/timeline/chat_thread_dialog.dart b/lib/chat_room/timeline/chat_thread_dialog.dart
@@ -42,12 +42,19 @@ class _ChatThreadDialogState extends State<ChatThreadDialog> {
             .eventId,
         notify: false,
       );
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      di<DraftManager>().setThreadMode(true);
+    });
   }
 
   @override
   void dispose() {
     super.dispose();
     di<DraftManager>().resetThreadIds();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      di<DraftManager>().setThreadMode(false);
+    });
   }
 
   @override
@@ -89,7 +96,7 @@ class _ChatThreadDialogState extends State<ChatThreadDialog> {
               event: threadChild,
               timeline: widget.timeline,
               onReplyOriginClick: widget.onReplyOriginClick,
-              eventPosition: EventPosition.semanticSingle,
+              eventPosition: EventPosition.single,
               allowNormalReply: false,
             );
           },
diff --git a/lib/common/view/theme.dart b/lib/common/view/theme.dart
@@ -47,7 +47,7 @@ Color getTileColor(bool isUserEvent, ThemeData theme) {
 
   return isUserEvent
       ? userColor
-      : getMonochromeBg(theme: theme, factor: 6, darkFactor: 15);
+      : getMonochromeBg(theme: theme, factor: 6, darkFactor: 18);
 }
 
 Color getTileIconColor(ThemeData theme) {
diff --git a/lib/events/chat_download_manager.dart b/lib/events/chat_download_manager.dart
@@ -1,8 +1,10 @@
 import 'dart:async';
 
+import 'package:flutter_it/flutter_it.dart';
 import 'package:matrix/matrix.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
+import '../extensions/event_x.dart';
 import 'chat_download_service.dart';
 
 class ChatDownloadManager extends SafeChangeNotifier {
@@ -16,6 +18,25 @@ class ChatDownloadManager extends SafeChangeNotifier {
   final ChatDownloadService _service;
   StreamSubscription<bool>? _propertiesChangedSub;
 
+  final _downloadCommands = <Event, Command<void, MatrixFile?>>{};
+  Command<void, MatrixFile?> getDownloadCommand(Event event) =>
+      _downloadCommands.putIfAbsent(
+        event,
+        () => Command.createAsyncWithProgress(
+          (_, handle) => event.downloadAndDecryptAttachment(
+            onDownloadProgress: (v) {
+              // the amount of downloaded bytes is v
+              // the total size of the file is event.fileSize
+              final progress = event.fileSize != null && event.fileSize! > 0
+                  ? v / event.fileSize!
+                  : null;
+              handle.updateProgress(progress ?? 0);
+            },
+          ),
+          initialValue: null,
+        ),
+      );
+
   String? isEventDownloaded(Event event) => _service.isEventDownloaded(event);
   Future<void> safeFile({
     required Event event,
diff --git a/lib/events/view/chat_message_bubble.dart b/lib/events/view/chat_message_bubble.dart
@@ -36,21 +36,23 @@ class ChatMessageBubble extends StatelessWidget {
         minWidth: ChatMessageBubble.minWidth,
       ),
       child: Container(
-        margin:
-            const EdgeInsets.symmetric(
-              horizontal: kSmallPadding,
-              vertical: kTinyPadding,
-            ).copyWith(
-              top: event.isImage
-                  ? null
-                  : eventPosition == EventPosition.top
-                  ? kMediumPadding
-                  : null,
-            ),
-        padding: const EdgeInsets.only(
-          top: kSmallPadding,
-          bottom: kSmallPadding,
+        margin: const EdgeInsets.symmetric(vertical: kTinyPadding).copyWith(
+          top: event.isImage
+              ? null
+              : eventPosition == EventPosition.top
+              ? kMediumPadding
+              : null,
         ),
+        padding: switch (eventPosition) {
+          EventPosition.single => const EdgeInsets.symmetric(
+            vertical: kSmallPadding,
+          ),
+          EventPosition.top => const EdgeInsets.only(top: kMediumPadding),
+          EventPosition.middle => const EdgeInsets.symmetric(
+            vertical: kTinyPadding,
+          ),
+          EventPosition.bottom => const EdgeInsets.only(bottom: kMediumPadding),
+        },
         child: ChatMessageBubbleContent(
           color: color,
           eventPosition: eventPosition,
diff --git a/lib/events/view/chat_message_bubble_content.dart b/lib/events/view/chat_message_bubble_content.dart
diff --git a/lib/events/view/chat_message_media_avatar.dart b/lib/events/view/chat_message_media_avatar.dart
diff --git a/lib/extensions/event_x.dart b/lib/extensions/event_x.dart
diff --git a/lib/player/view/player_control_mixin.dart b/lib/player/view/player_control_mixin.dart

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class _ChatRoomPinnedEventTileState extends State<ChatRoomPinnedEventTile> {`
`81`	`81`	`event: s.data!,`
`82`	`82`	`timeline: widget.timeline,`
`83`	`83`	`onReplyOriginClick: (p0) async {},`
`84`		`- eventPosition: EventPosition.semanticSingle,`
	`84`	`+ eventPosition: EventPosition.single,`
`85`	`85`	`)`
`86`	`86`	`: const Text(''),`
`87`	`87`	`);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ Color getTileColor(bool isUserEvent, ThemeData theme) {`
`47`	`47`
`48`	`48`	`return isUserEvent`
`49`	`49`	`? userColor`
`50`		`- : getMonochromeBg(theme: theme, factor: 6, darkFactor: 15);`
	`50`	`+ : getMonochromeBg(theme: theme, factor: 6, darkFactor: 18);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`Color getTileIconColor(ThemeData theme) {`