From 91e6d708a2f2509d9bbaed5da33c147177c71a91 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Mon, 19 Jul 2021 21:22:09 -0400
Subject: [PATCH] Added "Tako" theme

would love to have an alternative name for the dark theme, but I know nothing about vtubers and im not about to change that

Co-Authored-By: Soitora <simon.mattila@protonmail.com>
Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>
Co-Authored-By: Soitora <simon.mattila@protonmail.com>
Co-Authored-By: Andreas <6576096+ghostbear@users.noreply.github.com>
---
 .../eu/kanade/tachiyomi/util/system/Themes.kt | 27 ++++++++++++++-----
 app/src/main/res/values-night/colors.xml      | 12 +++++++++
 app/src/main/res/values/colors.xml            | 12 +++++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/themes.xml            | 19 +++++++++++++
 5 files changed, 65 insertions(+), 6 deletions(-)

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 2b4bb83de0..dda8b443ae 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
@@ -35,6 +35,17 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
         R.string.strawberry_daiquiri,
         R.string.chocolate_strawberries
     ),
+    TAKO(
+        R.style.Theme_Tachiyomi_Tako,
+        AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
+        R.string.tako
+    ),
+    YIN_AND_YANG(
+        R.style.Theme_Tachiyomi_YinYang,
+        AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
+        R.string.yang,
+        R.string.yin
+    ),
     LIME(
         R.style.Theme_Tachiyomi_FlatLime,
         AppCompatDelegate.MODE_NIGHT_YES,
@@ -45,12 +56,6 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
         AppCompatDelegate.MODE_NIGHT_NO,
         R.string.yotsuba
     ),
-    YIN_AND_YANG(
-        R.style.Theme_Tachiyomi_YinYang,
-        AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
-        R.string.yang,
-        R.string.yin
-    ),
     CLASSIC_BLUE(
         R.style.Theme_Tachiyomi_AllBlue,
         AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
@@ -130,6 +135,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     @ColorInt
     val lightBackground: Int = Color.parseColor(
         when (styleRes) {
+            R.style.Theme_Tachiyomi_Tako -> "#F2EDF7"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#f6f0f8"
             else -> "#FAFAFA"
         }
@@ -139,6 +145,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     @ColorInt
     val darkBackground: Int = Color.parseColor(
         when (styleRes) {
+            R.style.Theme_Tachiyomi_Tako -> "#21212E"
             R.style.Theme_Tachiyomi_Strawberries -> "#1a1716"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#16151D"
             R.style.Theme_Tachiyomi_FlatLime -> "#202125"
@@ -150,6 +157,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_Tako -> "#66577E"
             R.style.Theme_Tachiyomi_YinYang -> "#000000"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#c43c97"
             R.style.Theme_Tachiyomi_Strawberries -> "#ED4A65"
@@ -162,6 +170,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_Tako -> "#F3B375"
             R.style.Theme_Tachiyomi_YinYang -> "#FFFFFF"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475"
             R.style.Theme_Tachiyomi_Strawberries -> "#AA2200"
@@ -187,6 +196,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     /** Complies with actionBarTintColor */
     @ColorInt
     val lightAppBarText: Int = when (styleRes) {
+        R.style.Theme_Tachiyomi_Tako -> Color.parseColor("#221b28")
         R.style.Theme_Tachiyomi_AllBlue -> Color.parseColor("#FFFFFF")
         R.style.Theme_Tachiyomi_MidnightDusk -> Color.parseColor("#DE4c0d4b")
         else -> lightPrimaryText
@@ -195,6 +205,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     /** Complies with actionBarTintColor (probably night) */
     @ColorInt
     val darkAppBarText: Int = when (styleRes) {
+        R.style.Theme_Tachiyomi_Tako -> Color.parseColor("#f4ece5")
         R.style.Theme_Tachiyomi_AllBlue -> Color.parseColor("#FFFFFF")
         else -> darkPrimaryText
     }
@@ -203,6 +214,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     @ColorInt
     val lightBottomBar: Int = Color.parseColor(
         when (styleRes) {
+            R.style.Theme_Tachiyomi_Tako -> "#F7F5FF"
             R.style.Theme_Tachiyomi_AllBlue -> "#54759E"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#efe3f3"
             else -> "#FFFFFF"
@@ -213,6 +225,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     @ColorInt
     val darkBottomBar: Int = Color.parseColor(
         when (styleRes) {
+            R.style.Theme_Tachiyomi_Tako -> "#2A2A3C"
             R.style.Theme_Tachiyomi_Strawberries -> "#211b19"
             R.style.Theme_Tachiyomi_AllBlue -> "#54759E"
             R.style.Theme_Tachiyomi_MidnightDusk -> "#201F27"
@@ -224,6 +237,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     /** Complies with tabBarIconInactive */
     @ColorInt
     val lightInactiveTab: Int = when (styleRes) {
+        R.style.Theme_Tachiyomi_Tako -> Color.parseColor("#C2221b28")
         R.style.Theme_Tachiyomi_AllBlue -> Color.parseColor("#80FFFFFF")
         else -> Color.parseColor("#C2424242")
     }
@@ -231,6 +245,7 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     /** Complies with tabBarIconInactive (probably night) */
     @ColorInt
     val darkInactiveTab: Int = when (styleRes) {
+        R.style.Theme_Tachiyomi_Tako -> Color.parseColor("#C2f4ece5")
         R.style.Theme_Tachiyomi_AllBlue -> Color.parseColor("#80FFFFFF")
         else -> Color.parseColor("#C2FFFFFF")
     }
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3921fd9b2f..c27846334d 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -24,6 +24,18 @@
     <color name="dialog">#212121</color>
     <color name="gray_button">#BFBFBF</color>
 
+    <!-- Tako Theme -->
+    <color name="accentTako">#F3B375</color>
+    <color name="colorOnAccentTako">#242431</color>
+    <color name="tertiaryTako">@color/colorOnAccentTako</color>
+    <color name="colorOnTertiaryTako">@color/accentTako</color>
+    <color name="rippleColoredTako">#1FF3B375</color>
+    <color name="surfaceTako">#2A2A3C</color>
+    <color name="backgroundTako">#21212E</color>
+    <color name="actionTintTako">#f4ece5</color>
+    <color name="inactiveTabTako">#C2f4ece5</color>
+    <color name="colorAccentTextTako">#f4d1af</color>
+
     <!-- Midnight Dusk Theme -->
     <color name="colorAccentDuskDawn">#F02475</color>
     <color name="colorAccentDuskDawnText">#f091b7</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 741b0db70e..1effc8294c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -97,6 +97,18 @@
     <color name="backgroundChocolateStrawberries">#1a1716</color>
     <color name="secondaryChocolateStrawberries">#211b19</color>
 
+    <!-- Tako Theme -->
+    <color name="accentTako">#66577E</color>
+    <color name="colorOnAccentTako">#F3B375</color>
+    <color name="tertiaryTako">@color/colorOnAccentTako</color>
+    <color name="colorOnTertiaryTako">#574360</color>
+    <color name="rippleColoredTako">#1F66577E</color>
+    <color name="surfaceTako">#F7F5FF</color>
+    <color name="backgroundTako">#F2EDF7</color>
+    <color name="actionTintTako">#221b28</color>
+    <color name="inactiveTabTako">#C2221b28</color>
+    <color name="colorAccentTextTako">#2b1f31</color>
+
     <!-- Yotsuba Theme -->
     <color name="colorAccentYotsuba">#dc6d3d</color>
     <color name="colorAccentYotsubaText">#9f431c</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8de62fe5b..9df092bffb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -633,6 +633,7 @@
     <string name="a_brighter_you">A Brighter You</string>
     <string name="a_calmer_you">A Calmer You</string>
     <string name="yotsuba">Yotsuba</string>
+    <string name="tako">Tako</string>
     <string name="yin">Yin</string>
     <string name="yang">Yang</string>
     <string name="chocolate_strawberries">Chocolate Strawberries</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 623c32113b..bb7145119a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -81,7 +81,9 @@
         <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
     </style>
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent=""/>
+
     <style name="Theme.Tachiyomi.FlatLime"/>
+
     <style name="Theme.Tachiyomi.MidnightDusk">
         <item name="colorPrimary">@color/primaryDuskDawn</item>
         <item name="colorAccent">@color/colorAccentDuskDawn</item>
@@ -93,14 +95,31 @@
         <item name="android:colorBackground">@color/backgroundDuskDawn</item>
         <item name="actionBarTintColor">@color/appBarTextDuskDawn</item>
     </style>
+
     <style name="Theme.Tachiyomi.Strawberries">
         <item name="colorAccent">@color/colorAccentStrawberry</item>
         <item name="colorAccentText">@color/colorAccentStrawberryText</item>
     </style>
+
+    <!--== Tako Theme ==-->
+    <style name="Theme.Tachiyomi.Tako">
+        <item name="colorAccent">@color/accentTako</item>
+        <item name="colorOnAccent">@color/colorOnAccentTako</item>
+        <item name="colorPrimaryVariant">@color/surfaceTako</item>
+        <item name="tabBarIconColor">@color/colorOnTertiaryTako</item>
+        <item name="colorControlHighlight">@color/rippleColoredTako</item>
+        <item name="colorSecondary">@color/backgroundTako</item>
+        <item name="actionBarTintColor">@color/actionTintTako</item>
+        <item name="android:colorBackground">@color/backgroundTako</item>
+        <item name="colorAccentText">@color/colorAccentTextTako</item>
+        <item name="tabBarIconInactive">@color/inactiveTabTako</item>
+    </style>
+
     <style name="Theme.Tachiyomi.Yotsuba">
         <item name="colorAccent">@color/colorAccentYotsuba</item>
         <item name="colorAccentText">@color/colorAccentYotsubaText</item>
     </style>
+
     <!--== Yin Yang theme ==-->
     <style name="Theme.Tachiyomi.YinYang">
         <!-- Theme colors -->