From 78715635fb88b417cff858c35b97888ed1593a89 Mon Sep 17 00:00:00 2001
From: RikkaW <rikka@shizuku.moe>
Date: Thu, 31 Oct 2019 19:29:56 +0800
Subject: [PATCH] don't write color value directly since old Android doesn't
 like it

---
 app/src/main/res/values-night/themes_overlay.xml |  4 ++--
 app/src/main/res/values-v27/themes_overlay.xml   | 14 ++++++++++++++
 app/src/main/res/values/colors.xml               | 10 ++++++++++
 app/src/main/res/values/themes_overlay.xml       | 15 ++++++++-------
 4 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/values-v27/themes_overlay.xml

diff --git a/app/src/main/res/values-night/themes_overlay.xml b/app/src/main/res/values-night/themes_overlay.xml
index c850f46..847a26a 100644
--- a/app/src/main/res/values-night/themes_overlay.xml
+++ b/app/src/main/res/values-night/themes_overlay.xml
@@ -8,11 +8,11 @@
     <style name="ThemeOverlay.Teal" />
 
     <style name="ThemeOverlay.Pink">
-        <item name="android:colorAccent">#FFE6F1</item>
+        <item name="android:colorAccent">@color/pink_accent_dark</item>
     </style>
 
     <style name="ThemeOverlay.Blue">
-        <item name="android:colorAccent">#D5F1FF</item>
+        <item name="android:colorAccent">@color/blue_accent_dark</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/themes_overlay.xml b/app/src/main/res/values-v27/themes_overlay.xml
new file mode 100644
index 0000000..c227aeb
--- /dev/null
+++ b/app/src/main/res/values-v27/themes_overlay.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ThemeOverlay.Classic">
+        <item name="android:colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimaryDark">@color/primary_color</item>
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
+        <item name="android:popupTheme">@android:style/ThemeOverlay.Material.Light</item>
+        <item name="appBarStyle">@style/ThemeOverlay.AppBar.Colored</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1e05859..81c0a09 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,14 @@
     <color name="accent_color_light">#EFFBFC</color>-->
 
     <color name="primary_color">@color/material_teal_600</color>
+
+    <color name="teal_background_light">#e0f2f2</color>
+
+    <color name="pink_background_light">#ffcde2</color>
+    <color name="pink_accent_light">#7c5065</color>
+    <color name="pink_accent_dark">#ffe6f1</color>
+
+    <color name="blue_background_light">#e1f5ff</color>
+    <color name="blue_accent_light">#007ebd</color>
+    <color name="blue_accent_dark">#d5f1ff</color>
 </resources>
diff --git a/app/src/main/res/values/themes_overlay.xml b/app/src/main/res/values/themes_overlay.xml
index c1dd822..deca66c 100644
--- a/app/src/main/res/values/themes_overlay.xml
+++ b/app/src/main/res/values/themes_overlay.xml
@@ -11,7 +11,7 @@
     <style name="ThemeOverlay.Classic">
         <item name="android:colorPrimary">@color/primary_color</item>
         <item name="android:colorPrimaryDark">@color/primary_color</item>
-        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:windowBackground">@android:color/white</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
         <item name="android:popupTheme">@android:style/ThemeOverlay.Material.Light</item>
@@ -20,24 +20,25 @@
 
     <style name="ThemeOverlay.White">
         <item name="android:colorPrimary">@android:color/white</item>
-        <item name="android:colorBackground">?android:colorPrimary</item>
         <item name="android:colorAccent">@color/material_teal_500</item>
+        <item name="android:colorBackground">@android:color/white</item>
     </style>
 
     <style name="ThemeOverlay.Teal">
-        <item name="android:colorPrimary">#e0f2f2</item>
+        <item name="android:colorPrimary">@color/teal_background_light</item>
         <item name="android:colorBackground">?android:colorPrimary</item>
     </style>
 
     <style name="ThemeOverlay.Pink">
-        <item name="android:colorPrimary">#ffcde2</item>
+        <item name="android:colorPrimary">@color/pink_background_light</item>
+        <item name="android:colorAccent">@color/pink_accent_light</item>
         <item name="android:colorBackground">?android:colorPrimary</item>
-        <item name="android:colorAccent">#7C5065</item>
     </style>
 
     <style name="ThemeOverlay.Blue">
-        <item name="android:colorPrimary">#e1f5ff</item>
+        <item name="android:colorPrimary">@color/blue_background_light</item>
+        <item name="android:colorAccent">@color/blue_accent_light</item>
         <item name="android:colorBackground">?android:colorPrimary</item>
-        <item name="android:colorAccent">#007EBD</item>
+
     </style>
 </resources>
\ No newline at end of file