From 0670d5061d7bcf998659639f54c5c52136382513 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Mon, 29 Jul 2024 15:16:43 -0400 Subject: [PATCH 1/4] Avatar is no longer child of Hero --- lib/pages/chat_details/chat_details_view.dart | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 24db0f582..7bda65abf 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -138,17 +138,18 @@ class ChatDetailsView extends StatelessWidget { Avatar.defaultSize * 2.5, ), ), - child: Hero( - tag: controller.widget - .embeddedCloseButton != - null - ? 'embedded_content_banner' - : 'content_banner', - child: Avatar( - mxContent: room.avatar, - name: displayname, - size: Avatar.defaultSize * 2.5, - ), + // #Pangea + // child: Hero( + // tag: controller.widget + // .embeddedCloseButton != + // null + // ? 'embedded_content_banner' + // : 'content_banner', + // Pangea# + child: Avatar( + mxContent: room.avatar, + name: displayname, + size: Avatar.defaultSize * 2.5, ), ), if (!room.isDirectChat && From 9cc6a14734f6546fd6f2edde7a453dd18ebec288 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 31 Jul 2024 14:12:51 -0400 Subject: [PATCH 2/4] Enables activity tab on audio toolbar --- lib/pangea/enum/message_mode_enum.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pangea/enum/message_mode_enum.dart b/lib/pangea/enum/message_mode_enum.dart index 58753e5b5..9faeb1d94 100644 --- a/lib/pangea/enum/message_mode_enum.dart +++ b/lib/pangea/enum/message_mode_enum.dart @@ -71,11 +71,13 @@ extension MessageModeExtension on MessageMode { switch (this) { case MessageMode.translation: case MessageMode.textToSpeech: - case MessageMode.practiceActivity: case MessageMode.definition: return event.messageType == MessageTypes.Text; case MessageMode.speechToText: return event.messageType == MessageTypes.Audio; + case MessageMode.practiceActivity: + return event.messageType == MessageTypes.Audio || + event.messageType == MessageTypes.Text; default: return true; } From 4b65b95060fb66c2b91e018265bc240a8ff4175b Mon Sep 17 00:00:00 2001 From: ggurdin Date: Wed, 31 Jul 2024 14:51:22 -0400 Subject: [PATCH 3/4] remove default for isValidMode switch statement, return true if practiceActivity --- lib/pangea/enum/message_mode_enum.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/pangea/enum/message_mode_enum.dart b/lib/pangea/enum/message_mode_enum.dart index 9faeb1d94..11c96e10e 100644 --- a/lib/pangea/enum/message_mode_enum.dart +++ b/lib/pangea/enum/message_mode_enum.dart @@ -76,9 +76,6 @@ extension MessageModeExtension on MessageMode { case MessageMode.speechToText: return event.messageType == MessageTypes.Audio; case MessageMode.practiceActivity: - return event.messageType == MessageTypes.Audio || - event.messageType == MessageTypes.Text; - default: return true; } } From 0da6bb9cb5d35ce3a2a46bfb9113ef5e99488de3 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 31 Jul 2024 15:32:08 -0400 Subject: [PATCH 4/4] Add comment explaining rationale --- lib/pages/chat_details/chat_details_view.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 7bda65abf..0afa56086 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -139,6 +139,8 @@ class ChatDetailsView extends StatelessWidget { ), ), // #Pangea + // Hero animation is causing weird visual glitch + // Probably not worth keeping // child: Hero( // tag: controller.widget // .embeddedCloseButton !=