From 0fb9ca3e8b1e779206c9e4a9f7ac3259bed3911a Mon Sep 17 00:00:00 2001
From: Soitora <simon.mattila@protonmail.com>
Date: Mon, 24 May 2021 22:02:45 +0200
Subject: [PATCH] Added "Strawberry Daiquiri" theme (#5176)

---
 .../tachiyomi/data/preference/PreferenceValues.kt  |  1 +
 .../ui/base/activity/BaseThemedActivity.kt         |  1 +
 .../ui/setting/SettingsGeneralController.kt        |  6 ++++--
 app/src/main/res/values/colors.xml                 |  5 +++++
 app/src/main/res/values/strings.xml                |  1 +
 app/src/main/res/values/themes.xml                 | 14 ++++++++++++++
 6 files changed, 26 insertions(+), 2 deletions(-)

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 bdd11acc57..d6ed3a14b1 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
@@ -18,6 +18,7 @@ object PreferenceValues {
     enum class LightThemeVariant {
         default,
         blue,
+        strawberrydaiquiri,
     }
 
     // Keys are lowercase to match legacy string values
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 90283f20b0..bcafc3dbca 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
@@ -33,6 +33,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
             when (preferences.themeLight().get()) {
                 LightThemeVariant.default -> R.style.Theme_Tachiyomi_Light
                 LightThemeVariant.blue -> R.style.Theme_Tachiyomi_Light_Blue
+                LightThemeVariant.strawberrydaiquiri -> R.style.Theme_Tachiyomi_Light_StrawberryDaiquiri
             }
         }
         setTheme(themeId)
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 4c871d0726..c0e42ecd28 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
@@ -116,11 +116,13 @@ class SettingsGeneralController : SettingsController() {
                 titleRes = R.string.pref_theme_light
                 entriesRes = arrayOf(
                     R.string.theme_light_default,
-                    R.string.theme_light_blue
+                    R.string.theme_light_blue,
+                    R.string.theme_light_strawberrydaiquiri
                 )
                 entryValues = arrayOf(
                     Values.LightThemeVariant.default.name,
-                    Values.LightThemeVariant.blue.name
+                    Values.LightThemeVariant.blue.name,
+                    Values.LightThemeVariant.strawberrydaiquiri.name
                 )
                 defaultValue = Values.LightThemeVariant.default.name
                 summary = "%s"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 90b4a280f5..18cfbddbbb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,6 +28,11 @@
     <color name="dialogLight">@color/md_white_1000</color>
     <color name="selectorColorLight">@color/md_blue_A400_38</color>
 
+    <!-- Strawberry Daiquiri Theme -->
+    <color name="colorAccentStrawberry">#ED4A65</color>
+    <color name="rippleSecondaryColorStrawberry">#0AED4A65</color>
+    <color name="selectorColorStrawberry">#6FED4A65</color>
+
     <!-- Dark Theme -->
     <color name="colorAccentDark">#3399FF</color>
     <color name="textColorPrimaryDark">@color/md_white_1000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af36ed7512..054d8adb77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,6 +156,7 @@
     <string name="pref_theme_light">Light theme</string>
     <string name="theme_light_default">Default</string>
     <string name="theme_light_blue">Light blue</string>
+    <string name="theme_light_strawberrydaiquiri">Strawberry daiquiri</string>
     <string name="pref_theme_dark">Dark theme</string>
     <string name="theme_dark_default">Default</string>
     <string name="theme_dark_blue">Dark blue</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 890bff4cf9..959d37aa62 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -132,6 +132,20 @@
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
+    <!--== Strawberry Daiquiri theme ==-->
+    <style name="Theme.Tachiyomi.Light.StrawberryDaiquiri">
+        <!-- Theme colors -->
+        <item name="colorAccentOnPrimary">@color/colorAccentStrawberry</item>
+        <item name="colorSecondary">@color/colorAccentStrawberry</item>
+        <item name="colorAccent">@color/colorAccentStrawberry</item>
+
+        <!-- Ripples -->
+        <item name="rippleSecondaryColor">@color/rippleSecondaryColorStrawberry</item>
+
+        <!-- Custom Attributes-->
+        <item name="colorLibrarySelectionActive">@color/selectorColorStrawberry</item>
+    </style>
+
     <!--=============-->
     <!-- Dark Themes -->
     <!--=============-->