From 58c0c2bb1d5c0881301899f149a70da2d4078682 Mon Sep 17 00:00:00 2001
From: 1minutetomidnight <rishin.ga@gmail.com>
Date: Sun, 21 Aug 2022 16:40:19 +0400
Subject: [PATCH 1/3] Create Crayola Theme

---
 .../data/preference/PreferenceValues.kt       |  1 +
 .../ui/base/delegate/ThemingDelegate.kt       |  3 ++
 .../res/values-night/colors_crayolablue.xml   | 36 +++++++++++++++++++
 .../main/res/values/colors_crayolablue.xml    | 36 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/themes.xml            | 27 ++++++++++++++
 6 files changed, 104 insertions(+)
 create mode 100644 app/src/main/res/values-night/colors_crayolablue.xml
 create mode 100644 app/src/main/res/values/colors_crayolablue.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 9ffe6f0681e9..41b797331fc0 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
@@ -41,6 +41,7 @@ object PreferenceValues {
         YINYANG(R.string.theme_yinyang),
         YOTSUBA(R.string.theme_yotsuba),
         TIDAL_WAVE(R.string.theme_tidalwave),
+        CRAYOLA_BLUE(R.string.theme_crayolablue),
 
         // Deprecated
         DARK_BLUE(null),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt
index 177e507ce2f4..d7023d018e1c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt
@@ -44,6 +44,9 @@ interface ThemingDelegate {
                 PreferenceValues.AppTheme.TIDAL_WAVE -> {
                     resIds += R.style.Theme_Tachiyomi_TidalWave
                 }
+                PreferenceValues.AppTheme.CRAYOLA_BLUE -> {
+                    resIds += R.style.Theme_Tachiyomi_CrayolaBlue
+                }
                 else -> {
                     resIds += R.style.Theme_Tachiyomi
                 }
diff --git a/app/src/main/res/values-night/colors_crayolablue.xml b/app/src/main/res/values-night/colors_crayolablue.xml
new file mode 100644
index 000000000000..209aa679b6df
--- /dev/null
+++ b/app/src/main/res/values-night/colors_crayolablue.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Crayol Blue theme
+  ~ Original color scheme by 1-minute-to-midnight
+  ~
+  ~ Key colors:
+  ~ Primary #3080ff
+  ~ Secondary #3080ff
+  ~ Tertiary #7A5733
+  ~ Neutral #16151D
+-->
+<resources>
+    <color name="midnightdusk_primary">#3080ff</color>
+    <color name="midnightdusk_onPrimary">#FFFFFF</color>
+    <color name="midnightdusk_primaryContainer">#185bc7</color>
+    <color name="midnightdusk_onPrimaryContainer">#FFFFFF</color>
+    <color name="midnightdusk_secondary">#3080ff</color>
+    <color name="midnightdusk_onSecondary">#FFFFFF</color>
+    <color name="midnightdusk_secondaryContainer">#3080ff</color>
+    <color name="midnightdusk_onSecondaryContainer">#FFFFFF</color>
+    <color name="midnightdusk_tertiary">#55971C</color>
+    <color name="midnightdusk_onTertiary">#FFFFFF</color>
+    <color name="midnightdusk_tertiaryContainer">#386412</color>
+    <color name="midnightdusk_onTertiaryContainer">#E5E1E5</color>
+    <color name="midnightdusk_background">#16151D</color>
+    <color name="midnightdusk_onBackground">#E5E1E5</color>
+    <color name="midnightdusk_surface">#16151D</color>
+    <color name="midnightdusk_onSurface">#E5E1E5</color>
+    <color name="midnightdusk_surfaceVariant">#434352</color>
+    <color name="midnightdusk_onSurfaceVariant">#c2c1d6</color>
+    <color name="midnightdusk_outline">#8c8d9f</color>
+    <color name="midnightdusk_inverseSurface">#333043</color>
+    <color name="midnightdusk_inverseOnSurface">#FFFFFF</color>
+    <color name="midnightdusk_primaryInverse">#3080ff</color>
+    <color name="midnightdusk_elevationOverlay">#000C2C</color>
+</resources>
diff --git a/app/src/main/res/values/colors_crayolablue.xml b/app/src/main/res/values/colors_crayolablue.xml
new file mode 100644
index 000000000000..ed7749e8cd70
--- /dev/null
+++ b/app/src/main/res/values/colors_crayolablue.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Colors for Crayola Blue theme
+  ~ Original color scheme by 1-minute-to-midnight
+  ~
+  ~ Key colors:
+  ~ Primary #3080ff
+  ~ Secondary #3080ff
+  ~ Tertiary #7A5733
+  ~ Neutral #16151D
+-->
+<resources>
+    <color name="midnightdusk_primary">#005abb</color>
+    <color name="midnightdusk_onPrimary">#FFFFFF</color>
+    <color name="midnightdusk_primaryContainer">#d9e3ff</color>
+    <color name="midnightdusk_onPrimaryContainer">#000d3f</color>
+    <color name="midnightdusk_secondary">#005abb</color>
+    <color name="midnightdusk_onSecondary">#FFFFFF</color>
+    <color name="midnightdusk_secondaryContainer">#d9e3ff</color>
+    <color name="midnightdusk_onSecondaryContainer">#000d3f</color>
+    <color name="midnightdusk_tertiary">#006638</color>
+    <color name="midnightdusk_onTertiary">#FFFFFF</color>
+    <color name="midnightdusk_tertiaryContainer">#00894b</color>
+    <color name="midnightdusk_onTertiaryContainer">#001d2d</color>
+    <color name="midnightdusk_background">#FFFBFF</color>
+    <color name="midnightdusk_onBackground">#1C1B1F</color>
+    <color name="midnightdusk_surface">#FFFBFF</color>
+    <color name="midnightdusk_onSurface">#1C1B1F</color>
+    <color name="midnightdusk_surfaceVariant">#dde2f3</color>
+    <color name="midnightdusk_onSurfaceVariant">#464352</color>
+    <color name="midnightdusk_outline">#767384</color>
+    <color name="midnightdusk_inverseOnSurface">#F4F0F4</color>
+    <color name="midnightdusk_inverseSurface">#313033</color>
+    <color name="midnightdusk_primaryInverse">#b1bdff</color>
+    <color name="midnightdusk_elevationOverlay">#005abb</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 013f61eb585a..7df59924259f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,6 +171,7 @@
     <string name="theme_yinyang">Yin &amp; Yang</string>
     <string name="theme_yotsuba">Yotsuba</string>
     <string name="theme_tidalwave">Tidal Wave</string>
+    <string name="theme_crayolablue">Crayola Blue</string>
     <string name="pref_dark_theme_pure_black">Pure black dark mode</string>
     <string name="pref_category_navigation">Navigation</string>
     <string name="pref_side_nav_icon_alignment">Side navigation icon alignment</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6a70f005d984..23ae066f430b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -345,6 +345,33 @@
         <item name="colorPrimaryInverse">@color/tidalwave_primaryInverse</item>
     </style>
 
+    <!--== Crayola Blue Theme ==-->
+    <style name="Theme.Tachiyomi.CrayolaBlue">
+        <!-- Theme Colors -->
+        <item name="colorPrimary">@color/crayolablue_primary</item>
+        <item name="colorOnPrimary">@color/crayolablue_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/crayolablue_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/crayolablue_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/crayolablue_secondary</item>
+        <item name="colorOnSecondary">@color/crayolablue_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/crayolablue_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/crayolablue_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/crayolablue_tertiary</item>
+        <item name="colorOnTertiary">@color/crayolablue_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/crayolablue_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/crayolablue_onTertiaryContainer</item>
+        <item name="android:colorBackground">@color/crayolablue_background</item>
+        <item name="colorOnBackground">@color/crayolablue_onBackground</item>
+        <item name="colorSurface">@color/crayolablue_surface</item>
+        <item name="colorOnSurface">@color/crayolablue_onSurface</item>
+        <item name="colorSurfaceVariant">@color/crayolablue_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/crayolablue_onSurfaceVariant</item>
+        <item name="colorOutline">@color/crayolablue_outline</item>
+        <item name="colorOnSurfaceInverse">@color/crayolablue_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/crayolablue_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/crayolablue_primaryInverse</item>
+    </style>
+
     <!--== AMOLED Mode Overlay ==-->
     <style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />
 

From fe33734b8a1912f8229b407c86141a10b810c422 Mon Sep 17 00:00:00 2001
From: 1minutetomidnight <rishin.ga@gmail.com>
Date: Sun, 21 Aug 2022 17:26:54 +0400
Subject: [PATCH 2/3] Correct Duplicate Resources Error

---
 .../res/values-night/colors_crayolablue.xml   | 46 +++++++++----------
 .../main/res/values/colors_crayolablue.xml    | 46 +++++++++----------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/src/main/res/values-night/colors_crayolablue.xml b/app/src/main/res/values-night/colors_crayolablue.xml
index 209aa679b6df..fe0d0ae27d4c 100644
--- a/app/src/main/res/values-night/colors_crayolablue.xml
+++ b/app/src/main/res/values-night/colors_crayolablue.xml
@@ -10,27 +10,27 @@
   ~ Neutral #16151D
 -->
 <resources>
-    <color name="midnightdusk_primary">#3080ff</color>
-    <color name="midnightdusk_onPrimary">#FFFFFF</color>
-    <color name="midnightdusk_primaryContainer">#185bc7</color>
-    <color name="midnightdusk_onPrimaryContainer">#FFFFFF</color>
-    <color name="midnightdusk_secondary">#3080ff</color>
-    <color name="midnightdusk_onSecondary">#FFFFFF</color>
-    <color name="midnightdusk_secondaryContainer">#3080ff</color>
-    <color name="midnightdusk_onSecondaryContainer">#FFFFFF</color>
-    <color name="midnightdusk_tertiary">#55971C</color>
-    <color name="midnightdusk_onTertiary">#FFFFFF</color>
-    <color name="midnightdusk_tertiaryContainer">#386412</color>
-    <color name="midnightdusk_onTertiaryContainer">#E5E1E5</color>
-    <color name="midnightdusk_background">#16151D</color>
-    <color name="midnightdusk_onBackground">#E5E1E5</color>
-    <color name="midnightdusk_surface">#16151D</color>
-    <color name="midnightdusk_onSurface">#E5E1E5</color>
-    <color name="midnightdusk_surfaceVariant">#434352</color>
-    <color name="midnightdusk_onSurfaceVariant">#c2c1d6</color>
-    <color name="midnightdusk_outline">#8c8d9f</color>
-    <color name="midnightdusk_inverseSurface">#333043</color>
-    <color name="midnightdusk_inverseOnSurface">#FFFFFF</color>
-    <color name="midnightdusk_primaryInverse">#3080ff</color>
-    <color name="midnightdusk_elevationOverlay">#000C2C</color>
+    <color name="crayolablue_primary">#3080ff</color>
+    <color name="crayolablue_onPrimary">#FFFFFF</color>
+    <color name="crayolablue_primaryContainer">#185bc7</color>
+    <color name="crayolablue_onPrimaryContainer">#FFFFFF</color>
+    <color name="crayolablue_secondary">#3080ff</color>
+    <color name="crayolablue_onSecondary">#FFFFFF</color>
+    <color name="crayolablue_secondaryContainer">#3080ff</color>
+    <color name="crayolablue_onSecondaryContainer">#FFFFFF</color>
+    <color name="crayolablue_tertiary">#55971C</color>
+    <color name="crayolablue_onTertiary">#FFFFFF</color>
+    <color name="crayolablue_tertiaryContainer">#386412</color>
+    <color name="crayolablue_onTertiaryContainer">#E5E1E5</color>
+    <color name="crayolablue_background">#16151D</color>
+    <color name="crayolablue_onBackground">#E5E1E5</color>
+    <color name="crayolablue_surface">#16151D</color>
+    <color name="crayolablue_onSurface">#E5E1E5</color>
+    <color name="crayolablue_surfaceVariant">#434352</color>
+    <color name="crayolablue_onSurfaceVariant">#c2c1d6</color>
+    <color name="crayolablue_outline">#8c8d9f</color>
+    <color name="crayolablue_inverseSurface">#333043</color>
+    <color name="crayolablue_inverseOnSurface">#FFFFFF</color>
+    <color name="crayolablue_primaryInverse">#3080ff</color>
+    <color name="crayolablue_elevationOverlay">#000C2C</color>
 </resources>
diff --git a/app/src/main/res/values/colors_crayolablue.xml b/app/src/main/res/values/colors_crayolablue.xml
index ed7749e8cd70..659163d8f5cc 100644
--- a/app/src/main/res/values/colors_crayolablue.xml
+++ b/app/src/main/res/values/colors_crayolablue.xml
@@ -10,27 +10,27 @@
   ~ Neutral #16151D
 -->
 <resources>
-    <color name="midnightdusk_primary">#005abb</color>
-    <color name="midnightdusk_onPrimary">#FFFFFF</color>
-    <color name="midnightdusk_primaryContainer">#d9e3ff</color>
-    <color name="midnightdusk_onPrimaryContainer">#000d3f</color>
-    <color name="midnightdusk_secondary">#005abb</color>
-    <color name="midnightdusk_onSecondary">#FFFFFF</color>
-    <color name="midnightdusk_secondaryContainer">#d9e3ff</color>
-    <color name="midnightdusk_onSecondaryContainer">#000d3f</color>
-    <color name="midnightdusk_tertiary">#006638</color>
-    <color name="midnightdusk_onTertiary">#FFFFFF</color>
-    <color name="midnightdusk_tertiaryContainer">#00894b</color>
-    <color name="midnightdusk_onTertiaryContainer">#001d2d</color>
-    <color name="midnightdusk_background">#FFFBFF</color>
-    <color name="midnightdusk_onBackground">#1C1B1F</color>
-    <color name="midnightdusk_surface">#FFFBFF</color>
-    <color name="midnightdusk_onSurface">#1C1B1F</color>
-    <color name="midnightdusk_surfaceVariant">#dde2f3</color>
-    <color name="midnightdusk_onSurfaceVariant">#464352</color>
-    <color name="midnightdusk_outline">#767384</color>
-    <color name="midnightdusk_inverseOnSurface">#F4F0F4</color>
-    <color name="midnightdusk_inverseSurface">#313033</color>
-    <color name="midnightdusk_primaryInverse">#b1bdff</color>
-    <color name="midnightdusk_elevationOverlay">#005abb</color>
+    <color name="crayolablue_primary">#005abb</color>
+    <color name="crayolablue_onPrimary">#FFFFFF</color>
+    <color name="crayolablue_primaryContainer">#d9e3ff</color>
+    <color name="crayolablue_onPrimaryContainer">#000d3f</color>
+    <color name="crayolablue_secondary">#005abb</color>
+    <color name="crayolablue_onSecondary">#FFFFFF</color>
+    <color name="crayolablue_secondaryContainer">#d9e3ff</color>
+    <color name="crayolablue_onSecondaryContainer">#000d3f</color>
+    <color name="crayolablue_tertiary">#006638</color>
+    <color name="crayolablue_onTertiary">#FFFFFF</color>
+    <color name="crayolablue_tertiaryContainer">#00894b</color>
+    <color name="crayolablue_onTertiaryContainer">#001d2d</color>
+    <color name="crayolablue_background">#FFFBFF</color>
+    <color name="crayolablue_onBackground">#1C1B1F</color>
+    <color name="crayolablue_surface">#FFFBFF</color>
+    <color name="crayolablue_onSurface">#1C1B1F</color>
+    <color name="crayolablue_surfaceVariant">#dde2f3</color>
+    <color name="crayolablue_onSurfaceVariant">#464352</color>
+    <color name="crayolablue_outline">#767384</color>
+    <color name="crayolablue_inverseOnSurface">#F4F0F4</color>
+    <color name="crayolablue_inverseSurface">#313033</color>
+    <color name="crayolablue_primaryInverse">#b1bdff</color>
+    <color name="crayolablue_elevationOverlay">#005abb</color>
 </resources>

From a2084b4578a18f9ba4e96e34a99796598efaf747 Mon Sep 17 00:00:00 2001
From: 1-minute-to-midnight
 <70870070+1-minute-to-midnight@users.noreply.github.com>
Date: Tue, 23 Aug 2022 19:34:02 +0000
Subject: [PATCH 3/3] Correct Spelling

---
 app/src/main/res/values-night/colors_crayolablue.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-night/colors_crayolablue.xml b/app/src/main/res/values-night/colors_crayolablue.xml
index fe0d0ae27d4c..23e337a00d98 100644
--- a/app/src/main/res/values-night/colors_crayolablue.xml
+++ b/app/src/main/res/values-night/colors_crayolablue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Colors for Crayol Blue theme
+  ~ Colors for Crayola Blue theme
   ~ Original color scheme by 1-minute-to-midnight
   ~
   ~ Key colors: