From 95ab14601fbd59ca18d8dc9b2d503b6a15dabeca Mon Sep 17 00:00:00 2001
From: Andrea Severi <andrea.severi.dev@gmail.com>
Date: Wed, 11 Dec 2024 09:13:46 +0100
Subject: [PATCH 1/4] opt out of forced dark mode

---
 app/src/main/res/values-v29/themes.xml | 21 +++++++++++++++++++++
 app/src/main/res/values/themes.xml     |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-v29/themes.xml

diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
new file mode 100644
index 000000000..beba8427b
--- /dev/null
+++ b/app/src/main/res/values-v29/themes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia">
+        <item name="android:forceDarkAllowed">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7cdd25527..743ea737c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -21,7 +21,9 @@
     <style name="NightAdjusted.Theme.Nia" parent="android:Theme.Material.Light.NoActionBar" />
 
     <!-- The final theme we use -->
-    <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia" />
+    <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia">
+        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+    </style>
 
     <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>

From 1927b6d9bd699c53113972ed660b7c07cadba009 Mon Sep 17 00:00:00 2001
From: Andrea Severi <andrea.severi.dev@gmail.com>
Date: Wed, 11 Dec 2024 13:32:25 +0100
Subject: [PATCH 2/4] fix xml spotless check

---
 app/src/main/res/values-v29/themes.xml | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
index beba8427b..1ae0b5fa1 100644
--- a/app/src/main/res/values-v29/themes.xml
+++ b/app/src/main/res/values-v29/themes.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2024 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2021 The Android Open Source Project
 
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <resources>
     <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia">
         <item name="android:forceDarkAllowed">false</item>

From 67646f3fd561f2bd947979113c258859b7819ce9 Mon Sep 17 00:00:00 2001
From: Andrea Severi <andrea.severi.dev@gmail.com>
Date: Thu, 19 Dec 2024 16:44:06 +0100
Subject: [PATCH 3/4] replace version code with api level

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

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 743ea737c..57077a216 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -22,7 +22,7 @@
 
     <!-- The final theme we use -->
     <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia">
-        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
     </style>
 
     <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">

From 38dcac53408f9dc337f28e489c46b0246b344094 Mon Sep 17 00:00:00 2001
From: Andrea Severi <andrea.severi.dev@gmail.com>
Date: Thu, 19 Dec 2024 16:44:33 +0100
Subject: [PATCH 4/4] remove API 29 themes.xml

---
 app/src/main/res/values-v29/themes.xml | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 app/src/main/res/values-v29/themes.xml

diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
deleted file mode 100644
index 1ae0b5fa1..000000000
--- a/app/src/main/res/values-v29/themes.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <style name="Theme.Nia" parent="NightAdjusted.Theme.Nia">
-        <item name="android:forceDarkAllowed">false</item>
-    </style>
-</resources>