From b2d58e04d262ef30e9232c46e917d45e6dc34c8d Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Mon, 19 Jul 2021 00:01:58 +0700
Subject: [PATCH] Add Dynamic theme for Android 12 (#5569)

* Add Dynamic theme for Android 12

* Also theme text colors
---
 .../data/preference/PreferenceValues.kt         |  1 +
 .../ui/base/activity/BaseThemedActivity.kt      |  3 +++
 .../ui/setting/SettingsGeneralController.kt     |  9 ++++++++-
 .../res/color-night-v31/text_primary_monet.xml  |  5 +++++
 .../color-night-v31/text_secondary_monet.xml    |  5 +++++
 .../main/res/color-v31/ripple_colored_monet.xml |  4 ++++
 .../main/res/color-v31/text_primary_monet.xml   |  5 +++++
 .../main/res/color-v31/text_secondary_monet.xml |  5 +++++
 app/src/main/res/values-night/colors.xml        | 11 ++++++++++-
 app/src/main/res/values-v31/themes.xml          | 17 +++++++++++++++++
 app/src/main/res/values/colors.xml              | 13 ++++++++++++-
 app/src/main/res/values/strings.xml             |  1 +
 app/src/main/res/values/themes.xml              |  3 +++
 13 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/color-night-v31/text_primary_monet.xml
 create mode 100644 app/src/main/res/color-night-v31/text_secondary_monet.xml
 create mode 100644 app/src/main/res/color-v31/ripple_colored_monet.xml
 create mode 100644 app/src/main/res/color-v31/text_primary_monet.xml
 create mode 100644 app/src/main/res/color-v31/text_secondary_monet.xml
 create mode 100644 app/src/main/res/values-v31/themes.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
index 73ee5da1ba..59c524f559 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
@@ -23,6 +23,7 @@ object PreferenceValues {
 
     enum class AppTheme(val titleResId: Int?) {
         DEFAULT(R.string.theme_default),
+        MONET(R.string.theme_monet),
         BLUE(R.string.theme_blue),
         GREEN_APPLE(R.string.theme_greenapple),
         MIDNIGHT_DUSK(R.string.theme_midnightdusk),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
index a1a298c231..ffe30c6f9b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
@@ -40,6 +40,9 @@ abstract class BaseThemedActivity : AppCompatActivity() {
         fun AppCompatActivity.applyThemePreferences(preferences: PreferencesHelper) {
             val resIds = mutableListOf<Int>()
             when (preferences.appTheme().get()) {
+                PreferenceValues.AppTheme.MONET -> {
+                    resIds += R.style.Theme_Tachiyomi_Monet
+                }
                 PreferenceValues.AppTheme.BLUE -> {
                     resIds += R.style.Theme_Tachiyomi_Blue
                     resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 7078473307..a517b517d1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -122,7 +122,14 @@ class SettingsGeneralController : SettingsController() {
                 key = Keys.appTheme
                 titleRes = R.string.pref_app_theme
 
-                val appThemes = Values.AppTheme.values().filter { it.titleResId != null }
+                val appThemes = Values.AppTheme.values().filter {
+                    val monetFilter = if (it == Values.AppTheme.MONET) {
+                        Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+                    } else {
+                        true
+                    }
+                    it.titleResId != null && monetFilter
+                }
                 entriesRes = appThemes.map { it.titleResId!! }.toTypedArray()
                 entryValues = appThemes.map { it.name }.toTypedArray()
                 defaultValue = appThemes[0].name
diff --git a/app/src/main/res/color-night-v31/text_primary_monet.xml b/app/src/main/res/color-night-v31/text_primary_monet.xml
new file mode 100644
index 0000000000..97887072c3
--- /dev/null
+++ b/app/src/main/res/color-night-v31/text_primary_monet.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_500" android:state_enabled="false" />
+    <item android:color="@android:color/system_neutral1_50" />
+</selector>
diff --git a/app/src/main/res/color-night-v31/text_secondary_monet.xml b/app/src/main/res/color-night-v31/text_secondary_monet.xml
new file mode 100644
index 0000000000..532e203af5
--- /dev/null
+++ b/app/src/main/res/color-night-v31/text_secondary_monet.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="?android:attr/disabledAlpha" android:color="@android:color/system_neutral2_200" android:state_enabled="false" />
+    <item android:color="@android:color/system_neutral2_200" />
+</selector>
diff --git a/app/src/main/res/color-v31/ripple_colored_monet.xml b/app/src/main/res/color-v31/ripple_colored_monet.xml
new file mode 100644
index 0000000000..efaa46d448
--- /dev/null
+++ b/app/src/main/res/color-v31/ripple_colored_monet.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/accent_monet" android:alpha="0.12" />
+</selector>
diff --git a/app/src/main/res/color-v31/text_primary_monet.xml b/app/src/main/res/color-v31/text_primary_monet.xml
new file mode 100644
index 0000000000..21d75f6238
--- /dev/null
+++ b/app/src/main/res/color-v31/text_primary_monet.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/system_neutral1_400" android:state_enabled="false" />
+    <item android:color="@android:color/system_neutral1_900" />
+</selector>
diff --git a/app/src/main/res/color-v31/text_secondary_monet.xml b/app/src/main/res/color-v31/text_secondary_monet.xml
new file mode 100644
index 0000000000..bd555089a7
--- /dev/null
+++ b/app/src/main/res/color-v31/text_secondary_monet.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="?android:attr/disabledAlpha" android:color="@android:color/system_neutral2_700" android:state_enabled="false" />
+    <item android:color="@android:color/system_neutral2_700" />
+</selector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index f1ce4138ab..4e43f3595d 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <color name="splash">@color/background_default</color>
 
     <!-- Default Theme -->
@@ -9,6 +9,15 @@
     <color name="background_default">#202125</color>
     <color name="ripple_colored_default">#1F3399FF</color>
 
+    <!-- Monet Theme -->
+    <color name="accent_monet" tools:targetApi="31">@android:color/system_accent1_100</color>
+    <color name="on_accent_monet" tools:targetApi="31">@android:color/system_accent1_900</color>
+    <color name="divider_monet" tools:targetApi="31">@android:color/system_neutral1_700</color>
+    <color name="tertiary_monet" tools:targetApi="31">@android:color/system_accent3_100</color>
+    <color name="on_tertiary_monet" tools:targetApi="31">@android:color/system_accent3_900</color>
+    <color name="surface_monet" tools:targetApi="31">@android:color/system_neutral1_900</color>
+    <color name="on_surface_monet" tools:targetApi="31">@android:color/system_neutral1_50</color>
+
     <!-- Green Apple Theme -->
     <color name="accent_greenapple">#48E484</color>
     <color name="color_on_primary_greenapple">@color/md_black_1000</color>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
new file mode 100644
index 0000000000..04aa6893ff
--- /dev/null
+++ b/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Tachiyomi.Monet">
+        <item name="colorPrimary">@color/accent_monet</item>
+        <item name="colorOnPrimary">@color/on_accent_monet</item>
+        <item name="colorTertiary">@color/tertiary_monet</item>
+        <item name="colorOnTertiary">@color/on_tertiary_monet</item>
+        <item name="colorSurface">@color/surface_monet</item>
+        <item name="colorOnSurface">@color/on_surface_monet</item>
+        <item name="android:colorBackground">@color/background_monet</item>
+        <item name="colorOnBackground">@color/on_background_monet</item>
+        <item name="colorControlHighlight">@color/ripple_colored_monet</item>
+        <item name="android:divider">@color/divider_monet</item>
+        <item name="android:textColorPrimary">@color/text_primary_monet</item>
+        <item name="android:textColorSecondary">@color/text_secondary_monet</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 89b3195f14..ffaae60531 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <color name="splash">@color/accent_blue</color>
 
     <!-- Default Theme -->
@@ -9,6 +9,17 @@
     <color name="background_default">@color/md_grey_50</color>
     <color name="ripple_colored_default">@color/md_blue_A400_12</color>
 
+    <!-- Monet Theme -->
+    <color name="accent_monet" tools:targetApi="31">@android:color/system_accent1_600</color>
+    <color name="on_accent_monet" tools:targetApi="31">@android:color/system_accent1_10</color>
+    <color name="divider_monet" tools:targetApi="31">@android:color/system_neutral1_200</color>
+    <color name="tertiary_monet" tools:targetApi="31">@android:color/system_accent3_600</color>
+    <color name="on_tertiary_monet" tools:targetApi="31">@android:color/system_accent3_10</color>
+    <color name="surface_monet" tools:targetApi="31">@android:color/system_neutral1_50</color>
+    <color name="on_surface_monet" tools:targetApi="31">@android:color/system_neutral1_900</color>
+    <color name="background_monet" tools:targetApi="31">@color/surface_monet</color>
+    <color name="on_background_monet" tools:targetApi="31">@color/on_surface_monet</color>
+
     <!-- Blue Theme -->
     <color name="accent_blue">#54759E</color>
     <color name="ripple_colored_blue">#1F54759E</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba8e570278..a6429a94f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,6 +148,7 @@
     <string name="theme_dark">On</string>
     <string name="pref_app_theme">App theme</string>
     <string name="theme_default">Default</string>
+    <string name="theme_monet">Dynamic</string>
     <string name="theme_blue">Blue</string>
     <string name="theme_greenapple">Green Apple</string>
     <string name="theme_midnightdusk">Midnight Dusk</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e1ae64e4bd..c95271d495 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -74,6 +74,9 @@
     <!--== Default Theme ==-->
     <style name="Theme.Tachiyomi" parent="Base.Theme.Tachiyomi" />
 
+    <!-- Monet theme only support S+ -->
+    <style name="Theme.Tachiyomi.Monet" />
+
     <!--== Blue Theme ==-->
     <style name="Theme.Tachiyomi.Blue">
         <!-- Theme Colors -->