From f076584623f51d55a2f9102d7c30f36a685a76fe Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Mon, 22 Sep 2025 14:46:52 -0400
Subject: [PATCH] fix: fix toolbar buttons on mobile (#4087)

---
 android/app/build.gradle.kts                       |  4 ++--
 lib/pages/chat/events/html_message.dart            |  2 +-
 .../toolbar/widgets/over_message_overlay.dart      | 14 +++++---------
 .../toolbar/widgets/select_mode_buttons.dart       |  8 ++++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 5e699e0aa..a693ef2e6 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -76,7 +76,7 @@ android {
 
     defaultConfig {
         applicationId = "com.talktolearn.chat"
-        minSdk = 21
+        minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
@@ -101,4 +101,4 @@ android {
 
 flutter {
     source = "../.."
-}
\ No newline at end of file
+}
diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 322ff90e4..c192e57f2 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -934,7 +934,7 @@ class HtmlMessage extends StatelessWidget {
                 ),
               RichText(
                 text: TextSpan(
-                  style: style,
+                  style: textStyle.merge(style),
                   children: _renderWithLineBreaks(
                     node.nodes,
                     context,
diff --git a/lib/pangea/toolbar/widgets/over_message_overlay.dart b/lib/pangea/toolbar/widgets/over_message_overlay.dart
index a0e333df1..cd4705ce9 100644
--- a/lib/pangea/toolbar/widgets/over_message_overlay.dart
+++ b/lib/pangea/toolbar/widgets/over_message_overlay.dart
@@ -51,18 +51,14 @@ class OverMessageOverlay extends StatelessWidget {
                   child: OverlayCenterContent(
                     event: controller.widget.event,
                     messageHeight:
-                        controller.widget.overlayController.selectedMode ==
-                                SelectMode.practice
+                        controller.widget.overlayController.selectedMode !=
+                                SelectMode.emoji
                             ? controller.originalMessageSize.height
                             : null,
                     messageWidth:
-                        controller.widget.overlayController.selectedMode ==
-                                SelectMode.practice
-                            ? controller.widget.overlayController
-                                    .showingExtraContent
-                                ? max(controller.originalMessageSize.width, 150)
-                                : controller.originalMessageSize.width
-                            : null,
+                        controller.widget.overlayController.showingExtraContent
+                            ? max(controller.originalMessageSize.width, 150)
+                            : controller.originalMessageSize.width,
                     overlayController: controller.widget.overlayController,
                     chatController: controller.widget.chatController,
                     nextEvent: controller.widget.nextEvent,
diff --git a/lib/pangea/toolbar/widgets/select_mode_buttons.dart b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
index 9113b1171..616652710 100644
--- a/lib/pangea/toolbar/widgets/select_mode_buttons.dart
+++ b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
@@ -233,7 +233,7 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
         : mode;
     widget.overlayController.setSelectMode(selectedMode);
 
-    if (_selectedMode == SelectMode.audio) {
+    if (selectedMode == SelectMode.audio) {
       _playAudio();
       return;
     } else {
@@ -241,17 +241,17 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
       matrix?.audioPlayer?.seek(null);
     }
 
-    if (_selectedMode == SelectMode.practice) {
+    if (selectedMode == SelectMode.practice) {
       widget.lauchPractice();
       return;
     }
 
-    if (_selectedMode == SelectMode.translate) {
+    if (selectedMode == SelectMode.translate) {
       await _fetchTranslation();
       widget.overlayController.setShowTranslation(true);
     }
 
-    if (_selectedMode == SelectMode.speechTranslation) {
+    if (selectedMode == SelectMode.speechTranslation) {
       await _fetchSpeechTranslation();
       widget.overlayController.setShowSpeechTranslation(true);
     }