From bef1f8a2ffbc3d20ef0b56a3a06f0d26b68ce0b9 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Aug 2025 17:02:38 +0200
Subject: [PATCH 1/8] fix: adjust padding for root view to account for status
 bar height

---
 .../main/java/org/kabiri/android/usbterminal/MainActivity.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index c722126..df97509 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -41,7 +41,7 @@ class MainActivity : AppCompatActivity() {
         ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
             val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
-            view.setPadding(0, 0, 0, maxOf(systemBarsInsets.bottom, imeInsets.bottom))
+            view.setPadding(0, systemBarsInsets.top, 0, maxOf(systemBarsInsets.bottom, imeInsets.bottom))
             insets
         }
 

From 6fe905e674f7ff7a5e8ce28892a9d07f03342578 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sat, 30 Aug 2025 17:26:42 +0200
Subject: [PATCH 2/8] fix: update ModalBottomSheetTheme styles for night mode
 support

---
 app/src/main/res/values-night/styles.xml |  6 ++++++
 app/src/main/res/values/styles.xml       | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-night/styles.xml

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..9b01256
--- /dev/null
+++ b/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,6 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Only override what differs from day -->
+    <style name="ModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2fb7bc7..99ed17c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,11 +15,17 @@
         <item name="android:background">@drawable/bg_modal_bottom_sheet</item>
     </style>
 
-    <style name="ModalBottomSheetTheme" parent="Theme.Design.BottomSheetDialog">
+    <!-- Common items for the bottom sheet theme -->
+    <style name="ModalBottomSheetTheme.Base" parent="Theme.Design.BottomSheetDialog">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
+        <item name="android:navigationBarColor">@color/bg_modal_bottom_sheet</item>
         <item name="android:windowIsFloating">false</item>
         <item name="bottomSheetStyle">@style/ModalBottomSheet</item>
     </style>
 
+    <!-- Day variant adds light nav bar icons -->
+    <style name="ModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
+    </style>
+
 </resources>

