From e309e6ddaf7de949840ea48cb29aecae00a5abd9 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <darryl@dpogue.ca>
Date: Tue, 8 Sep 2026 18:27:50 -0700
Subject: [PATCH] Simplify Android colour structure

---
 templates/project/res/values-night-v34/cdv_colors.xml | 3 +--
 templates/project/res/values-night/cdv_colors.xml     | 3 +--
 templates/project/res/values-v34/cdv_colors.xml       | 3 +--
 templates/project/res/values/cdv_colors.xml           | 5 ++++-
 templates/project/res/values/cdv_themes.xml           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/project/res/values-night-v34/cdv_colors.xml b/templates/project/res/values-night-v34/cdv_colors.xml
index 9c428d87dc..3945fbb088 100644
--- a/templates/project/res/values-night-v34/cdv_colors.xml
+++ b/templates/project/res/values-night-v34/cdv_colors.xml
@@ -18,6 +18,5 @@
  under the License.
 -->
 <resources>
-    <color name="cdv_background_color">@android:color/system_background_dark</color>
-    <color name="cdv_splashscreen_background">@color/cdv_background_color</color>
+    <color name="cdv_system_background_color">@android:color/system_background_dark</color>
 </resources>
diff --git a/templates/project/res/values-night/cdv_colors.xml b/templates/project/res/values-night/cdv_colors.xml
index 96b2ca7e23..0bfe5ca975 100644
--- a/templates/project/res/values-night/cdv_colors.xml
+++ b/templates/project/res/values-night/cdv_colors.xml
@@ -18,6 +18,5 @@
  under the License.
 -->
 <resources>
-    <color name="cdv_background_color">#121318</color>
-    <color name="cdv_splashscreen_background">@color/cdv_background_color</color>
+    <color name="cdv_system_background_color">#FF121318</color>
 </resources>
diff --git a/templates/project/res/values-v34/cdv_colors.xml b/templates/project/res/values-v34/cdv_colors.xml
index b07be36943..e8bdc98a10 100644
--- a/templates/project/res/values-v34/cdv_colors.xml
+++ b/templates/project/res/values-v34/cdv_colors.xml
@@ -18,6 +18,5 @@
  under the License.
 -->
 <resources>
-    <color name="cdv_background_color">@android:color/system_background_light</color>
-    <color name="cdv_splashscreen_background">@color/cdv_background_color</color>
+    <color name="cdv_system_background_color">@android:color/system_background_light</color>
 </resources>
diff --git a/templates/project/res/values/cdv_colors.xml b/templates/project/res/values/cdv_colors.xml
index e9155db118..81fca0dc18 100644
--- a/templates/project/res/values/cdv_colors.xml
+++ b/templates/project/res/values/cdv_colors.xml
@@ -18,6 +18,9 @@
  under the License.
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="cdv_background_color">#FAF8FF</color>
+    <color name="cdv_system_background_color">#FFFAF8FF</color>
+
+    <color name="cdv_background_color">@color/cdv_system_background_color</color>
     <color name="cdv_splashscreen_background">@color/cdv_background_color</color>
+    <color name="cdv_status_bar_background">@android:color/transparent</color>
 </resources>
diff --git a/templates/project/res/values/cdv_themes.xml b/templates/project/res/values/cdv_themes.xml
index 7d4200c24b..aba18f9159 100644
--- a/templates/project/res/values/cdv_themes.xml
+++ b/templates/project/res/values/cdv_themes.xml
@@ -34,6 +34,6 @@
 
     <style name="Theme.Cordova.App.DayNight" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:colorBackground">@color/cdv_background_color</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/cdv_status_bar_background</item>
     </style>
 </resources>