From e70b27cb30e1a4c2fafd4cc67018196ad98f0d3a Mon Sep 17 00:00:00 2001
From: Mat <mail@mathias.is>
Date: Thu, 1 Feb 2024 10:41:54 +0200
Subject: [PATCH] Fix incorrect theme in older Android versions

tools:targetApi is only used for the linter.
---
 app/src/main/res/values-night-v23/themes.xml | 8 ++++++++
 app/src/main/res/values-night-v27/themes.xml | 8 ++++++++
 app/src/main/res/values-night/themes.xml     | 9 ++-------
 app/src/main/res/values-v23/themes.xml       | 8 ++++++++
 app/src/main/res/values-v27/themes.xml       | 8 ++++++++
 app/src/main/res/values/themes.xml           | 9 ++-------
 6 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/values-night-v23/themes.xml
 create mode 100644 app/src/main/res/values-night-v27/themes.xml
 create mode 100644 app/src/main/res/values-v23/themes.xml
 create mode 100644 app/src/main/res/values-v27/themes.xml

diff --git a/app/src/main/res/values-night-v23/themes.xml b/app/src/main/res/values-night-v23/themes.xml
new file mode 100644
index 0000000..d2aba12
--- /dev/null
+++ b/app/src/main/res/values-night-v23/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="BaseTheme.v23" />
+    <style name="BaseTheme.v23" parent="BaseTheme">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night-v27/themes.xml b/app/src/main/res/values-night-v27/themes.xml
new file mode 100644
index 0000000..3fbbddc
--- /dev/null
+++ b/app/src/main/res/values-night-v27/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="BaseTheme.v27" />
+    <style name="BaseTheme.v27" parent="BaseTheme.v23">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e495982..46a3876 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,5 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="AppTheme" parent="BaseTheme" />
+    <style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/md_theme_dark_primary</item>
         <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
@@ -29,11 +30,5 @@
 
         <item name="android:indeterminateTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
         <item name="android:progressTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
-
-        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
-        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
-
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
new file mode 100644
index 0000000..7eaacea
--- /dev/null
+++ b/app/src/main/res/values-v23/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="BaseTheme.v23" />
+    <style name="BaseTheme.v23" parent="BaseTheme">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
new file mode 100644
index 0000000..170da24
--- /dev/null
+++ b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="BaseTheme.v27" />
+    <style name="BaseTheme.v27" parent="BaseTheme.v23">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4ca57ea..3e28858 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="AppTheme" parent="BaseTheme" />
+    <style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>
         <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
@@ -29,12 +30,6 @@
 
         <item name="android:indeterminateTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
         <item name="android:progressTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
-
-        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
-        <item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
-
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
     </style>
 
     <style name="Preference.SwitchPreferenceCompat">