From 106d3eb62dd9257c8270a06b16638bccf0b3abcd Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 2 Jul 2026 15:23:54 +0200
Subject: [PATCH] chore(android): move v23 styles into v23 resource file

Current min Android SDK for Keyman is v21.

See: https://developer.android.com/develop/ui/views/theming/themes#Versions
---
 .../kMAPro/src/main/res/values-night-v23/styles.xml   |  6 ++++++
 .../kMAPro/src/main/res/values-night/styles.xml       |  2 +-
 .../KMAPro/kMAPro/src/main/res/values-v23/styles.xml  | 11 +++++++++++
 android/KMAPro/kMAPro/src/main/res/values/styles.xml  |  4 ++--
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 android/KMAPro/kMAPro/src/main/res/values-night-v23/styles.xml
 create mode 100644 android/KMAPro/kMAPro/src/main/res/values-v23/styles.xml

diff --git a/android/KMAPro/kMAPro/src/main/res/values-night-v23/styles.xml b/android/KMAPro/kMAPro/src/main/res/values-night-v23/styles.xml
new file mode 100644
index 0000000000..eaeeaa087d
--- /dev/null
+++ b/android/KMAPro/kMAPro/src/main/res/values-night-v23/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="AppTheme.Base" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml b/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml
index 3667b18a9f..d13099886e 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-night/styles.xml
@@ -22,7 +22,7 @@
         <item name="windowNoTitle">true</item>
 
         <item name="android:statusBarColor">@android:color/black</item>
-        <item name="android:windowLightStatusBar">false</item>
+        <!-- see values-night-v23/styles.xml: <item name="android:windowLightStatusBar">false</item> -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
 
         <item name="actionOverflowMenuStyle">@style/AppTheme.PopupMenu</item>
diff --git a/android/KMAPro/kMAPro/src/main/res/values-v23/styles.xml b/android/KMAPro/kMAPro/src/main/res/values-v23/styles.xml
new file mode 100644
index 0000000000..0217445182
--- /dev/null
+++ b/android/KMAPro/kMAPro/src/main/res/values-v23/styles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="AppTheme.Base" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="AppTheme.Toolbar" parent="Base.Widget.AppCompat.Toolbar">
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/KMAPro/kMAPro/src/main/res/values/styles.xml b/android/KMAPro/kMAPro/src/main/res/values/styles.xml
index 78a4a47ff9..9366cd1441 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/styles.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
         <item name="windowNoTitle">true</item>
 
         <item name="android:statusBarColor">@color/toolbarColor</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <!-- see values-v23/styles.xml: <item name="android:windowLightStatusBar">true</item> -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <!--
             Theme customizations available in newer API levels can go in
@@ -56,7 +56,7 @@
         <item name="android:textColorPrimary">@android:color/black</item>
         <item name="android:textColorSecondary">@android:color/black</item>
         <item name="android:statusBarColor">@color/toolbarColor</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <!-- see values-v23/styles.xml: <item name="android:windowLightStatusBar">true</item> -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
 
     </style>