From ba7dabeb391bf6b82e09334361deb515dbfbc10e Mon Sep 17 00:00:00 2001
From: oxmc <67136658+oxmc@users.noreply.github.com>
Date: Wed, 17 Jun 2026 02:47:37 -0700
Subject: [PATCH] themes: replace Material3 view themes with platform
 DeviceDefault base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Theme.Material3.* and Theme.MaterialComponents.* are from the
Material view library which is not in the AOSP prebuilts.

The wizard is Compose-only so the XML theme only needs to control
window properties (background, transparent bars). All Material3
colour/typography tokens are applied inside Compose.

Also removes values-v21/v23/v31 overrides — minSdk=31 makes v21/v23
unreachable, and v31 only existed for the removed splash screen dep.
---
 app/src/main/res/values-v21/themes.xml |  6 ------
 app/src/main/res/values-v23/themes.xml |  7 ------
 app/src/main/res/values-v31/themes.xml |  9 --------
 app/src/main/res/values/themes.xml     | 30 ++++++++++----------------
 4 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/res/values-v21/themes.xml
 delete mode 100644 app/src/main/res/values-v23/themes.xml
 delete mode 100644 app/src/main/res/values-v31/themes.xml

diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 00ae491..0000000
--- a/app/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.SetupWizard" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="android:statusBarColor">?attr/colorPrimary</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
deleted file mode 100644
index 5e03a5b..0000000
--- a/app/src/main/res/values-v23/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.SetupWizard" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Enable light icons if status bar is dark -->
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
deleted file mode 100644
index aed28c8..0000000
--- a/app/src/main/res/values-v31/themes.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.SetupWizard.Splash" parent="Theme.Material3.DayNight">
-        <item name="android:windowSplashScreenBackground">@color/lavender_500</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">@color/lavender_secondary</item>
-        <item name="postSplashScreenTheme">@style/Theme.SetupWizard</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 438eceb..386eee7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Dark Theme -->
-    <style name="Theme.SetupWizard" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="colorPrimary">@color/lavender_200</item>
-        <item name="colorOnPrimary">@color/lavender_on_primary_dark</item>
-        <item name="colorSecondary">@color/lavender_secondary_dark</item>
-        <item name="colorOnSecondary">@color/lavender_on_secondary_dark</item>
-        <item name="android:colorBackground">@color/lavender_background_dark</item>
-        <item name="colorOnBackground">@color/lavender_on_background_dark</item>
+    <!--
+        Window container theme for the Compose-based setup wizard.
+        All Material3 colour/typography tokens are applied in Compose code;
+        this XML theme only controls platform window properties.
+    -->
+    <style name="Theme.SetupWizard" parent="android:Theme.DeviceDefault.NoActionBar">
+        <item name="android:windowBackground">@color/lavender_background_dark</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
-
-    <!-- Light Theme -->
-    <style name="Theme.SetupWizard.Light" parent="Theme.Material3.Light.NoActionBar">
-        <item name="colorPrimary">@color/lavender_500</item>
-        <item name="colorOnPrimary">@color/lavender_on_primary</item>
-        <item name="colorSecondary">@color/lavender_secondary</item>
-        <item name="colorOnSecondary">@color/lavender_on_secondary</item>
-        <item name="android:colorBackground">@color/lavender_background</item>
-        <item name="colorOnBackground">@color/lavender_on_background</item>
-    </style>
-</resources>
\ No newline at end of file
+</resources>