refactor: Improved share / forward dialog

lib/config/routes.dart

@@ -35,6 +35,7 @@ import 'package:fluffychat/widgets/layouts/empty_page.dart';
 import 'package:fluffychat/widgets/layouts/two_column_layout.dart';
 import 'package:fluffychat/widgets/log_view.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:fluffychat/widgets/share_scaffold_dialog.dart';
 
 abstract class AppRoutes {
   static FutureOr<String?> loggedInRedirect(
@@ -318,15 +319,25 @@ abstract class AppRoutes {
             ),
             GoRoute(
               path: ':roomid',
-              pageBuilder: (context, state) => defaultPageBuilder(
-                context,
-                state,
-                ChatPage(
-                  roomId: state.pathParameters['roomid']!,
-                  shareText: state.uri.queryParameters['body'],
-                  eventId: state.uri.queryParameters['event'],
-                ),
-              ),
+              pageBuilder: (context, state) {
+                final body = state.uri.queryParameters['body'];
+                var shareItems = state.extra is List<ShareItem>
+                    ? state.extra as List<ShareItem>
+                    : null;
+                if (body != null && body.isNotEmpty) {
+                  shareItems ??= [];
+                  shareItems.add(TextShareItem(body));
+                }
+                return defaultPageBuilder(
+                  context,
+                  state,
+                  ChatPage(
+                    roomId: state.pathParameters['roomid']!,
+                    shareItems: shareItems,
+                    eventId: state.uri.queryParameters['event'],
+                  ),
+                );
+              },
               redirect: loggedOutRedirect,
               routes: [
                 GoRoute(

lib/pages/chat/chat.dart

@@ -32,23 +32,25 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
+import 'package:fluffychat/utils/show_scaffold_dialog.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:fluffychat/widgets/share_scaffold_dialog.dart';
 import '../../utils/account_bundles.dart';
 import '../../utils/localized_exception_extension.dart';
 import 'send_file_dialog.dart';
 import 'send_location_dialog.dart';
 
 class ChatPage extends StatelessWidget {
   final String roomId;
-  final String? shareText;
+  final List<ShareItem>? shareItems;
   final String? eventId;
 
   const ChatPage({
     super.key,
     required this.roomId,
     this.eventId,
-    this.shareText,
+    this.shareItems,
   });
 
   @override
@@ -69,21 +71,21 @@ class ChatPage extends StatelessWidget {
     return ChatPageWithRoom(
       key: Key('chat_page_${roomId}_$eventId'),
       room: room,
-      shareText: shareText,
+      shareItems: shareItems,
       eventId: eventId,
     );
   }
 }
 
 class ChatPageWithRoom extends StatefulWidget {
   final Room room;
-  final String? shareText;
+  final List<ShareItem>? shareItems;
   final String? eventId;
 
   const ChatPageWithRoom({
     super.key,
     required this.room,
-    this.shareText,
+    this.shareItems,
     this.eventId,
   });
 
@@ -224,18 +226,42 @@ class ChatController extends State<ChatPageWithRoom>
 
   void _loadDraft() async {
     final prefs = await SharedPreferences.getInstance();
-    final draft = widget.shareText ?? prefs.getString('draft_$roomId');
+    final draft = prefs.getString('draft_$roomId');
     if (draft != null && draft.isNotEmpty) {
       sendController.text = draft;
     }
   }
 
+  void _shareItems([_]) {
+    final shareItems = widget.shareItems;
+    if (shareItems == null || shareItems.isEmpty) return;
+    for (final item in shareItems) {
+      if (item is FileShareItem) continue;
+      if (item is TextShareItem) room.sendTextEvent(item.value);
+      if (item is ContentShareItem) room.sendEvent(item.value);
+    }
+    final files = shareItems
+        .whereType<FileShareItem>()
+        .map((item) => item.value)
+        .toList();
+    if (files.isEmpty) return;
+    showAdaptiveDialog(
+      context: context,
+      builder: (c) => SendFileDialog(
+        files: files,
+        room: room,
+        outerContext: context,
+      ),
+    );
+  }
+
   @override
   void initState() {
     scrollController.addListener(_updateScrollController);
     inputFocus.addListener(_inputFocusListener);
 
     _loadDraft();
+    WidgetsBinding.instance.addPostFrameCallback(_shareItems);
     super.initState();
     _displayChatDetailsColumn = ValueNotifier(
       Matrix.of(context).store.getBool(SettingKeys.displayChatDetailsColumn) ??
@@ -821,17 +847,17 @@ class ChatController extends State<ChatPageWithRoom>
   }
 
   void forwardEventsAction() async {
-    if (selectedEvents.length == 1) {
-      Matrix.of(context).shareContent =
-          selectedEvents.first.getDisplayEvent(timeline!).content;
-    } else {
-      Matrix.of(context).shareContent = {
-        'msgtype': 'm.text',
-        'body': _getSelectedEventString(),
-      };
-    }
+    if (selectedEvents.isEmpty) return;
+    await showScaffoldDialog(
+      context: context,
+      builder: (context) => ShareScaffoldDialog(
+        items: selectedEvents
+            .map((event) => ContentShareItem(event.content))
+            .toList(),
+      ),
+    );
+    if (!mounted) return;
     setState(() => selectedEvents.clear());
-    context.go('/rooms');
   }
 
   void sendAgainAction() {

lib/pages/chat_list/chat_list.dart

@@ -15,14 +15,15 @@ import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:uni_links/uni_links.dart';
 
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pages/chat/send_file_dialog.dart';
 import 'package:fluffychat/pages/chat_list/chat_list_view.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
+import 'package:fluffychat/utils/show_scaffold_dialog.dart';
 import 'package:fluffychat/utils/show_update_snackbar.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
+import 'package:fluffychat/widgets/share_scaffold_dialog.dart';
 import '../../../utils/account_bundles.dart';
 import '../../config/setting_keys.dart';
 import '../../utils/url_launcher.dart';
@@ -34,11 +35,6 @@ import '../bootstrap/bootstrap_dialog.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
-enum SelectMode {
-  normal,
-  share,
-}
-
 enum PopupMenuAction {
   settings,
   invite,
@@ -191,42 +187,6 @@ class ChatListController extends State<ChatList>
       setActiveSpace(room.id);
       return;
     }
-    // Share content into this room
-    final shareContent = Matrix.of(context).shareContent;
-    if (shareContent != null) {
-      final shareFile = shareContent.tryGet<XFile>('file');
-      if (shareContent.tryGet<String>('msgtype') == 'chat.fluffy.shared_file' &&
-          shareFile != null) {
-        await showDialog(
-          context: context,
-          useRootNavigator: false,
-          builder: (c) => SendFileDialog(
-            files: [shareFile],
-            room: room,
-            outerContext: context,
-          ),
-        );
-        Matrix.of(context).shareContent = null;
-      } else {
-        final consent = await showOkCancelAlertDialog(
-          context: context,
-          title: L10n.of(context).forward,
-          message: L10n.of(context).forwardMessageTo(
-            room.getLocalizedDisplayname(MatrixLocals(L10n.of(context))),
-          ),
-          okLabel: L10n.of(context).forward,
-          cancelLabel: L10n.of(context).cancel,
-        );
-        if (consent == OkCancelResult.cancel) {
-          Matrix.of(context).shareContent = null;
-          return;
-        }
-        if (consent == OkCancelResult.ok) {
-          room.sendEvent(shareContent);
-          Matrix.of(context).shareContent = null;
-        }
-      }
-    }
 
     context.go('/rooms/${room.id}');
   }
@@ -420,53 +380,27 @@ class ChatListController extends State<ChatList>
 
   String? get activeChat => widget.activeChat;
 
-  SelectMode get selectMode => Matrix.of(context).shareContent != null
-      ? SelectMode.share
-      : SelectMode.normal;
-
   void _processIncomingSharedMedia(List<SharedMediaFile> files) {
     if (files.isEmpty) return;
 
-    if (files.length > 1) {
-      Logs().w(
-        'Received ${files.length} incoming shared media but app can only handle the first one',
-      );
-    }
-
-    // We only handle the first file currently
-    final sharedMedia = files.first;
-
-    // Handle URIs and Texts, which are also passed in path
-    if (sharedMedia.type case SharedMediaType.text || SharedMediaType.url) {
-      return _processIncomingSharedText(sharedMedia.path);
-    }
-
-    final file = XFile(
-      sharedMedia.path.replaceFirst('file://', ''),
-      mimeType: sharedMedia.mimeType,
+    showScaffoldDialog(
+      context: context,
+      builder: (context) => ShareScaffoldDialog(
+        items: files
+            .map(
+              (file) => switch (file.type) {
+                SharedMediaType.file => FileShareItem(
+                    XFile(
+                      file.path.replaceFirst('file://', ''),
+                      mimeType: file.mimeType,
+                    ),
+                  ),
+                _ => TextShareItem(file.path),
+              },
+            )
+            .toList(),
+      ),
     );
-
-    Matrix.of(context).shareContent = {
-      'msgtype': 'chat.fluffy.shared_file',
-      'file': file,
-      if (sharedMedia.message != null) 'body': sharedMedia.message,
-    };
-    context.go('/rooms');
-  }
-
-  void _processIncomingSharedText(String? text) {
-    if (text == null) return;
-    if (text.toLowerCase().startsWith(AppConfig.deepLinkPrefix) ||
-        text.toLowerCase().startsWith(AppConfig.inviteLinkPrefix) ||
-        (text.toLowerCase().startsWith(AppConfig.schemePrefix) &&
-            !RegExp(r'\s').hasMatch(text))) {
-      return _processIncomingUris(text);
-    }
-    Matrix.of(context).shareContent = {
-      'msgtype': 'm.text',
-      'body': text,
-    };
-    context.go('/rooms');
   }
 
   void _processIncomingUris(String? text) async {
@@ -871,12 +805,6 @@ class ChatListController extends State<ChatList>
     }
   }
 
-  void cancelAction() {
-    if (selectMode == SelectMode.share) {
-      setState(() => Matrix.of(context).shareContent = null);
-    }
-  }
-
   void setActiveFilter(ActiveFilter filter) {
     setState(() {
       activeFilter = filter;