From 3138c5ceb4cfeeca64fce9c4a3504c2bb0c2a5ff Mon Sep 17 00:00:00 2001
From: Luis Guzman <luisguzman@appdevforall.org>
Date: Sat, 3 Oct 2026 02:53:51 -0600
Subject: [PATCH 1/2] K2GO-439 fix(theme): dark status bar icons in light theme

Theme.K2Go never set windowLightStatusBar, so the status bar icons stayed light
in both themes. targetSdk 35 forces edge-to-edge and drops the system auto-scrim,
so in light theme the light icons became unreadable on the light background.
Set windowLightStatusBar and windowLightNavigationBar from a day/night qualified
bool (values[-night]/bools.xml), the same pattern as the color tokens.
---
 controller/app/src/main/res/values-night/bools.xml | 5 +++++
 controller/app/src/main/res/values/bools.xml       | 6 ++++++
 controller/app/src/main/res/values/themes_k2go.xml | 6 ++++++
 3 files changed, 17 insertions(+)
 create mode 100644 controller/app/src/main/res/values-night/bools.xml
 create mode 100644 controller/app/src/main/res/values/bools.xml

diff --git a/controller/app/src/main/res/values-night/bools.xml b/controller/app/src/main/res/values-night/bools.xml
new file mode 100644
index 000000000..d055bc5df
--- /dev/null
+++ b/controller/app/src/main/res/values-night/bools.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- K2GO-439 follow-up: dark theme. false = dark bars, so the OS draws light (white) icons. -->
+    <bool name="k2go_light_system_bars">false</bool>
+</resources>
diff --git a/controller/app/src/main/res/values/bools.xml b/controller/app/src/main/res/values/bools.xml
new file mode 100644
index 000000000..b38e01587
--- /dev/null
+++ b/controller/app/src/main/res/values/bools.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- K2GO-439 follow-up: light theme. true = the system bars are light, so the OS draws dark
+         icons, readable on the light background. Dark twin in values-night/bools.xml. -->
+    <bool name="k2go_light_system_bars">true</bool>
+</resources>
diff --git a/controller/app/src/main/res/values/themes_k2go.xml b/controller/app/src/main/res/values/themes_k2go.xml
index 3c862f291..83e6b22c9 100644
--- a/controller/app/src/main/res/values/themes_k2go.xml
+++ b/controller/app/src/main/res/values/themes_k2go.xml
@@ -41,6 +41,12 @@
              variants. All share ShapeAppearance.K2Go.Button (official M3 full/pill), so the corner lives in
              one place and primary/secondary never disagree. -->
         <item name="materialButtonStyle">@style/Widget.K2Go.Button</item>
+        <!-- K2GO-439 follow-up: targetSdk 35 forces edge-to-edge and drops the auto status-bar scrim,
+             so the app must set the system-bar icon contrast itself (Material3 does not default it).
+             true means a light bar with dark icons. The value is day/night qualified in
+             values[-night]/bools.xml, the same pattern as the color tokens. -->
+        <item name="android:windowLightStatusBar">@bool/k2go_light_system_bars</item>
+        <item name="android:windowLightNavigationBar">@bool/k2go_light_system_bars</item>
     </style>
 
     <!-- ADFA-5346: shared button shape — official Material 3 fully-rounded (stadium/pill). Change here to

From 510667de855fe78c00831ae7f34999546aa78649 Mon Sep 17 00:00:00 2001
From: Luis Guzman <luisguzman@appdevforall.org>
Date: Sat, 3 Oct 2026 03:16:54 -0600
Subject: [PATCH 2/2] K2GO-439 fix(theme): drop windowLightNavigationBar
 (NewApi vs minSdk 24)

Lint NewApi blocks android:windowLightNavigationBar in values/ (it needs API 27,
minSdk is 24). The reported issue is the status bar, and the navigation bar
renders correctly, so drop the attr instead of gating it in values-v27.
windowLightStatusBar (API 23) stays and still fixes the light-theme icons.
---
 controller/app/src/main/res/values/themes_k2go.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/controller/app/src/main/res/values/themes_k2go.xml b/controller/app/src/main/res/values/themes_k2go.xml
index 83e6b22c9..ec081b38c 100644
--- a/controller/app/src/main/res/values/themes_k2go.xml
+++ b/controller/app/src/main/res/values/themes_k2go.xml
@@ -42,11 +42,11 @@
              one place and primary/secondary never disagree. -->
         <item name="materialButtonStyle">@style/Widget.K2Go.Button</item>
         <!-- K2GO-439 follow-up: targetSdk 35 forces edge-to-edge and drops the auto status-bar scrim,
-             so the app must set the system-bar icon contrast itself (Material3 does not default it).
-             true means a light bar with dark icons. The value is day/night qualified in
-             values[-night]/bools.xml, the same pattern as the color tokens. -->
+             so the app must set the status-bar icon contrast itself (Material3 does not default it).
+             true means a light bar with dark icons. Day/night qualified in values[-night]/bools.xml,
+             the same pattern as the color tokens. windowLightNavigationBar is not set: the nav bar
+             renders correctly already, and that attr is API 27 (above the minSdk 24). -->
         <item name="android:windowLightStatusBar">@bool/k2go_light_system_bars</item>
-        <item name="android:windowLightNavigationBar">@bool/k2go_light_system_bars</item>
     </style>
 
     <!-- ADFA-5346: shared button shape — official Material 3 fully-rounded (stadium/pill). Change here to