TW-1936: fix the share screen don't show up when sharing an image (#1991

)
linagora · Sep 10, 2024 · 7661c07 · 7661c07
1 parent 309578a
commit 7661c07
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/lib/config/go_routes/go_router.dart b/lib/config/go_routes/go_router.dart
@@ -17,7 +17,6 @@ import 'package:fluffychat/pages/login/on_auth_redirect.dart';
 import 'package:fluffychat/pages/new_group/new_group_chat_info.dart';
 import 'package:fluffychat/pages/settings_dashboard/settings_app_language/settings_app_language.dart';
 import 'package:fluffychat/pages/settings_dashboard/settings_profile/settings_profile.dart';
-import 'package:fluffychat/pages/share/share.dart';
 import 'package:fluffychat/pages/story/story_page.dart';
 import 'package:fluffychat/pages/twake_welcome/twake_welcome.dart';
 import 'package:fluffychat/presentation/model/chat/chat_router_input_argument.dart';
@@ -519,14 +518,6 @@ abstract class AppRoutes {
             ),
           ],
         ),
-        GoRoute(
-          path: '/share',
-          pageBuilder: (context, state) => defaultPageBuilder(
-            context,
-            const Share(),
-          ),
-          redirect: loggedOutRedirect,
-        ),
       ],
     ),
   ];

diff --git a/lib/pages/chat_details/participant_list_item/participant_list_item.dart b/lib/pages/chat_details/participant_list_item/participant_list_item.dart
@@ -186,11 +186,11 @@ class ParticipantListItem extends StatelessWidget {
                           Icons.person_search,
                           color: LinagoraSysColors.material().onSurface,
                         ),
-                        label: L10n.of(context)?.viewProfile != null
+                        label: L10n.of(bottomSheetContext)?.viewProfile != null
                             ? Row(
                                 children: [
                                   Text(
-                                    L10n.of(context)!.viewProfile,
+                                    L10n.of(bottomSheetContext)!.viewProfile,
                                     style: TextStyle(
                                       color: LinagoraSysColors.material()
                                           .onSurface,

diff --git a/lib/pages/chat_list/receive_sharing_intent_mixin.dart b/lib/pages/chat_list/receive_sharing_intent_mixin.dart
@@ -1,4 +1,5 @@
 import 'package:fluffychat/event/twake_event_types.dart';
+import 'package:fluffychat/pages/share/share.dart';
 import 'package:fluffychat/presentation/extensions/shared_media_file_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/utils/url_launcher.dart';
@@ -35,9 +36,32 @@ mixin ReceiveSharingIntentMixin<T extends StatefulWidget> on State<T> {
           },
         )
         .toList();
-    TwakeApp.router.go('/share');
+    openSharePage();
   }
 
+  void openSharePage() {
+    if (isCurrentPageIsNotRooms()) {
+      return;
+    }
+    if (isCurrentPageIsInRooms()) {
+      TwakeApp.router.go('/rooms');
+    }
+
+    Navigator.of(TwakeApp.routerKey.currentContext!).push(
+      MaterialPageRoute(
+        builder: (context) => const Share(),
+      ),
+    );
+  }
+
+  bool isCurrentPageIsInRooms() =>
+      TwakeApp.router.routeInformationProvider.value.uri.path
+          .startsWith('/rooms/');
+
+  bool isCurrentPageIsNotRooms() =>
+      !TwakeApp.router.routeInformationProvider.value.uri.path
+          .startsWith('/rooms');
+
   void _processIncomingSharedText(String? text) {
     if (text == null) return;
     if (_intentOpenApp(text)) {
@@ -53,7 +77,7 @@ mixin ReceiveSharingIntentMixin<T extends StatefulWidget> on State<T> {
       'msgtype': 'm.text',
       'body': text,
     };
-    TwakeApp.router.go('/share');
+    openSharePage();
   }
 
   void _processIncomingUris(String? text) async {
@@ -62,7 +86,7 @@ mixin ReceiveSharingIntentMixin<T extends StatefulWidget> on State<T> {
     if (_intentOpenApp(text)) {
       return;
     }
-    TwakeApp.router.go('/share');
+    openSharePage();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       UrlLauncher(context, url: text).openMatrixToUrl();
     });

diff --git a/lib/pages/share/share.dart b/lib/pages/share/share.dart
@@ -93,6 +93,7 @@ class ShareController extends State<Share>
     Map<String, dynamic>? textContent,
   }) {
     if (textContent == null) return;
+    Navigator.pop(context);
     room.sendEvent(textContent);
     context.go('/rooms/${room.id}');
   }
@@ -107,6 +108,7 @@ class ShareController extends State<Share>
             content?.tryGet<String>('msgtype') ==
             TwakeEventTypes.shareFileEventType,
       )) {
+        Navigator.pop(context);
         context.go(
           '/rooms/${room.id}',
           extra: ChatRouterInputArgument(