From 3ce75bfa1731da9da1b8885ee9e3263f51e1cc44 Mon Sep 17 00:00:00 2001
From: Synced Synapse <synced.synapse@gmail.com>
Date: Tue, 25 Jul 2017 19:44:38 +0100
Subject: [PATCH] Tweak light theme colors

---
 app/src/main/res/layout/toolbar_default.xml |  2 +-
 app/src/main/res/values/attr.xml            |  2 ++
 app/src/main/res/values/colors.xml          |  7 +++++++
 app/src/main/res/values/themes.xml          | 21 +++++++++++++++------
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/toolbar_default.xml b/app/src/main/res/layout/toolbar_default.xml
index 343fdf8..d55cbd7 100644
--- a/app/src/main/res/layout/toolbar_default.xml
+++ b/app/src/main/res/layout/toolbar_default.xml
@@ -23,4 +23,4 @@
     android:layout_width="match_parent"
     android:theme="?attr/actionBarTheme"
     app:popupTheme="?attr/actionBarPopupTheme"
-    android:background="?attr/colorPrimary" />
\ No newline at end of file
+    android:background="?attr/colorToolbar" />
\ No newline at end of file
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 6fc816d..a287e60 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -28,6 +28,8 @@
     <attr name="appSelectedCardBackgroundColor" format="reference|color" />
     <attr name="buttonBarBackgroundColor" format="reference|color" />
 
+    <attr name="colorToolbar" format="reference|color" />
+
     <attr name="fabColorNormal" format="reference|color" />
     <attr name="fabColorPressed" format="reference|color" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6673caa..be8effc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,6 +22,7 @@
 
     <!--<color name="accent_default">@color/light_green_A700</color>-->
     <color name="accent_default">@color/orange_A400</color>
+    <color name="accent_default_dark">@color/orange_A700</color>
 
     <color name="white">#ffffffff</color>
     <color name="white_dim_50pct">#88ffffff</color>
@@ -35,6 +36,12 @@
     <!--<color name="estuary_default">#147a96</color>-->
     <!--<color name="estuary_default_dark">#0f4d5e</color>-->
 
+    <color name="day_accent">#e66000</color>
+    <color name="day_accent_dark">#cd5700</color>
+    <color name="day_primary">#b13956</color>
+    <color name="day_primary_dark">#873349</color>
+    <!--<color name="day_primary">#993a50</color>-->
+
     <!--<color name="dark_content_background">#ff222326</color>-->
     <!--<color name="dark_content_background_dim_70pct">#b4222326</color>-->
     <color name="dark_content_background">#ff323232</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9eb35f9..a86fb27 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,7 +14,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:tools="http://schemas.android.com/tools">
 
 	<!-- Base Dark theme. -->
 	<style name="NightTheme" parent="Theme.AppCompat.NoActionBar">
@@ -47,6 +48,9 @@
         <!--<item name="colorControlHighlight">@color/color_accent</item>-->
         <!--<item name="colorControlActivated">@color/color_accent</item>-->
 
+        <item name="colorToolbar">?attr/colorPrimary</item>
+        <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryDark</item>
+
         <item name="colorButtonNormal">?attr/colorPrimary</item>
 
         <item name="appTextColorPrimary">@color/white</item>
@@ -57,6 +61,8 @@
 
         <item name="fabColorNormal">?attr/colorPrimary</item>
         <item name="fabColorPressed">?attr/colorPrimaryDark</item>
+        <!--<item name="fabColorNormal">@color/accent_default</item>-->
+        <!--<item name="fabColorPressed">@color/accent_default_dark</item>-->
 
         <!-- Toolbar bar -->
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.ActionBar</item>
@@ -159,9 +165,9 @@
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
 
         <!-- Set AppCompat’s color theming attrs -->
-        <item name="colorPrimary">@color/deep_orange_500</item>
-        <item name="colorPrimaryDark">@color/deep_orange_700</item>
-        <item name="colorAccent">@color/light_blue_A700</item>
+        <item name="colorPrimary">@color/day_primary</item>
+        <item name="colorPrimaryDark">@color/day_primary_dark</item>
+        <item name="colorAccent">@color/day_accent</item>
          <!--<item name="colorControlHighlight">@color/color_accent</item>-->
         <!--<item name="colorControlActivated">@color/color_accent</item>-->
 
@@ -169,14 +175,17 @@
         is set to white but can have unintended consequences. Watch it -->
         <!--<item name="colorControlNormal">@color/white</item>-->
 
+        <item name="colorToolbar">?attr/colorPrimary</item>
+        <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryDark</item>
+
         <item name="appTextColorPrimary">@color/black_dim_87pct</item>
         <item name="appTextColorSecondary">@color/black_dim_54pct</item>
 
         <item name="textColorOverPrimary">@color/white</item>
         <item name="buttonColorOverPrimary">@color/white</item>
 
-        <item name="fabColorNormal">?attr/colorPrimary</item>
-        <item name="fabColorPressed">?attr/colorPrimaryDark</item>
+        <item name="fabColorNormal">@color/accent_default</item>
+        <item name="fabColorPressed">@color/accent_default_dark</item>
 
         <!-- Toolbar bar -->
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>