From be19175da5e0a6a9184c103496a7e611d7b94ebd Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 6 Sep 2024 16:21:31 -0400 Subject: [PATCH 1/3] give main menu button a background --- lib/pages/chat_list/chat_list_header.dart | 36 ++++++++++++++--------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index b60a8b5be..a45751201 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -26,8 +26,10 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { pinned: FluffyThemes.isColumnMode(context) || selectMode != SelectMode.normal, scrolledUnderElevation: selectMode == SelectMode.normal ? 0 : null, - backgroundColor: - selectMode == SelectMode.normal ? Colors.transparent : null, + // #Pangea + // backgroundColor: + // selectMode == SelectMode.normal ? Colors.transparent : null, + // Pangea# automaticallyImplyLeading: false, leading: selectMode == SelectMode.normal ? null @@ -37,18 +39,24 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { onPressed: controller.cancelAction, color: Theme.of(context).colorScheme.primary, ), - title: selectMode == SelectMode.share - ? Text( - L10n.of(context)!.share, - key: const ValueKey(SelectMode.share), - ) - : selectMode == SelectMode.select - ? Text( - controller.selectedRoomIds.length.toString(), - key: const ValueKey(SelectMode.select), - ) - // #Pangea - : ClientChooserButton(controller), + title: + // #Pangea + Material( + child: + // Pangea# + selectMode == SelectMode.share + ? Text( + L10n.of(context)!.share, + key: const ValueKey(SelectMode.share), + ) + : selectMode == SelectMode.select + ? Text( + controller.selectedRoomIds.length.toString(), + key: const ValueKey(SelectMode.select), + ) + // #Pangea + : ClientChooserButton(controller), + ), // : TextField( // controller: controller.searchController, // focusNode: controller.searchFocusNode, From f9f0945655fab9fad4fd997b3b4c4456b0690591 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 10 Sep 2024 09:49:09 -0400 Subject: [PATCH 2/3] 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 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 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, ), ); From 04db40f7eac4b59b22067afa5f8b46e7487635dc Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 10 Sep 2024 12:09:51 -0400 Subject: [PATCH 3/3] default true for auto-igc setting --- lib/pangea/models/user_model.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 24db180dc..34518f645 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -128,7 +128,7 @@ class UserToolSettings { this.interactiveGrammar = true, this.immersionMode = false, this.definitions = true, - this.autoIGC = false, + this.autoIGC = true, }); factory UserToolSettings.fromJson(Map json) => @@ -139,7 +139,7 @@ class UserToolSettings { json[ToolSetting.interactiveGrammar.toString()] ?? true, immersionMode: json[ToolSetting.immersionMode.toString()] ?? false, definitions: json[ToolSetting.definitions.toString()] ?? true, - autoIGC: json[ToolSetting.autoIGC.toString()] ?? false, + autoIGC: json[ToolSetting.autoIGC.toString()] ?? true, ); Map toJson() { @@ -174,7 +174,7 @@ class UserToolSettings { true, autoIGC: (accountData[ToolSetting.autoIGC.toString()] ?.content[ToolSetting.autoIGC.toString()] as bool?) ?? - false, + true, ); } }