From e6f29ae57fdd5a40b3d83f5c00d62c962f8bcef8 Mon Sep 17 00:00:00 2001
From: Riztard Lanthorn <riyanluqman@gmail.com>
Date: Thu, 25 Nov 2021 05:38:17 +0700
Subject: [PATCH] Tweak Teal & Turquoise color for new M3 (#6268)

* Tweak Teal & Turquoise color for new M3

* capitalize

* tweak elevationOverlayColor

* more tweak
---
 .../res/values-night/tealturqoise_colors.xml  | 57 ++++++++-----------
 .../main/res/values/tealturqoise_colors.xml   | 53 +++++++----------
 app/src/main/res/values/themes.xml            |  3 +
 3 files changed, 49 insertions(+), 64 deletions(-)

diff --git a/app/src/main/res/values-night/tealturqoise_colors.xml b/app/src/main/res/values-night/tealturqoise_colors.xml
index 74d29764f7..69d3e4d4eb 100644
--- a/app/src/main/res/values-night/tealturqoise_colors.xml
+++ b/app/src/main/res/values-night/tealturqoise_colors.xml
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Colors for Teal & Turquoise theme
-  ~ Original color scheme by Riztard
-  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
-  ~
-  ~ Key colors:
-  ~ Primary #008080
-  ~ Secondary #008080
-  ~ Tertiary #FF7F7F
-  ~ Neutral #5B5F5F
--->
+
 <resources>
-    <color name="tealturquoise_primary">#4DDADA</color>
-    <color name="tealturquoise_onPrimary">#003738</color>
-    <color name="tealturquoise_primaryContainer">#004F50</color>
-    <color name="tealturquoise_onPrimaryContainer">#6EF6F6</color>
-    <color name="tealturquoise_secondary">#4DDADA</color>
-    <color name="tealturquoise_onSecondary">#003738</color>
-    <color name="tealturquoise_secondaryContainer">#004F50</color>
-    <color name="tealturquoise_onSecondaryContainer">#6EF6F6</color>
-    <color name="tealturquoise_tertiary">#FFB3B1</color>
-    <color name="tealturquoise_onTertiary">#640914</color>
-    <color name="tealturquoise_tertiaryContainer">#842328</color>
-    <color name="tealturquoise_onTertiaryContainer">#FFDAD7</color>
-    <color name="tealturquoise_background">#191C1C</color>
-    <color name="tealturquoise_onBackground">#E0E3E2</color>
-    <color name="tealturquoise_surface">#191C1C</color>
-    <color name="tealturquoise_onSurface">#E0E3E2</color>
-    <color name="tealturquoise_surfaceVariant">#3F4848</color>
-    <color name="tealturquoise_onSurfaceVariant">#BEC9C8</color>
-    <color name="tealturquoise_outline">#889392</color>
-    <color name="tealturquoise_inverseOnSurface">#191C1C</color>
-    <color name="tealturquoise_inverseSurface">#E0E3E2</color>
-    <color name="tealturquoise_primaryInverse">#006A6A</color>
+    <color name="tealturquoise_primary">#40E0D0</color>
+    <color name="tealturquoise_onPrimary">#000000</color>
+    <color name="tealturquoise_primaryContainer">#40E0D0</color>
+    <color name="tealturquoise_onPrimaryContainer">#000000</color>
+    <color name="tealturquoise_secondary">#40E0D0</color>
+    <color name="tealturquoise_onSecondary">#000000</color>
+    <color name="tealturquoise_secondaryContainer">#18544E</color>
+    <color name="tealturquoise_onSecondaryContainer">#40E0D0</color>
+    <color name="tealturquoise_tertiary">#BF1F2F</color>
+    <color name="tealturquoise_onTertiary">#FFFFFF</color>
+    <color name="tealturquoise_tertiaryContainer">#200508</color>
+    <color name="tealturquoise_onTertiaryContainer">#BF1F2F</color>
+    <color name="tealturquoise_background">#202125</color>
+    <color name="tealturquoise_onBackground">#DFDEDA</color>
+    <color name="tealturquoise_surface">#202125</color>
+    <color name="tealturquoise_onSurface">#DFDEDA</color>
+    <color name="tealturquoise_surfaceVariant">#3F4947</color>
+    <color name="tealturquoise_onSurfaceVariant">#DFDEDA</color>
+    <color name="tealturquoise_outline">#899391</color>
+    <color name="tealturquoise_inverseOnSurface">#202125</color>
+    <color name="tealturquoise_inverseSurface">#DFDEDA</color>
+    <color name="tealturquoise_primaryInverse">#008080</color>
+    <color name="tealturquoise_elevationOverlay">#18544E</color>
 </resources>
diff --git a/app/src/main/res/values/tealturqoise_colors.xml b/app/src/main/res/values/tealturqoise_colors.xml
index 289ca9f935..c9b1e0a9dc 100644
--- a/app/src/main/res/values/tealturqoise_colors.xml
+++ b/app/src/main/res/values/tealturqoise_colors.xml
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Colors for Teal & Turquoise theme
-  ~ Original color scheme by Riztard
-  ~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
-  ~
-  ~ Key colors:
-  ~ Primary #008080
-  ~ Secondary #008080
-  ~ Tertiary #FF7F7F
-  ~ Neutral #5B5F5F
--->
+
 <resources>
-    <color name="tealturquoise_primary">#006A6A</color>
+    <color name="tealturquoise_primary">#008080</color>
     <color name="tealturquoise_onPrimary">#FFFFFF</color>
-    <color name="tealturquoise_primaryContainer">#6EF6F6</color>
-    <color name="tealturquoise_onPrimaryContainer">#002020</color>
-    <color name="tealturquoise_secondary">#006A6A</color>
+    <color name="tealturquoise_primaryContainer">#008080</color>
+    <color name="tealturquoise_onPrimaryContainer">#FFFFFF</color>
+    <color name="tealturquoise_secondary">#008080</color>
     <color name="tealturquoise_onSecondary">#FFFFFF</color>
-    <color name="tealturquoise_secondaryContainer">#6EF6F6</color>
-    <color name="tealturquoise_onSecondaryContainer">#002020</color>
-    <color name="tealturquoise_tertiary">#A33A3D</color>
-    <color name="tealturquoise_onTertiary">#FFFFFF</color>
-    <color name="tealturquoise_tertiaryContainer">#FFDAD7</color>
-    <color name="tealturquoise_onTertiaryContainer">#410006</color>
-    <color name="tealturquoise_background">#FAFDFC</color>
-    <color name="tealturquoise_onBackground">#191C1C</color>
-    <color name="tealturquoise_surface">#FAFDFC</color>
-    <color name="tealturquoise_onSurface">#191C1C</color>
-    <color name="tealturquoise_surfaceVariant">#DAE5E4</color>
-    <color name="tealturquoise_onSurfaceVariant">#3F4848</color>
-    <color name="tealturquoise_outline">#6F7978</color>
-    <color name="tealturquoise_inverseOnSurface">#EFF1F0</color>
-    <color name="tealturquoise_inverseSurface">#2D3131</color>
-    <color name="tealturquoise_primaryInverse">#4DDADA</color>
+    <color name="tealturquoise_secondaryContainer">#BFDFDF</color>
+    <color name="tealturquoise_onSecondaryContainer">#008080</color>
+    <color name="tealturquoise_tertiary">#FF7F7F</color>
+    <color name="tealturquoise_onTertiary">#000000</color>
+    <color name="tealturquoise_tertiaryContainer">#2A1616</color>
+    <color name="tealturquoise_onTertiaryContainer">#FF7F7F</color>
+    <color name="tealturquoise_background">#FAFAFA</color>
+    <color name="tealturquoise_onBackground">#050505</color>
+    <color name="tealturquoise_surface">#FAFAFA</color>
+    <color name="tealturquoise_onSurface">#050505</color>
+    <color name="tealturquoise_surfaceVariant">#DAE5E2</color>
+    <color name="tealturquoise_onSurfaceVariant">#050505</color>
+    <color name="tealturquoise_outline">#6F7977</color>
+    <color name="tealturquoise_inverseOnSurface">#FAFAFA</color>
+    <color name="tealturquoise_inverseSurface">#050505</color>
+    <color name="tealturquoise_primaryInverse">#40E0D0</color>
+    <color name="tealturquoise_elevationOverlay">#BFDFDF</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 72d6b4590c..c3e68321f8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -235,6 +235,9 @@
         <item name="colorOnSurfaceInverse">@color/tealturquoise_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/tealturquoise_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/tealturquoise_primaryInverse</item>
+        <item name="colorError">@color/tealturquoise_tertiary</item>
+        <item name="colorOnError">@color/tealturquoise_onTertiary</item>
+        <item name="elevationOverlayColor">@color/tealturquoise_elevationOverlay</item>
     </style>
 
     <!--== Yin & Yang Theme ==-->