From ea4c41988c43d1a5b4ebbed8a4f6926763cd31dd Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 3 Jul 2021 03:36:19 -0400
Subject: [PATCH] Adding Strawberry Daiquiri and Yotsuba

These requests come at a price Soi

Co-Authored-By: Zakhar Timoshenko <61558546+ztimms73@users.noreply.github.com>
Co-Authored-By: Soitora <simon.mattila@protonmail.com>
---
 .../java/eu/kanade/tachiyomi/util/system/Themes.kt   | 12 ++++++++++++
 app/src/main/res/values/colors.xml                   |  8 ++++++++
 app/src/main/res/values/strings.xml                  |  2 ++
 app/src/main/res/values/themes.xml                   |  9 +++++++++
 4 files changed, 31 insertions(+)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt
index 00efaf949a..e052453454 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt
@@ -33,6 +33,11 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
         AppCompatDelegate.MODE_NIGHT_YES,
         R.string.amoled_black
     ),
+    STRAWBERRY_DAIQUIRI(
+        R.style.Theme_Tachiyomi_StrawberryDaiquiri,
+        AppCompatDelegate.MODE_NIGHT_NO,
+        R.string.strawberry_daiquiri
+    ),
     BLACK_N_RED(
         R.style.Theme_Tachiyomi_BlackAndRed,
         AppCompatDelegate.MODE_NIGHT_YES,
@@ -43,6 +48,11 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
         AppCompatDelegate.MODE_NIGHT_YES,
         R.string.hot_pink
     ),
+    YOTSUBA(
+        R.style.Theme_Tachiyomi_Yotsuba,
+        AppCompatDelegate.MODE_NIGHT_NO,
+        R.string.yotsuba
+    ),
     LIGHT_BLUE(
         R.style.Theme_Tachiyomi_AllBlue,
         AppCompatDelegate.MODE_NIGHT_NO,
@@ -140,6 +150,8 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     val lightAccent: Int = Color.parseColor(
         when (styleRes) {
             R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
+            R.style.Theme_Tachiyomi_StrawberryDaiquiri -> "#ED4A65"
+            R.style.Theme_Tachiyomi_Yotsuba -> "#FC8C5C"
             else -> "#2979FF"
         }
     )
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 07ff435ef8..eec313dbc2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -92,4 +92,12 @@
     <color name="colorAccentLimeText">#2C2D32</color>
     <color name="dialogLime">#282A2E</color>
     <color name="colorOnLime">#2C2D32</color>
+
+    <!-- Strawberry Daiquiri Theme -->
+    <color name="colorAccentStrawberry">#ED4A65</color>
+    <color name="colorAccentStrawberryText">#b62e45</color>
+
+    <!-- Yotsuba Theme -->
+    <color name="colorAccentYotsuba">#FC8C5C</color>
+    <color name="colorAccentYotsubaText">#d35b27</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71e2de4a66..0368cd2bb4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -610,6 +610,8 @@
     <string name="dark_blue">Dark Blue</string>
     <string name="midnight_dusk">Midnight Dusk</string>
     <string name="spring_blossom">Spring Blossom</string>
+    <string name="strawberry_daiquiri">Strawberry Daiquiri</string>
+    <string name="yotsuba">Yotsuba</string>
     <string name="black_and_red">Black \'n\' Red</string>
     <string name="hot_pink">Hot Pink</string>
     <string name="flat_lime">Flat Lime</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f7a848ddd6..6f4a3f7d9c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -84,6 +84,15 @@
         <item name="android:colorBackground">@color/backgroundDuskDawn</item>
         <item name="actionBarTintColor">@color/appBarTextDuskDawn</item>
     </style>
+    <style name="Theme.Tachiyomi.StrawberryDaiquiri">
+        <item name="colorAccent">@color/colorAccentStrawberry</item>
+        <item name="colorAccentText">@color/colorAccentStrawberryText</item>
+    </style>
+    <style name="Theme.Tachiyomi.Yotsuba">
+        <item name="colorAccent">@color/colorAccentYotsuba</item>
+        <item name="colorAccentText">@color/colorAccentYotsubaText</item>
+    </style>
+    <style name="Theme.Tachiyomi.Monet"/>
 
     <!--===============-->
     <!-- Launch Screen -->