From 152a6a280ace51a09ed55fe1e57c2f9168a59c95 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sun, 1 Mar 2020 09:42:57 +0800
Subject: Still prepare to support multiple themes.

---
 app/src/main/res/values/attr.xml   |  1 +
 app/src/main/res/values/styles.xml | 32 ++++++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 03dfb30f..5d6dc3c1 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -37,6 +37,7 @@
         <attr name="backgroundColor" format="color"/>
         <attr name="roundedBottomSheetPrimaryBackground" format="color"/>
         <attr name="cardViewBackgroundColor" format="color"/>
+        <attr name="toolbarPrimaryTextAndIconColor" format="color" />
         <attr name="toolbarAndTabBackgroundColor" format="color"/>
         <attr name="circularProgressBarBackground" format="color"/>
         <attr name="tabLayoutWithExpandedCollapsingToolbarTabBackground" format="color"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dc7024a9..2ae6c7cf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -38,10 +38,14 @@
         <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+        <item name="android:textColorPrimary">?attr/toolbarPrimaryTextAndIconColor</item>
+    </style>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
 
+    <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
     <style name="CustomTabLayout" parent="Widget.Design.TabLayout">
         <item name="tabIndicatorColor">@android:color/white</item>
         <item name="tabIndicatorHeight">3dp</item>
@@ -228,6 +232,7 @@
         <item name="backgroundColor">@color/backgroundColor</item>
         <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
         <item name="cardViewBackgroundColor">#FFFFFF</item>
+        <item name="toolbarPrimaryTextAndIconColor">#3C4043</item>
         <item name="toolbarAndTabBackgroundColor">@color/colorPrimary</item>
         <item name="circularProgressBarBackground">#FFFFFF</item>
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
@@ -279,6 +284,7 @@
         <item name="backgroundColor">@color/backgroundColor</item>
         <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
         <item name="cardViewBackgroundColor">#242424</item>
+        <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item>
         <item name="toolbarAndTabBackgroundColor">#282828</item>
         <item name="circularProgressBarBackground">@color/colorPrimary</item>
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
@@ -330,6 +336,7 @@
         <item name="backgroundColor">#000000</item>
         <item name="roundedBottomSheetPrimaryBackground">#000000</item>
         <item name="cardViewBackgroundColor">#000000</item>
+        <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item>
         <item name="toolbarAndTabBackgroundColor">#000000</item>
         <item name="circularProgressBarBackground">#000000</item>
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
@@ -372,23 +379,24 @@
     </style>
 
     <style name="Theme.Purple">
-        <item name="colorPrimary">#9C27B0</item>
-        <item name="colorPrimaryDark">#7B1FA2</item>
-        <item name="colorAccent">#03A9F4</item>
-        <item name="colorPrimaryLightTheme">#9C27B0</item>
+        <item name="colorPrimary">#00C3E9</item>
+        <item name="colorPrimaryDark">#009EBA</item>
+        <item name="colorAccent">#EE2502</item>
+        <item name="colorPrimaryLightTheme">?attr/colorPrimary</item>
         <item name="primaryTextColor">#000000</item>
         <item name="secondaryTextColor">#8A000000</item>
         <item name="backgroundColor">@color/backgroundColor</item>
         <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
         <item name="cardViewBackgroundColor">#FFFFFF</item>
-        <item name="toolbarAndTabBackgroundColor">#9C27B0</item>
+        <item name="toolbarPrimaryTextAndIconColor">#FF3C4043</item>
+        <item name="toolbarAndTabBackgroundColor">?attr/colorPrimary</item>
         <item name="circularProgressBarBackground">#FFFFFF</item>
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#9C27B0</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#9C27B0</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">#9C27B0</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">?attr/colorPrimary</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">?attr/colorPrimary</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">?attr/colorPrimary</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">?attr/toolbarPrimaryTextAndIconColor</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">?attr/toolbarPrimaryTextAndIconColor</item>
         <item name="navBarColor">@color/backgroundColor</item>
         <item name="upvoted">#E91E63</item>
         <item name="downvoted">#007DDE</item>
@@ -407,7 +415,7 @@
         <item name="authorFlairTextColor">#EE02C4</item>
         <item name="submitter">#EE8A02</item>
         <item name="moderator">#00BA81</item>
-        <item name="notificationIconColor">#9C27B0</item>
+        <item name="notificationIconColor">?attr/colorPrimary</item>
         <item name="singleCommentThreadBackgroundColor">#B3E5F9</item>
         <item name="unreadMessageBackgroundColor">#B3E5F9</item>
         <item name="dividerColor">#E0E0E0</item>
-- 
cgit v1.2.3