From 586c828df935f415bdaf2a6184b9fe5ed01bb556 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Aug 2025 08:05:09 +0200
Subject: [PATCH 3/8] fix: update themes for bottom sheet dialogs and hopefully
 adjust status bar icon visibility

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../common/CustomBottomSheetDialogFragment.kt |  2 +-
 app/src/main/res/values-night/styles.xml      |  4 ++--
 app/src/main/res/values-v23/styles.xml        | 12 ++++++++++
 app/src/main/res/values/styles.xml            | 24 ++++++++++++++-----
 5 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/values-v23/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 07074fa..5f3634f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/UsbTerminalTheme"
         android:dataExtractionRules="@xml/data_extraction_rules"
         tools:targetApi="s">
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt b/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt
index 5b91456..d248330 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/ui/common/CustomBottomSheetDialogFragment.kt
@@ -12,7 +12,7 @@ open class CustomBottomSheetDialogFragment(
     private val canUserDragToCancel: Boolean = true,
 ): BottomSheetDialogFragment() {
 
-    override fun getTheme(): Int = R.style.ModalBottomSheetTheme
+    override fun getTheme(): Int = R.style.SettingModalBottomSheetTheme
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
         BottomSheetDialog(requireContext(), theme)
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 9b01256..7cf31cd 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Only override what differs from day -->
-    <style name="ModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
+    <!-- Night: nav bar icons should be light -->
+    <style name="SettingModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
         <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
new file mode 100644
index 0000000..fa87d4f
--- /dev/null
+++ b/app/src/main/res/values-v23/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+    <!-- API 23+: control status bar icon contrast (dark icons vs light icons) -->
+    <style name="UsbTerminalTheme" parent="@style/AppTheme.Base">
+        <!-- Turquoise status bar needs light icons for readability -->
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="SettingModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
+        <!-- Keep light icons on the turquoise status bar in the dialog as well -->
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 99ed17c..a5eb38f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,30 +1,42 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <!-- Ensure status bar tone matches app bar exactly -->
+        <item name="colorPrimaryDark">@color/colorPrimary</item>
         <item name="colorAccent">@color/colorAccent</item>
 
         <item name="android:textColorPrimary">@color/textColorPrimary</item>
         <item name="android:textColorSecondary">@color/textColorSecondary</item>
+
+        <!-- Make the status bar match the app bar color -->
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
-    <style name="ModalBottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
+    <!-- App theme alias; v23 will override this to add icon contrast -->
+    <style name="UsbTerminalTheme" parent="@style/AppTheme.Base" />
+
+    <style name="ModalBottomSheet" parent="@style/Widget.MaterialComponents.BottomSheet.Modal">
+        <!-- Tint ensures Material background matches day/night color -->
+        <item name="backgroundTint">@color/bg_modal_bottom_sheet</item>
         <item name="android:background">@drawable/bg_modal_bottom_sheet</item>
     </style>
 
     <!-- Common items for the bottom sheet theme -->
-    <style name="ModalBottomSheetTheme.Base" parent="Theme.Design.BottomSheetDialog">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+    <style name="ModalBottomSheetTheme.Base" parent="Theme.MaterialComponents.BottomSheetDialog">
+        <!-- Match activity/app bar color for a unified look -->
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
         <item name="android:navigationBarColor">@color/bg_modal_bottom_sheet</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowIsFloating">false</item>
         <item name="bottomSheetStyle">@style/ModalBottomSheet</item>
     </style>
 
     <!-- Day variant adds light nav bar icons -->
-    <style name="ModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
+    <style name="SettingModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>
 

From 31e70d82acecca079b1d7b83d3d029a018ed5e9a Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Aug 2025 08:34:20 +0200
Subject: [PATCH 4/8] ui: add AppBarLayout and MaterialToolbar to improve UI
 structure

---
 app/src/main/res/layout/activity_main.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0c64f18..8913432 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,24 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Widget.MaterialComponents.Toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:titleTextColor="@android:color/white"
+            app:navigationIconTint="@android:color/white" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <TextView
         android:id="@+id/tvOutput"
         android:layout_width="0dp"
@@ -22,7 +40,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/app_bar" />
 
     <Button
         android:id="@+id/btEnter"
@@ -49,4 +67,4 @@
         app:layout_constraintStart_toStartOf="parent"
         android:imeOptions="actionSend"/>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>

From 02684c52223833946d97b0ef703859103ab4a7a1 Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Aug 2025 08:42:18 +0200
Subject: [PATCH 5/8] fix: adjust toolbar padding to prevent content overlap
 with system bars

---
 .../org/kabiri/android/usbterminal/MainActivity.kt | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index df97509..aea72c6 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -36,12 +36,22 @@ class MainActivity : AppCompatActivity() {
         viewModel.startObservingUsbDevice()
         setContentView(R.layout.activity_main)
 
-        // avoid system navbar or soft keyboard overlapping the content.
         val rootView = findViewById<View>(R.id.root_view)
+        val toolbar = findViewById<com.google.android.material.appbar.MaterialToolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
         ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
             val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
-            view.setPadding(0, systemBarsInsets.top, 0, maxOf(systemBarsInsets.bottom, imeInsets.bottom))
+
+            // Toolbar consumes status bar space; content avoids bottom system bars
+            toolbar.setPadding(
+                toolbar.paddingLeft,
+                systemBarsInsets.top,
+                toolbar.paddingRight,
+                toolbar.paddingBottom,
+            )
+            view.setPadding(0, 0, 0, maxOf(systemBarsInsets.bottom, imeInsets.bottom))
             insets
         }
 

From 66099e5719fc761255977b0a08e2c87b53a66e9c Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Aug 2025 09:04:15 +0200
Subject: [PATCH 6/8] docs: update comment to make it more accurate

---
 app/src/main/res/values-v23/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index fa87d4f..4a3b75b 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -6,7 +6,7 @@
     </style>
 
     <style name="SettingModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
-        <!-- Keep light icons on the turquoise status bar in the dialog as well -->
+        <!-- Keep light icons on the turquoise status bar in the modal as well -->
         <item name="android:windowLightStatusBar">false</item>
     </style>
 </resources>

From 70e4c0c0d8a1a2d5d37f3964f1dfc1816e4d6aac Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Aug 2025 09:13:11 +0200
Subject: [PATCH 7/8] ui: use material 3

---
 app/src/main/res/layout/activity_main.xml |  2 ++
 app/src/main/res/values-v29/styles.xml    | 12 ++++++++++++
 app/src/main/res/values/styles.xml        | 19 +++----------------
 3 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/values-v29/styles.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8913432..e2b6c92 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,6 +12,7 @@
         android:id="@+id/app_bar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
@@ -21,6 +22,7 @@
             style="@style/Widget.MaterialComponents.Toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary"
             app:titleTextColor="@android:color/white"
             app:navigationIconTint="@android:color/white" />
 
diff --git a/app/src/main/res/values-v29/styles.xml b/app/src/main/res/values-v29/styles.xml
new file mode 100644
index 0000000..9921f36
--- /dev/null
+++ b/app/src/main/res/values-v29/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+    <!-- API 29+: disable forced contrast scrims on system bars -->
+    <style name="UsbTerminalTheme" parent="@style/AppTheme.Base">
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+    </style>
+
+    <style name="SettingModalBottomSheetTheme" parent="@style/ModalBottomSheetTheme.Base">
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a5eb38f..fda2dc1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
-    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="AppTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <!-- Ensure status bar tone matches app bar exactly -->
@@ -10,29 +10,16 @@
 
         <item name="android:textColorPrimary">@color/textColorPrimary</item>
         <item name="android:textColorSecondary">@color/textColorSecondary</item>
-
-        <!-- Make the status bar match the app bar color -->
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 
     <!-- App theme alias; v23 will override this to add icon contrast -->
     <style name="UsbTerminalTheme" parent="@style/AppTheme.Base" />
 
-    <style name="ModalBottomSheet" parent="@style/Widget.MaterialComponents.BottomSheet.Modal">
-        <!-- Tint ensures Material background matches day/night color -->
-        <item name="backgroundTint">@color/bg_modal_bottom_sheet</item>
-        <item name="android:background">@drawable/bg_modal_bottom_sheet</item>
-    </style>
-
     <!-- Common items for the bottom sheet theme -->
-    <style name="ModalBottomSheetTheme.Base" parent="Theme.MaterialComponents.BottomSheetDialog">
-        <!-- Match activity/app bar color for a unified look -->
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
+    <style name="ModalBottomSheetTheme.Base" parent="Theme.Material3.DayNight.BottomSheetDialog">
+        <!-- Edge-to-edge for modal as well; host handles coloring -->
         <item name="android:navigationBarColor">@color/bg_modal_bottom_sheet</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="bottomSheetStyle">@style/ModalBottomSheet</item>
     </style>
 
     <!-- Day variant adds light nav bar icons -->

From 24be5d9e0495bb46dfc57e81fe35367d1af447ca Mon Sep 17 00:00:00 2001
From: Ali Kabiri <k4biri@icloud.com>
Date: Sun, 31 Aug 2025 09:28:18 +0200
Subject: [PATCH 8/8] chore: bump version code and version number

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6499738..be9072e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,8 +37,8 @@ android {
         applicationId = "org.kabiri.android.usbterminal"
         minSdk = 24
         targetSdk = 35
-        versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 16
-        versionName = "0.9.86${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
+        versionCode = System.getenv("CIRCLE_BUILD_NUM")?.toIntOrNull() ?: 17
+        versionName = "0.9.87${System.getenv("CIRCLE_BUILD_NUM") ?: ""}"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }