From 773ddeb2181ece167114dce62a55e40f2bcc5c9f Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 2 Jun 2020 00:30:39 +0200
Subject: [PATCH] New colors?

---
 app/src/main/res/values/colors.xml |  8 ++++++++
 app/src/main/res/values/themes.xml | 23 ++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0bb71ef..24c5eab 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,14 @@
     <color name="primaryDarkRed">#B71C1C</color>
     <color name="secondaryBlue">#2962FF</color>
 
+    <color name="primaryColor">#283593</color>
+    <color name="primaryLightColor">#5f5fc4</color>
+    <color name="primaryDarkColor">#001064</color>
+    <color name="secondaryColor">#ffd600</color>
+    <color name="secondaryLightColor">#ffff52</color>
+    <color name="secondaryDarkColor">#c7a500</color>
+    <color name="primaryTextColor">#ffffff</color>
+
     <color name="textBlack">#CC000000</color>
     <color name="black">#000</color>
     <color name="white">#FFF</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eb80e07..8677922 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,15 +3,20 @@
     <!-- Base Theme. Insert common theme attributes here -->
     <style name="Base.Theme.Mercury"
         parent="Platform.Theme.Mercury">
-        <item name="android:colorBackground">@color/lightThemeBackground</item>
-        <item name="colorSurface">@color/lightThemeBackground</item>
-        <item name="colorPrimaryDark">@color/primaryDarkRed</item>
-        <item name="colorPrimary">@color/primaryRed</item>
-        <item name="colorSecondary">@color/secondaryBlue</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <item name="colorOnSecondary">@color/white</item>
+        <!--<item name="android:colorBackground">@color/lightThemeBackground</item>-->
+        <!--<item name="colorSurface">@color/lightThemeBackground</item>-->
+        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
+        <item name="colorPrimary">@color/primaryColor</item>
+        <item name="colorSecondary">@color/secondaryColor</item>
+        <item name="colorSecondaryVariant">@color/secondaryDarkColor</item>
+        <item name="colorOnPrimary">@color/primaryTextColor</item>
+        <item name="colorOnSecondary">@color/secondaryTextColor</item>
 
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item>
+
+        <item name="colorOnPrimarySurface">@color/white</item>
+        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.PrimarySurface</item>
+
+        <!--<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>-->
         <item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.PrimarySurface</item>
         <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
 
@@ -34,7 +39,7 @@
     <!-- TODO -->
     <style name="Theme.Mercury.Dark"
         parent="Base.Theme.Mercury">
-
+        <item name="android:colorBackground">@color/darkThemeBackground</item>
     </style>
 
     <!-- API v19 specific theme attributes -->