From cc411ba75de7bbc750c44b33893a79e9a5344416 Mon Sep 17 00:00:00 2001
From: kalynstricklin <kalynstricklin@botts-inc.com>
Date: Tue, 7 Jul 2026 09:31:41 -0500
Subject: [PATCH 1/2] updated switches to use material switch, updated back
 arrow + bottom nav color to match background color

---
 .../res/color/bottom_nav_selector.xml         |  4 +-
 .../res/layout/activity_main.xml              |  2 +-
 .../res/layout/pref_switch_bottom.xml         |  6 +-
 .../res/layout/pref_switch_mid.xml            |  6 +-
 .../res/layout/pref_switch_top.xml            |  6 +-
 .../res/layout/preference_switch_item.xml     |  7 +-
 sensorhub-android-app/res/values/colors.xml   | 76 +++++++++----------
 sensorhub-android-app/res/values/styles.xml   | 18 +++--
 .../res/xml/pref_settings.xml                 | 27 +++----
 9 files changed, 72 insertions(+), 80 deletions(-)

diff --git a/sensorhub-android-app/res/color/bottom_nav_selector.xml b/sensorhub-android-app/res/color/bottom_nav_selector.xml
index 68a6dc2..32651b2 100644
--- a/sensorhub-android-app/res/color/bottom_nav_selector.xml
+++ b/sensorhub-android-app/res/color/bottom_nav_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/md_theme_onPrimary" android:state_checked="true" />
-    <item android:color="@color/bottom_nav_unselected" />
+    <item android:color="@color/md_theme_primary" android:state_checked="true" />
+    <item android:color="@color/md_theme_onSurfaceVariant" />
 </selector>
diff --git a/sensorhub-android-app/res/layout/activity_main.xml b/sensorhub-android-app/res/layout/activity_main.xml
index f7ce38a..104e5b3 100644
--- a/sensorhub-android-app/res/layout/activity_main.xml
+++ b/sensorhub-android-app/res/layout/activity_main.xml
@@ -83,7 +83,7 @@
         android:id="@+id/bottom_nav"
         android:layout_width="match_parent"
         android:layout_height="75dp"
-        android:background="@color/md_theme_secondaryContainer"
+        android:background="@color/md_theme_background"
         app:itemIconTint="@color/bottom_nav_selector"
         app:itemTextColor="@color/bottom_nav_selector"
         app:menu="@menu/bottom_nav_menu"
diff --git a/sensorhub-android-app/res/layout/pref_switch_bottom.xml b/sensorhub-android-app/res/layout/pref_switch_bottom.xml
index 514d43b..d62c246 100644
--- a/sensorhub-android-app/res/layout/pref_switch_bottom.xml
+++ b/sensorhub-android-app/res/layout/pref_switch_bottom.xml
@@ -35,12 +35,10 @@
             android:layout_marginTop="2dp" />
     </LinearLayout>
 
-    <Switch
+    <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:focusable="false"
-        android:clickable="false"
-        android:thumbTint="@color/switch_thumb_selector"
-        android:trackTint="@color/switch_track_selector" />
+        android:clickable="false" />
 </LinearLayout>
diff --git a/sensorhub-android-app/res/layout/pref_switch_mid.xml b/sensorhub-android-app/res/layout/pref_switch_mid.xml
index 4141a24..82b7919 100644
--- a/sensorhub-android-app/res/layout/pref_switch_mid.xml
+++ b/sensorhub-android-app/res/layout/pref_switch_mid.xml
@@ -35,12 +35,10 @@
             android:layout_marginTop="2dp" />
     </LinearLayout>
 
-    <Switch
+    <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:focusable="false"
-        android:clickable="false"
-        android:thumbTint="@color/switch_thumb_selector"
-        android:trackTint="@color/switch_track_selector" />
+        android:clickable="false" />
 </LinearLayout>
diff --git a/sensorhub-android-app/res/layout/pref_switch_top.xml b/sensorhub-android-app/res/layout/pref_switch_top.xml
index 9bf2228..e23458f 100644
--- a/sensorhub-android-app/res/layout/pref_switch_top.xml
+++ b/sensorhub-android-app/res/layout/pref_switch_top.xml
@@ -35,12 +35,10 @@
             android:layout_marginTop="2dp" />
     </LinearLayout>
 
-    <Switch
+    <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:focusable="false"
-        android:clickable="false"
-        android:thumbTint="@color/switch_thumb_selector"
-        android:trackTint="@color/switch_track_selector" />
+        android:clickable="false" />
 </LinearLayout>
diff --git a/sensorhub-android-app/res/layout/preference_switch_item.xml b/sensorhub-android-app/res/layout/preference_switch_item.xml
index 24ec3c5..6a6101c 100644
--- a/sensorhub-android-app/res/layout/preference_switch_item.xml
+++ b/sensorhub-android-app/res/layout/preference_switch_item.xml
@@ -30,16 +30,13 @@
             android:textAlignment="viewStart" />
     </LinearLayout>
 
-    <Switch
+    <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:focusable="false"
         android:clickable="false"
         android:paddingStart="0dp"
-        android:paddingEnd="0dp"
-        android:thumbTint="@color/switch_thumb_selector"
-        android:trackTint="@color/switch_track_selector"
-      />
+        android:paddingEnd="0dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/sensorhub-android-app/res/values/colors.xml b/sensorhub-android-app/res/values/colors.xml
index d04f4a1..425e6c5 100644
--- a/sensorhub-android-app/res/values/colors.xml
+++ b/sensorhub-android-app/res/values/colors.xml
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="md_theme_primary">#D35400</color>
+    <color name="md_theme_primary">#E64A19</color>
     <color name="md_theme_onPrimary">#FFFFFF</color>
 
-    <color name="md_theme_primaryContainer">#24160A</color>
-    <color name="md_theme_onPrimaryContainer">#E6B89C</color>
+    <color name="md_theme_primaryContainer">#4E1700</color>
+    <color name="md_theme_onPrimaryContainer">#FFCCBC</color>
 
-    <color name="md_theme_primaryDark">#C24E00</color>
+    <color name="md_theme_primaryDark">#BF360C</color>
 
-    <color name="md_theme_secondary">#9A9A9A</color>
+    <color name="md_theme_secondary">#9E9E9E</color>
     <color name="md_theme_onSecondary">#0A0A0A</color>
 
-    <color name="md_theme_secondaryContainer">#242424</color>
-    <color name="md_theme_onSecondaryContainer">#F5F5F5</color>
+    <color name="md_theme_secondaryContainer">#424242</color>
+    <color name="md_theme_onSecondaryContainer">#E0E0E0</color>
 
-    <color name="md_theme_tertiary">#B84A0D</color>
+    <color name="md_theme_tertiary">#FF7043</color>
     <color name="md_theme_onTertiary">#FFFFFF</color>
 
-    <color name="md_theme_tertiaryContainer">#1C0A00</color>
-    <color name="md_theme_onTertiaryContainer">#E6B89C</color>
+    <color name="md_theme_tertiaryContainer">#4E1700</color>
+    <color name="md_theme_onTertiaryContainer">#FFCCBC</color>
 
     <color name="md_theme_error">#CF6679</color>
     <color name="md_theme_onError">#1C0006</color>
 
-    <color name="md_theme_errorContainer">#4A0011</color>
-    <color name="md_theme_onErrorContainer">#FFB3BA</color>
+    <color name="md_theme_errorContainer">#93000A</color>
+    <color name="md_theme_onErrorContainer">#FFDAD6</color>
 
-    <color name="md_theme_background">#0A0A0A</color>
+    <color name="md_theme_background">#121212</color>
 
-    <color name="md_theme_onBackground">#F5F5F5</color>
+    <color name="md_theme_onBackground">#E0E0E0</color>
 
-    <color name="md_theme_surface">#141414</color>
-    <color name="md_theme_onSurface">#F5F5F5</color>
+    <color name="md_theme_surface">#1E1E1E</color>
+    <color name="md_theme_onSurface">#E0E0E0</color>
 
-    <color name="md_theme_surfaceVariant">#1C1C1C</color>
-    <color name="md_theme_onSurfaceVariant">#9A9A9A</color>
+    <color name="md_theme_surfaceVariant">#2C2C2C</color>
+    <color name="md_theme_onSurfaceVariant">#BDBDBD</color>
 
-    <color name="md_theme_outline">#2E2E2E</color>
+    <color name="md_theme_outline">#616161</color>
 
-    <color name="surface_base">#0A0A0A</color>
-    <color name="surface_low">#141414</color>
-    <color name="surface_card">#1C1C1C</color>
-    <color name="surface_elevated">#242424</color>
+    <color name="surface_base">#E64A19</color>
+    <color name="surface_low">#1E1E1E</color>
+    <color name="surface_card">#2C2C2C</color>
+    <color name="surface_elevated">#333333</color>
 
-    <color name="text_primary">#F5F5F5</color>
-    <color name="text_secondary">#9A9A9A</color>
-    <color name="text_muted">#5A5A5A</color>
+    <color name="text_primary">#E0E0E0</color>
+    <color name="text_secondary">#BDBDBD</color>
+    <color name="text_muted">#757575</color>
 
     <!-- Subtle Orange System -->
-    <color name="accent_orange">#D35400</color>
-    <color name="accent_orange_dark">#C24E00</color>
-    <color name="accent_orange_dim">#1AD35400</color>
+    <color name="accent_orange">#E64A19</color>
+    <color name="accent_orange_dark">#BF360C</color>
+    <color name="accent_orange_dim">#1AE64A19</color>
 
-    <color name="toolbar_bg">#141414</color>
-    <color name="toolbar_title">#F5F5F5</color>
+    <color name="toolbar_bg">#E64A19</color>
+    <color name="toolbar_title">#FFFFFF</color>
 
-    <color name="bottom_nav_bg">#141414</color>
-    <color name="bottom_nav_selected">#D35400</color>
-    <color name="bottom_nav_unselected">#6A6A6A</color>
+    <color name="bottom_nav_bg">#1E1E1E</color>
+    <color name="bottom_nav_selected">#E64A19</color>
+    <color name="bottom_nav_unselected">#757575</color>
 
     <color name="status_started">#4CAF50</color>
-    <color name="status_stopped">#F44336</color>
+    <color name="status_stopped">#EF5350</color>
     <color name="status_initializing">#FF9800</color>
-    <color name="status_unknown">#5A5A5A</color>
+    <color name="status_unknown">#757575</color>
 
     <color name="overlay_light">#1AFFFFFF</color>
     <color name="overlay_dark">#99000000</color>
 
-    <color name="card_info_bg">#1C1C1C</color>
+    <color name="card_info_bg">#2C2C2C</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/sensorhub-android-app/res/values/styles.xml b/sensorhub-android-app/res/values/styles.xml
index f7d52d6..52d73e7 100644
--- a/sensorhub-android-app/res/values/styles.xml
+++ b/sensorhub-android-app/res/values/styles.xml
@@ -4,7 +4,7 @@
     <!-- =========================
          APP THEME (Material 3 Dark)
          ========================= -->
-    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="preferenceCategoryStyle">@style/PreferenceCategoryNoPadding</item>
@@ -45,7 +45,7 @@
         <item name="android:statusBarColor">@color/surface_base</item>
         <item name="android:navigationBarColor">@color/surface_low</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
 
         <!-- COMPONENT THEMING -->
         <item name="toolbarStyle">@style/AppToolbar</item>
@@ -63,6 +63,8 @@
         <item name="android:background">@color/toolbar_bg</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="android:elevation">0dp</item>
+        <item name="navigationIconTint">@color/toolbar_title</item>
+
     </style>
 
     <style name="ToolbarTitle">
@@ -90,8 +92,9 @@
     <style name="AppButton" parent="Widget.Material3.Button">
         <item name="cornerRadius">100dp</item>
         <item name="android:textAllCaps">false</item>
-        <item name="backgroundTint">@color/md_theme_primaryContainer</item>
-        <item name="android:textColor">@color/md_theme_primary</item>
+        <item name="backgroundTint">@color/md_theme_primary</item>
+        <item name="android:textColor">@color/md_theme_onPrimary</item>
+        <item name="iconTint">@color/md_theme_onPrimary</item>
     </style>
 
     <style name="AppButton.Outline" parent="Widget.Material3.Button.OutlinedButton">
@@ -108,8 +111,8 @@
     </style>
 
     <style name="AppButton.Icon" parent="Widget.Material3.Button.IconButton">
-        <item name="android:backgroundTint">@color/surface_elevated</item>
-        <item name="iconTint">@color/text_secondary</item>
+        <item name="android:backgroundTint">@color/md_theme_primary</item>
+        <item name="iconTint">@color/md_theme_onPrimary</item>
     </style>
 
 
@@ -214,6 +217,8 @@
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">16sp</item>
+        <item name="android:paddingBottom">10dp</item>
+
     </style>
 
     <style name="PreferenceSummary" parent="TextAppearance.Material3.BodyMedium">
@@ -249,5 +254,4 @@
         <item name="strokeColor">@color/accent_orange_dim</item>
         <item name="cornerRadius">18px</item>
     </style>
-
 </resources>
\ No newline at end of file
diff --git a/sensorhub-android-app/res/xml/pref_settings.xml b/sensorhub-android-app/res/xml/pref_settings.xml
index 4394087..6a30d18 100644
--- a/sensorhub-android-app/res/xml/pref_settings.xml
+++ b/sensorhub-android-app/res/xml/pref_settings.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <!--  Server Management  -->
-    <PreferenceCategory android:title="@string/server_profiles">
+    <!-- Connection -->
+    <PreferenceCategory>
         <Preference
             android:key="manage_servers"
             android:title="@string/manage_servers"
-            android:summary="@string/server_profile_summary"
-            android:layout="@layout/preference_list_item" />
+            android:selectAllOnFocus="true"
+            app:useSimpleSummaryProvider="true"
+            android:layout="@layout/pref_value_single" />
     </PreferenceCategory>
 
-
     <!-- SERVICES -->
-    <PreferenceCategory android:title="@string/services">
-
+    <PreferenceCategory>
         <SwitchPreferenceCompat
             android:id="@+id/sos_service_switch"
             android:key="sos_service"
             android:title="@string/enable_sos_service"
             android:summary="@string/summary_sos"
             android:defaultValue="true"
-            android:layout="@layout/preference_switch_item" />
+            android:layout="@layout/pref_switch_top" />
 
         <SwitchPreferenceCompat
             android:id="@+id/csapi_service_switch"
@@ -30,7 +28,7 @@
             android:title="@string/enable_csapi_service"
             android:summary="@string/summary_csapi"
             android:defaultValue="true"
-            android:layout="@layout/preference_switch_item" />
+            android:layout="@layout/pref_switch_mid" />
 
         <SwitchPreferenceCompat
             android:id="@+id/discovery_service_switch"
@@ -38,7 +36,7 @@
             android:summary="@string/summary_discovery"
             android:title="@string/enable_discovery_service"
             android:defaultValue="false"
-            android:layout="@layout/preference_switch_item" />
+            android:layout="@layout/pref_switch_bottom" />
 
         <EditTextPreference
             android:defaultValue="https://drive.google.com/uc?export=download&amp;id="
@@ -48,8 +46,7 @@
             android:key="rules_link"
             android:singleLine="true"
             android:title="@string/title_discovery_rules"
-            android:layout="@layout/preference_item"/>
+            android:layout="@layout/pref_edit_bottom" />
     </PreferenceCategory>
 
-
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>

From 8cb780ed89c26d0b2b51a68b5252322feaa8c0aa Mon Sep 17 00:00:00 2001
From: kalynstricklin <kalynstricklin@botts-inc.com>
Date: Tue, 7 Jul 2026 14:01:44 -0500
Subject: [PATCH 2/2] updated theme

---
 .../layout/activity_edit_server_profile.xml   |  6 +++---
 .../res/layout/fragment_dashboard.xml         |  4 ++--
 .../res/layout/item_faq_entry.xml             |  8 ++++----
 .../res/layout/item_server_profile.xml        |  3 +--
 .../res/layout/item_server_status.xml         |  2 +-
 sensorhub-android-app/res/values/colors.xml   |  3 ++-
 sensorhub-android-app/res/values/styles.xml   | 12 ++++++++++++
 .../sensorhub/android/DashboardFragment.java  | 19 +++++++++++++++++++
 8 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/sensorhub-android-app/res/layout/activity_edit_server_profile.xml b/sensorhub-android-app/res/layout/activity_edit_server_profile.xml
index 87f7256..b819919 100644
--- a/sensorhub-android-app/res/layout/activity_edit_server_profile.xml
+++ b/sensorhub-android-app/res/layout/activity_edit_server_profile.xml
@@ -36,7 +36,7 @@
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="0dp"
                 app:strokeColor="@color/md_theme_outline"
-                app:strokeWidth="1dp">
+                app:strokeWidth="0dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -95,7 +95,7 @@
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="0dp"
                 app:strokeColor="@color/md_theme_outline"
-                app:strokeWidth="1dp">
+                app:strokeWidth="0dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -213,7 +213,7 @@
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="0dp"
                 app:strokeColor="@color/md_theme_outline"
-                app:strokeWidth="1dp">
+                app:strokeWidth="0dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/sensorhub-android-app/res/layout/fragment_dashboard.xml b/sensorhub-android-app/res/layout/fragment_dashboard.xml
index a67b21f..e2d6319 100644
--- a/sensorhub-android-app/res/layout/fragment_dashboard.xml
+++ b/sensorhub-android-app/res/layout/fragment_dashboard.xml
@@ -33,7 +33,7 @@
                 app:cardElevation="@dimen/card_elevation"
                 app:cardBackgroundColor="@color/md_theme_background"
                 app:strokeColor="@color/status_started"
-                app:strokeWidth="1dp">
+                app:strokeWidth="0dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -100,7 +100,7 @@
                 app:cardElevation="@dimen/card_elevation"
                 app:cardBackgroundColor="@color/md_theme_background"
                 app:strokeColor="@color/md_theme_outline"
-                app:strokeWidth="1dp">
+                app:strokeWidth="0dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/sensorhub-android-app/res/layout/item_faq_entry.xml b/sensorhub-android-app/res/layout/item_faq_entry.xml
index 6fe1b4a..7d88c56 100644
--- a/sensorhub-android-app/res/layout/item_faq_entry.xml
+++ b/sensorhub-android-app/res/layout/item_faq_entry.xml
@@ -7,7 +7,7 @@
     android:layout_marginBottom="8dp"
     app:cardCornerRadius="@dimen/card_corner_radius"
     app:cardElevation="@dimen/card_elevation"
-    app:cardBackgroundColor="@color/md_theme_surface">
+    app:cardBackgroundColor="@color/dialog_bg">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,7 +26,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textColor="@color/md_theme_onSurface"
+                android:textColor="@android:color/white"
                 android:textSize="15sp"
                 android:fontFamily="sans-serif-medium" />
 
@@ -36,7 +36,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="8dp"
                 android:src="@drawable/ic_expand_more"
-                app:tint="@color/md_theme_onSurfaceVariant"
+                app:tint="@android:color/white"
                 android:contentDescription="Expand" />
 
         </LinearLayout>
@@ -46,7 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:textColor="@color/md_theme_onSurfaceVariant"
+            android:textColor="@android:color/white"
             android:textSize="14sp"
             android:lineSpacingExtra="4dp"
             android:visibility="gone" />
diff --git a/sensorhub-android-app/res/layout/item_server_profile.xml b/sensorhub-android-app/res/layout/item_server_profile.xml
index 45fa407..19bdf7d 100644
--- a/sensorhub-android-app/res/layout/item_server_profile.xml
+++ b/sensorhub-android-app/res/layout/item_server_profile.xml
@@ -11,8 +11,7 @@
     app:cardCornerRadius="@dimen/card_corner_radius"
     app:cardElevation="0dp"
     app:cardBackgroundColor="@color/surface_card"
-    app:strokeColor="@color/md_theme_outline"
-    app:strokeWidth="1dp">
+    app:strokeWidth="0dp">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/sensorhub-android-app/res/layout/item_server_status.xml b/sensorhub-android-app/res/layout/item_server_status.xml
index 60bf5e5..c34d783 100644
--- a/sensorhub-android-app/res/layout/item_server_status.xml
+++ b/sensorhub-android-app/res/layout/item_server_status.xml
@@ -11,7 +11,7 @@
     app:cardElevation="@dimen/card_elevation"
     app:cardBackgroundColor="@color/md_theme_background"
     app:strokeColor="@color/md_theme_outline"
-    app:strokeWidth="1dp">
+    app:strokeWidth="0dp">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/sensorhub-android-app/res/values/colors.xml b/sensorhub-android-app/res/values/colors.xml
index 425e6c5..42b44bf 100644
--- a/sensorhub-android-app/res/values/colors.xml
+++ b/sensorhub-android-app/res/values/colors.xml
@@ -68,6 +68,7 @@
     <color name="overlay_light">#1AFFFFFF</color>
     <color name="overlay_dark">#99000000</color>
 
-    <color name="card_info_bg">#2C2C2C</color>
+    <color name="card_info_bg">#212121</color>
+    <color name="dialog_bg">#212121</color>
 
 </resources>
diff --git a/sensorhub-android-app/res/values/styles.xml b/sensorhub-android-app/res/values/styles.xml
index 52d73e7..bdd6d7f 100644
--- a/sensorhub-android-app/res/values/styles.xml
+++ b/sensorhub-android-app/res/values/styles.xml
@@ -52,9 +52,21 @@
         <item name="materialCardViewStyle">@style/AppCard</item>
         <item name="materialButtonStyle">@style/AppButton</item>
         <item name="textInputStyle">@style/AppTextInput</item>
+        <item name="materialAlertDialogTheme">@style/AppDialog</item>
+        <item name="alertDialogTheme">@style/AppDialog</item>
 
     </style>
 
+    <style name="AppDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="colorSurface">@color/dialog_bg</item>
+        <item name="android:backgroundTint">@color/dialog_bg</item>
+        <item name="android:windowBackground">@color/dialog_bg</item>
+        <item name="colorOnSurface">@android:color/white</item>
+        <item name="colorOnSurfaceVariant">@android:color/white</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColorSecondary">@android:color/white</item>
+    </style>
 
     <!-- =========================
          TOOLBAR STYLE
diff --git a/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java b/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java
index a4b1545..f41e01f 100644
--- a/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java
+++ b/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java
@@ -639,6 +639,24 @@ private void updateVideoControlsVisibility() {
             boolean showFlip = hasVideo && android.hardware.Camera.getNumberOfCameras() > 1;
             btnFlipCamera.setVisibility(showFlip ? View.VISIBLE : View.GONE);
         }
+
+        boolean isBackCamera = isBackCameraActive();
+        if (btnZoomIn != null) btnZoomIn.setVisibility(isBackCamera ? View.VISIBLE : View.GONE);
+        if (btnZoomOut != null) btnZoomOut.setVisibility(isBackCamera ? View.VISIBLE : View.GONE);
+    }
+
+    @SuppressWarnings("deprecation")
+    private boolean isBackCameraActive() {
+        AndroidSensorsDriver sensors = provider.getAndroidSensors();
+        if (sensors == null) return true;
+        try {
+            int cameraId = sensors.getConfiguration().selectedCameraId;
+            android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
+            android.hardware.Camera.getCameraInfo(cameraId, info);
+            return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
+        } catch (Exception e) {
+            return true;
+        }
     }
 
     @SuppressWarnings("deprecation")
@@ -671,6 +689,7 @@ private void flipCamera() {
             if (targetId >= 0) {
                 sensors.switchCamera(targetId);
                 currentZoomLevel = 0;
+                updateVideoControlsVisibility();
                 Toast.makeText(requireContext(), "Switched to " + targetFacing.toLowerCase() + " camera", Toast.LENGTH_SHORT).show();
             }
         } catch (Exception e) {