From bc3fbe09f5da005a5c14886bce66d9ccf88dde4c Mon Sep 17 00:00:00 2001
From: Rikka <rikka@xing.moe>
Date: Sun, 27 Sep 2020 19:34:38 +0800
Subject: [PATCH] Update several colors in themes

* Change color for Mew theme

The original color looks like disabled color.

* Change color for Zapdos theme

The original colors have extremely poor readability. For yellow colors, it is difficult to balance readability and beauty, maybe remove it is a better choice?

* Change colors

- Use original colors for dark themes
- Adjust light colors

* Change colorError for dark themes
---
 app/src/main/res/values-night/themes_md2.xml | 16 ++++++++++++--
 app/src/main/res/values/themes_md2.xml       | 22 +++++++++++++-------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-night/themes_md2.xml b/app/src/main/res/values-night/themes_md2.xml
index 0f5a2fc94..e4b72276f 100644
--- a/app/src/main/res/values-night/themes_md2.xml
+++ b/app/src/main/res/values-night/themes_md2.xml
@@ -15,8 +15,8 @@
         <item name="colorOnPrimaryVariant">#D9E6E6E6</item>
         <item name="colorOnSecondary">#F9F9F9</item>
         <item name="colorOnBackground">?colorOnSurface</item>
-        <item name="colorError">#CC0047</item>
-        <item name="colorOnError">#F9F9F9</item>
+        <item name="colorError">#EF8282</item>
+        <item name="colorOnError">#0D0D0D</item>
         <item name="colorOnSurface">#D8D8D8</item>
         <item name="colorOnSurfaceVariant">#CCBABABA</item>
         <item name="colorDisabled">#808080</item>
@@ -31,6 +31,18 @@
         <item name="colorOnError">#FFF</item>
     </style>
 
+    <style name="ThemeFoundationMD2.Zapdos" parent="ThemeFoundationMD2.Zapdos.Base">
+        <item name="colorPrimary">#FBD179</item>
+        <item name="colorPrimaryVariant">#80FBD179</item>
+    </style>
+
+    <style name="ThemeFoundationMD2.Mew" parent="ThemeFoundationMD2.Mew.Base">
+        <item name="colorPrimary">#D9ADB7</item>
+        <item name="colorPrimaryVariant">#80E9BBC5</item>
+        <item name="colorOnPrimary">#000000</item>
+        <item name="colorOnPrimaryVariant">#D9222222</item>
+    </style>
+
     <!--3rd party themes-->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_md2.xml b/app/src/main/res/values/themes_md2.xml
index b786860e3..a8b856261 100644
--- a/app/src/main/res/values/themes_md2.xml
+++ b/app/src/main/res/values/themes_md2.xml
@@ -77,15 +77,18 @@
         <item name="colorSecondaryVariant">#802F6D43</item>
     </style>
 
-    <style name="ThemeFoundationMD2.Zapdos" parent="ThemeFoundationMD2.Piplup">
-        <item name="colorPrimary">#FBD179</item>
-        <item name="colorPrimaryVariant">#80FBD179</item>
+    <style name="ThemeFoundationMD2.Zapdos.Base" parent="ThemeFoundationMD2.Piplup">
         <item name="colorSecondary">#B29667</item>
         <item name="colorSecondaryVariant">#80B29667</item>
         <item name="colorOnPrimary">#000000</item>
         <item name="colorOnPrimaryVariant">#D9222222</item>
     </style>
 
+    <style name="ThemeFoundationMD2.Zapdos" parent="ThemeFoundationMD2.Zapdos.Base">
+        <item name="colorPrimary">#F2B90D</item>
+        <item name="colorPrimaryVariant">#80F2B90D</item>
+    </style>
+
     <style name="ThemeFoundationMD2.Charmeleon" parent="ThemeFoundationMD2.Piplup">
         <item name="colorPrimary">#DB7366</item>
         <item name="colorPrimaryVariant">#80DB7366</item>
@@ -95,13 +98,16 @@
         <item name="colorOnPrimaryVariant">#D9222222</item>
     </style>
 
-    <style name="ThemeFoundationMD2.Mew" parent="ThemeFoundationMD2.Piplup">
-        <item name="colorPrimary">#D9ADB7</item>
-        <item name="colorPrimaryVariant">#80E9BBC5</item>
+    <style name="ThemeFoundationMD2.Mew.Base" parent="ThemeFoundationMD2.Piplup">
         <item name="colorSecondary">#B5889B</item>
         <item name="colorSecondaryVariant">#80B5889B</item>
-        <item name="colorOnPrimary">#000000</item>
-        <item name="colorOnPrimaryVariant">#D9222222</item>
+    </style>
+
+    <style name="ThemeFoundationMD2.Mew" parent="ThemeFoundationMD2.Mew.Base">
+        <item name="colorPrimary">#B3566C</item>
+        <item name="colorPrimaryVariant">#80B3566C</item>
+        <item name="colorOnPrimary">#F9F9F9</item>
+        <item name="colorOnPrimaryVariant">#D9E6E6E6</item>
     </style>
 
     <style name="ThemeFoundationMD2.Salamence" parent="ThemeFoundationMD2.Piplup">