TW-1442: Implement Jump to Message on pinned view

linagora · Feb 7, 2024 · 453d0a5 · 453d0a5
1 parent be0396c
commit 453d0a5
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 25 deletions.
diff --git a/assets/images/ic_goto.svg b/assets/images/ic_goto.svg
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -1342,8 +1342,8 @@ class ChatController extends State<Chat>
   ) {
     final listAction = [
       ChatContextMenuActions.select,
-      ChatContextMenuActions.copyMessage,
       ChatContextMenuActions.pinChat,
+      ChatContextMenuActions.copyMessage,
       ChatContextMenuActions.forward,
       if (PlatformInfos.isWeb && event.hasAttachment)
         ChatContextMenuActions.downloadFile,
@@ -1358,9 +1358,10 @@ class ChatController extends State<Chat>
             unpin: isUnpinEvent(event),
             isSelected: isSelected(event),
           ),
-          iconAction: action.getIcon(
+          iconAction: action.getIconData(
             unpin: isUnpinEvent(event),
           ),
+          imagePath: action.getImagePath(),
           onCallbackAction: () => _handleClickOnContextMenuItem(
             action,
             event,
@@ -1390,6 +1391,8 @@ class ChatController extends State<Chat>
       case ChatContextMenuActions.downloadFile:
         downloadFileAction(context, event);
         break;
+      default:
+        break;
     }
   }
 

diff --git a/lib/pages/chat/chat_context_menu_actions.dart b/lib/pages/chat/chat_context_menu_actions.dart
@@ -1,3 +1,4 @@
+import 'package:fluffychat/resource/image_paths.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
@@ -6,7 +7,8 @@ enum ChatContextMenuActions {
   copyMessage,
   pinChat,
   forward,
-  downloadFile;
+  downloadFile,
+  jumpToMessage;
 
   String getTitle(
     BuildContext context, {
@@ -26,10 +28,12 @@ enum ChatContextMenuActions {
         return L10n.of(context)!.forward;
       case ChatContextMenuActions.downloadFile:
         return L10n.of(context)!.download;
+      case ChatContextMenuActions.jumpToMessage:
+        return L10n.of(context)!.jumpToMessage;
     }
   }
 
-  IconData getIcon({
+  IconData? getIconData({
     bool isSelected = false,
     bool unpin = false,
   }) {
@@ -44,6 +48,17 @@ enum ChatContextMenuActions {
         return Icons.shortcut;
       case ChatContextMenuActions.downloadFile:
         return Icons.download;
+      default:
+        return null;
+    }
+  }
+
+  String? getImagePath() {
+    switch (this) {
+      case ChatContextMenuActions.jumpToMessage:
+        return ImagePaths.icGoTo;
+      default:
+        return null;
     }
   }
 }
diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages.dart b/lib/pages/chat/chat_pinned_events/pinned_messages.dart
@@ -247,9 +247,10 @@ class PinnedMessagesController extends State<PinnedMessages>
     Event event,
   ) {
     final listAction = [
+      ChatContextMenuActions.pinChat,
       ChatContextMenuActions.select,
+      ChatContextMenuActions.jumpToMessage,
       ChatContextMenuActions.copyMessage,
-      ChatContextMenuActions.pinChat,
       ChatContextMenuActions.forward,
       if (PlatformInfos.isWeb && event.hasAttachment)
         ChatContextMenuActions.downloadFile,
@@ -262,7 +263,8 @@ class PinnedMessagesController extends State<PinnedMessages>
           unpin: event.isPinned,
           isSelected: isSelected(event),
         ),
-        iconAction: action.getIcon(unpin: event.isPinned),
+        iconAction: action.getIconData(unpin: event.isPinned),
+        imagePath: action.getImagePath(),
         onCallbackAction: () => _handleClickOnContextMenuItem(
           action,
           event,
@@ -305,11 +307,20 @@ class PinnedMessagesController extends State<PinnedMessages>
       case ChatContextMenuActions.downloadFile:
         await event.saveFile(context);
         break;
+      case ChatContextMenuActions.jumpToMessage:
+        jumpToMessage(context, event);
+        break;
       default:
         break;
     }
   }
 
+  void jumpToMessage(BuildContext context, Event event) {
+    context.go(
+      '/rooms/${event.roomId}?event=${event.eventId}',
+    );
+  }
+
   void forwardEventAction(Event event) async {
     Matrix.of(context).shareContent =
         event.getDisplayEvent(widget.timeline!).content;

diff --git a/lib/resource/image_paths.dart b/lib/resource/image_paths.dart
@@ -47,6 +47,7 @@ class ImagePaths {
   static String get logoTwakeWelcome => _getImagePath('logo_twake_welcome.svg');
   static String get icEmptySearch => _getImagePath('ic_empty_search.svg');
   static String get icFileError => _getImagePath('ic_file_error.svg');
+  static String get icGoTo => _getImagePath('ic_goto.svg');
 
   static String _getImagePath(String imageName) {
     return AssetsPaths.images + imageName;

diff --git a/lib/widgets/mixins/popup_menu_widget_mixin.dart b/lib/widgets/mixins/popup_menu_widget_mixin.dart
@@ -81,30 +81,39 @@ mixin PopupMenuWidgetMixin {
     TextStyle? styleName,
     EdgeInsets? padding,
   }) {
+    Widget buildIcon() {
+      // We try to get the SVG first and then the IconData
+      if (imagePath != null) {
+        return SvgPicture.asset(
+          imagePath,
+          width: iconSize ?? PopupMenuWidgetStyle.defaultItemIconSize,
+          height: iconSize ?? PopupMenuWidgetStyle.defaultItemIconSize,
+          fit: BoxFit.fill,
+          colorFilter: ColorFilter.mode(
+            colorIcon ?? PopupMenuWidgetStyle.defaultItemColorIcon(context)!,
+            BlendMode.srcIn,
+          ),
+        );
+      }
+
+      if (iconAction != null) {
+        return Icon(
+          iconAction,
+          size: iconSize ?? PopupMenuWidgetStyle.defaultItemIconSize,
+          color:
+              colorIcon ?? PopupMenuWidgetStyle.defaultItemColorIcon(context),
+        );
+      }
+
+      return const SizedBox.shrink();
+    }
+
     return Padding(
       padding: padding ?? PopupMenuWidgetStyle.defaultItemPadding,
       child: SizedBox(
         child: Row(
           children: [
-            if (iconAction != null)
-              Icon(
-                iconAction,
-                size: iconSize ?? PopupMenuWidgetStyle.defaultItemIconSize,
-                color: colorIcon ??
-                    PopupMenuWidgetStyle.defaultItemColorIcon(context),
-              ),
-            if (imagePath != null)
-              SvgPicture.asset(
-                imagePath,
-                width: iconSize ?? PopupMenuWidgetStyle.defaultItemIconSize,
-                height: iconSize ?? PopupMenuWidgetStyle.defaultItemIconSize,
-                fit: BoxFit.fill,
-                colorFilter: ColorFilter.mode(
-                  colorIcon ??
-                      PopupMenuWidgetStyle.defaultItemColorIcon(context)!,
-                  BlendMode.srcIn,
-                ),
-              ),
+            buildIcon(),
             const SizedBox(width: PopupMenuWidgetStyle.defaultItemElementsGap),
             Expanded(
               child: Text(