From 0ebdbe174fdae8198e33114bdc595c9fe89e4cd2 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 10 Jul 2021 14:37:25 -0400
Subject: [PATCH] add Yin Yang Theme

Co-Authored-By: Riztard Lanthorn <16263232+Riztard@users.noreply.github.com>
---
 .../java/eu/kanade/tachiyomi/util/system/Themes.kt   | 12 ++++++++++++
 app/src/main/res/layout/theme_item.xml               |  2 +-
 app/src/main/res/values-night/colors.xml             |  4 ++++
 app/src/main/res/values/colors.xml                   |  5 +++++
 app/src/main/res/values/strings.xml                  |  2 ++
 app/src/main/res/values/themes.xml                   |  7 +++++++
 6 files changed, 31 insertions(+), 1 deletion(-)

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 da34e15698..8d39a055ad 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
@@ -43,6 +43,16 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
         AppCompatDelegate.MODE_NIGHT_NO,
         R.string.yotsuba
     ),
+    YANG(
+        R.style.Theme_Tachiyomi_YinYang,
+        AppCompatDelegate.MODE_NIGHT_NO,
+        R.string.yang
+    ),
+    YIN(
+        R.style.Theme_Tachiyomi_YinYang,
+        AppCompatDelegate.MODE_NIGHT_YES,
+        R.string.yin
+    ),
     LIGHT_BLUE(
         R.style.Theme_Tachiyomi_AllBlue,
         AppCompatDelegate.MODE_NIGHT_NO,
@@ -142,6 +152,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     @ColorInt
     val lightAccent: Int = Color.parseColor(
         when (styleRes) {
+            R.style.Theme_Tachiyomi_YinYang -> "#000000"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
             R.style.Theme_Tachiyomi_StrawberryDaiquiri -> "#ED4A65"
             R.style.Theme_Tachiyomi_Yotsuba -> "#dc6d3d"
@@ -153,6 +164,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     @ColorInt
     val darkAccent: Int = Color.parseColor(
         when (styleRes) {
+            R.style.Theme_Tachiyomi_YinYang -> "#FFFFFF"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475"
             R.style.Theme_Tachiyomi_ChocolateStrawberries -> "#AA2200"
             R.style.Theme_Tachiyomi_FlatLime -> "#4AF88A"
diff --git a/app/src/main/res/layout/theme_item.xml b/app/src/main/res/layout/theme_item.xml
index b37b81265e..9ee0bfaf00 100644
--- a/app/src/main/res/layout/theme_item.xml
+++ b/app/src/main/res/layout/theme_item.xml
@@ -187,7 +187,7 @@
             <ImageView
                 android:id="@+id/checkbox"
                 android:background="@drawable/oval"
-                android:backgroundTint="@android:color/white"
+                android:backgroundTint="?colorOnAccent"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:contentDescription="@string/select_all"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 248329513f..16dabf1ce0 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -33,4 +33,8 @@
     <color name="textPrimaryDuskDawn">@color/md_white_1000</color>
     <color name="appBarTextDuskDawn">@color/md_white_1000</color>
 
+    <!-- Yin Yang Theme -->
+    <color name="colorAccentYinyang">#FFFFFF</color>
+    <color name="colorAccentYinyangText">#999999</color>
+    <color name="colorOnAccentYinyang">@color/md_black_1000</color>
 </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 3733390c74..7d1720c093 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -99,4 +99,9 @@
     <!-- Yotsuba Theme -->
     <color name="colorAccentYotsuba">#dc6d3d</color>
     <color name="colorAccentYotsubaText">#9f431c</color>
+
+    <!-- Yin Yang Theme -->
+    <color name="colorAccentYinyang">#000000</color>
+    <color name="colorAccentYinyangText">#777777</color>
+    <color name="colorOnAccentYinyang">@color/md_white_1000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 09bf41f636..6c67518fa5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -620,6 +620,8 @@
     <string name="spring_blossom">Spring Blossom</string>
     <string name="strawberry_daiquiri">Strawberry Daiquiri</string>
     <string name="yotsuba">Yotsuba</string>
+    <string name="yin">Yin</string>
+    <string name="yang">Yang</string>
     <string name="chocolate_strawberries">Chocolate Strawberries</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 437cb1d388..80e7809a93 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -99,6 +99,13 @@
         <item name="colorAccent">@color/colorAccentYotsuba</item>
         <item name="colorAccentText">@color/colorAccentYotsubaText</item>
     </style>
+    <!--== Yin Yang theme ==-->
+    <style name="Theme.Tachiyomi.YinYang">
+        <!-- Theme colors -->
+        <item name="colorAccent">@color/colorAccentYinyang</item>
+        <item name="colorAccentText">@color/colorAccentYinyangText</item>
+        <item name="colorOnAccent">@color/colorOnAccentYinyang</item>
+    </style>
 
     <!--===============-->
     <!-- Launch Screen -->