From f9f0945655fab9fad4fd997b3b4c4456b0690591 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Tue, 10 Sep 2024 09:49:09 -0400
Subject: [PATCH] speed up toolbar on click message

---
 lib/pages/chat/chat.dart                     | 10 +++++-----
 lib/pages/chat/events/message.dart           |  7 ++++---
 lib/pangea/widgets/chat/message_toolbar.dart |  5 +++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index f0fa968f2..5cee67baf 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1589,10 +1589,6 @@ class ChatController extends State<ChatPageWithRoom>
     PangeaMessageEvent pangeaMessageEvent, {
     MessageMode? mode,
   }) {
-    // select the message
-    onSelectMessage(pangeaMessageEvent.event);
-    HapticFeedback.mediumImpact();
-
     // Close keyboard, if open
     if (inputFocus.hasFocus && PlatformInfos.isMobile) {
       inputFocus.unfocus();
@@ -1625,12 +1621,16 @@ class ChatController extends State<ChatPageWithRoom>
       context: context,
       child: overlayEntry,
       transformTargetId: "",
-      backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(200),
+      backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(100),
       closePrevOverlay:
           MatrixState.pangeaController.subscriptionController.isSubscribed,
       position: OverlayPositionEnum.centered,
       onDismiss: clearSelectedEvents,
     );
+
+    // select the message
+    onSelectMessage(pangeaMessageEvent.event);
+    HapticFeedback.mediumImpact();
   }
   // Pangea#
 
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 0ac258f18..b39f907ee 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -319,8 +319,6 @@ class Message extends StatelessWidget {
                                 child: GestureDetector(
                                   // #Pangea
                                   onTap: () => showToolbar(pangeaMessageEvent),
-                                  onDoubleTap: () =>
-                                      showToolbar(pangeaMessageEvent),
                                   onLongPress: () =>
                                       showToolbar(pangeaMessageEvent),
                                   // onLongPress: longPressSelect
@@ -605,7 +603,10 @@ class Message extends StatelessWidget {
                             controller: controller,
                             pangeaMessageEvent: pangeaMessageEvent!,
                           ),
-                        MessageReactions(event, timeline),
+                        // #Pangea
+                        if (!isOverlay)
+                          // Pangea#
+                          MessageReactions(event, timeline),
                       ],
                     ),
                     // child: MessageReactions(event, timeline),
diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart
index 4d41918a8..2cbfe63a3 100644
--- a/lib/pangea/widgets/chat/message_toolbar.dart
+++ b/lib/pangea/widgets/chat/message_toolbar.dart
@@ -305,6 +305,11 @@ class ToolbarSelectionArea extends StatelessWidget {
             controller.showToolbar(pangeaMessageEvent!);
           }
         },
+        onLongPress: () {
+          if (pangeaMessageEvent != null && !isOverlay) {
+            controller.showToolbar(pangeaMessageEvent!);
+          }
+        },
         child: child,
       ),
     );