From 6251c77563de1d0f5ae6e67114c32b85716cca17 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Mon, 18 Oct 2021 18:54:49 +0200
Subject: [PATCH] Implement better accent colors

---
 .../java/com/cyb3rko/cavedroid/MainActivity.kt   |  2 +-
 app/src/main/res/values-night/colors.xml         |  2 +-
 app/src/main/res/values/themes.xml               | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt b/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt
index ce0caac..cb71fb9 100644
--- a/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt
+++ b/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt
@@ -90,7 +90,7 @@ class MainActivity : AppCompatActivity() {
             if (mySPR.getString(THEME, R.style.Theme_Cavedroid_Standard.toString())!!.toInt() !=
                 R.style.Theme_Cavedroid_Standard) {
                 if (!Utils.isNightModeActive(resources)) {
-                    theme.resolveAttribute(R.attr.colorSecondary, typedValue, true)
+                    theme.resolveAttribute(R.attr.colorSecondaryVariant, typedValue, true)
                     binding.navView.setBackgroundColor(typedValue.data)
                 }
             }
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a76c048..2ff1b52 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -5,6 +5,6 @@
     <color name="click_hint">#FFFFFF</color>
     <color name="foreground_color">@android:color/primary_text_dark</color>
 
-    <color name="forest_accent">#343843</color>
+    <color name="forest_accent">#2A334A</color>
     <color name="house_accent">#2E392A</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index efb563f..5c64e83 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,8 +20,8 @@
         <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">#00A1D9</item>
-        <item name="colorSecondaryVariant">#00A1D9</item>
+        <item name="colorSecondary">#187CCA</item>
+        <item name="colorSecondaryVariant">#ADD9DF</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
@@ -34,8 +34,8 @@
         <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">#00A1D9</item>
-        <item name="colorSecondaryVariant">#00A1D9</item>
+        <item name="colorSecondary">#187CCA</item>
+        <item name="colorSecondaryVariant">#ADD9DF</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
@@ -48,8 +48,8 @@
         <item name="colorPrimaryVariant">#2F5023</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">#C2E7B4</item>
-        <item name="colorSecondaryVariant">#A3CF92</item>
+        <item name="colorSecondary">#73AF5D</item>
+        <item name="colorSecondaryVariant">#D0E8C7</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
@@ -62,8 +62,8 @@
         <item name="colorPrimaryVariant">#2F5023</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">#C2E7B4</item>
-        <item name="colorSecondaryVariant">#A3CF92</item>
+        <item name="colorSecondary">#73AF5D</item>
+        <item name="colorSecondaryVariant">#D0E8C7</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>