TW-1369: Add Pinned Msg Bottom Sheet on Long press for Mobile

linagora · Feb 7, 2024 · 35c1e06 · 35c1e06
1 parent d5ed02d
commit 35c1e06
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 5 deletions.
diff --git a/lib/pages/chat/chat_event_list.dart b/lib/pages/chat/chat_event_list.dart
@@ -133,6 +133,7 @@ class ChatEventList extends StatelessWidget {
                         path: 'rooms',
                       ),
                       onSelect: controller.onSelectMessage,
+                      onLongPress: controller.onSelectMessage,
                       selectMode: controller.selectMode,
                       scrollToEventId: (String eventId) =>
                           controller.scrollToEventId(eventId),

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages.dart b/lib/pages/chat/chat_pinned_events/pinned_messages.dart
@@ -11,6 +11,7 @@ import 'package:fluffychat/pages/chat/chat_view_style.dart';
 import 'package:fluffychat/pages/chat/context_item_chat_action.dart';
 import 'package:fluffychat/presentation/model/forward/forward_argument.dart';
 import 'package:fluffychat/resource/image_paths.dart';
+import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
 import 'package:fluffychat/utils/extension/build_context_extension.dart';
 import 'package:fluffychat/utils/extension/value_notifier_extension.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
@@ -168,6 +169,14 @@ class PinnedMessagesController extends State<PinnedMessages>
     );
   }
 
+  void onLongPress(Event event) async {
+    if (PlatformInfos.isMobile) {
+      await _showBottomSheetMobile(event);
+    } else {
+      onSelectMessage(event);
+    }
+  }
+
   void onSelectMessage(Event event) {
     if (!event.redacted) {
       if (selectedEvents.value.contains(event)) {
@@ -179,6 +188,19 @@ class PinnedMessagesController extends State<PinnedMessages>
     }
   }
 
+  Future<void> _showBottomSheetMobile(Event event) async {
+    await showAdaptiveBottomSheet(
+      context: context,
+      showDragHandle: true,
+      builder: (context) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          children: pinnedMessagesActionsList(context, event),
+        );
+      },
+    );
+  }
+
   void _initPinnedEvents() {
     if (widget.pinnedEvents.isNotEmpty) {
       eventsNotifier.value = widget.pinnedEvents;

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages_screen.dart b/lib/pages/chat/chat_pinned_events/pinned_messages_screen.dart
@@ -97,6 +97,7 @@ class PinnedMessagesScreen extends StatelessWidget {
                                   controller.onHover(isHover, index, event),
                               selectMode: selectedEvents.isNotEmpty,
                               onSelect: controller.onSelectMessage,
+                              onLongPress: controller.onLongPress,
                               selected: controller.isSelected(event),
                               menuChildren: (context) => controller
                                   .pinnedMessagesActionsList(context, event),

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages_style.dart b/lib/pages/chat/chat_pinned_events/pinned_messages_style.dart
@@ -35,4 +35,4 @@ class PinnedMessagesStyle {
 
   static const double paddingAllContextMenuItem = 12;
   static const double heightContextMenuItem = 48;
-}
+}
diff --git a/lib/pages/chat/events/message/message.dart b/lib/pages/chat/events/message/message.dart
@@ -34,6 +34,7 @@ class Message extends StatelessWidget {
   final Event? nextEvent;
   final String? markedUnreadLocation;
   final void Function(Event)? onSelect;
+  final void Function(Event)? onLongPress;
   final void Function(Event)? onAvatarTap;
   final void Function(String)? scrollToEventId;
   final void Function(SwipeDirection)? onSwipe;
@@ -53,6 +54,7 @@ class Message extends StatelessWidget {
     this.previousEvent,
     this.nextEvent,
     this.onSelect,
+    this.onLongPress,
     this.onAvatarTap,
     this.onHover,
     this.scrollToEventId,
@@ -125,6 +127,7 @@ class Message extends StatelessWidget {
                 event: event,
                 nextEvent: nextEvent,
                 onSelect: onSelect,
+                onLongPress: onLongPress,
                 scrollToEventId: scrollToEventId,
                 selected: selected,
                 selectMode: selectMode,

diff --git a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart
@@ -21,6 +21,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
   final Event event;
   final Event? nextEvent;
   final void Function(Event)? onSelect;
+  final void Function(Event)? onLongPress;
   final void Function(String)? scrollToEventId;
   final ValueNotifier<String?> isHoverNotifier;
   final bool selected;
@@ -38,6 +39,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
     required this.event,
     this.nextEvent,
     this.onSelect,
+    this.onLongPress,
     this.scrollToEventId,
     this.selected = false,
     this.selectMode = true,
@@ -88,7 +90,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
             child: MultiPlatformSelectionMode(
               event: event,
               isClickable: responsiveUtils.isMobileOrTablet(context),
-              onSelect: onSelect,
+              onLongPress: onLongPress,
               child: Stack(
                 alignment: event.isOwnMessage
                     ? AlignmentDirectional.bottomStart

diff --git a/lib/pages/chat/events/message/multi_platform_message_container.dart b/lib/pages/chat/events/message/multi_platform_message_container.dart
@@ -38,7 +38,7 @@ class MultiPlatformsMessageContainer extends StatelessWidget {
 }
 
 class MultiPlatformSelectionMode extends StatelessWidget {
-  final void Function(Event event)? onSelect;
+  final void Function(Event event)? onLongPress;
 
   final Event event;
 
@@ -48,7 +48,7 @@ class MultiPlatformSelectionMode extends StatelessWidget {
 
   const MultiPlatformSelectionMode({
     super.key,
-    this.onSelect,
+    this.onLongPress,
     this.isClickable = true,
     required this.event,
     required this.child,
@@ -61,7 +61,7 @@ class MultiPlatformSelectionMode extends StatelessWidget {
     }
 
     return GestureDetector(
-      onLongPress: () => onSelect?.call(event),
+      onLongPress: () => onLongPress?.call(event),
       child: child,
     );
   }

diff --git a/lib/utils/adaptive_bottom_sheet.dart b/lib/utils/adaptive_bottom_sheet.dart
@@ -9,9 +9,11 @@ Future<T?> showAdaptiveBottomSheet<T>({
   required Widget Function(BuildContext) builder,
   bool isDismissible = true,
   bool isScrollControlled = false,
+  bool showDragHandle = false,
 }) =>
     showModalBottomSheet(
       context: context,
+      showDragHandle: showDragHandle,
       builder: builder,
       useRootNavigator: !PlatformInfos.isMobile,
       isDismissible: isDismissible,