fix(ui): display selected device name when add devices in DetailGroupScreen

2025-02-11 11:55:51 +07:00
parent a98e84880b
commit bfeba03490
6 changed files with 124 additions and 98 deletions
--- a/lib/feature/main/main_screen.dart
+++ b/lib/feature/main/main_screen.dart
@@ -62,8 +62,10 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
    }
    if (theme == AppThemes.LIGHT.name) {
      isLight = true;
-    } else {
+    } else if (theme == AppThemes.DARK.name) {
      isLight = false;
+    } else {
+      isLight = true;
    }
    mainBloc.sinkIsVNIcon.add(isVN);
    mainBloc.sinkThemeMode.add(isLight);
@@ -325,7 +327,7 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
            controller: controller,
            screens: _buildScreens(),
            items: _navBarsItems(),
-            handleAndroidBackButtonPress: true,
+            handleAndroidBackButtonPress: false,
            resizeToAvoidBottomInset: true,
            stateManagement: true,
            backgroundColor: