From 936ede9abad6b2775a8b539c04066a9542be0cc3 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sun, 10 Apr 2016 15:48:57 +0200
Subject: [PATCH] Light and dark theme are now using different accent colors

---
 .../res/drawable-v21/list_item_selector_dark.xml  |  2 +-
 .../res/drawable-v21/list_item_selector_light.xml |  2 +-
 app/src/main/res/layout/reader_popup.xml          |  2 +-
 app/src/main/res/values/colors.xml                | 15 +++++++++------
 app/src/main/res/values/styles.xml                |  4 ++--
 app/src/main/res/values/themes.xml                |  8 ++++----
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/drawable-v21/list_item_selector_dark.xml b/app/src/main/res/drawable-v21/list_item_selector_dark.xml
index 3391e4ea2c..d1152832e7 100644
--- a/app/src/main/res/drawable-v21/list_item_selector_dark.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_dark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccent"
+    android:color="@color/colorAccentDark"
     >
     <item>
         <selector>
diff --git a/app/src/main/res/drawable-v21/list_item_selector_light.xml b/app/src/main/res/drawable-v21/list_item_selector_light.xml
index 57bb65957a..d17e5bf434 100644
--- a/app/src/main/res/drawable-v21/list_item_selector_light.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_light.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/colorAccent"
+    android:color="@color/colorAccentLight"
     >
     <item>
         <selector>
diff --git a/app/src/main/res/layout/reader_popup.xml b/app/src/main/res/layout/reader_popup.xml
index b16dc33bfc..aab501eb6f 100644
--- a/app/src/main/res/layout/reader_popup.xml
+++ b/app/src/main/res/layout/reader_popup.xml
@@ -20,7 +20,7 @@
             android:layout_width="32dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:textColor="@color/colorAccent"
+            android:textColor="?colorAccent"
             style="@style/TextAppearance.Regular.SubHeading"/>
 
         <TextView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3eff8b739a..50c36bc1cb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,9 +4,9 @@
     <color name="colorPrimary">#54759e</color>
     <color name="colorPrimaryDark">#435e7e</color>
     <color name="colorPrimaryDarkTrans">#40435e7e</color>
-    <color name="colorAccent">@color/md_blue_400</color>
 
     <!-- Light Theme -->
+    <color name="colorAccentLight">@color/md_blue_A400</color>
     <color name="textColorPrimaryLight">@color/md_black_1000_87</color>
     <color name="textColorSecondaryLight">@color/md_black_1000_54</color>
     <color name="textColorHintLight">@color/md_black_1000_38</color>
@@ -17,9 +17,10 @@
     <color name="backgroundLight">@color/md_grey_50</color>
     <color name="dialogLight">@color/md_white_1000</color>
 
-    <color name="selectorColorLight">@color/md_blue_400_38</color>
+    <color name="selectorColorLight">@color/md_blue_A400_38</color>
 
     <!-- Dark Theme -->
+    <color name="colorAccentDark">@color/md_blue_A200</color>
     <color name="textColorPrimaryDark">@color/md_white_1000</color>
     <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
     <color name="textColorHintDark">@color/md_white_1000_50</color>
@@ -30,7 +31,7 @@
     <color name="backgroundDark">#303030</color>
     <color name="dialogDark">@color/md_grey_800</color>
 
-    <color name="selectorColorDark">@color/md_blue_400_50</color>
+    <color name="selectorColorDark">@color/md_blue_A200_50</color>
 
     <!-- Reader Theme -->
     <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
@@ -58,9 +59,11 @@
     <color name="md_grey_900">#212121</color>
     <color name="md_grey_900_75">#BF212121</color>
 
-    <color name="md_blue_400">#42A5F5</color>
-    <color name="md_blue_400_50">#8042A5F5</color>
-    <color name="md_blue_400_38">#6142A5F5</color>
+    <color name="md_blue_A200">#448AFF</color>
+    <color name="md_blue_A200_50">#80448AFF</color>
+
+    <color name="md_blue_A400">#2979FF</color>
+    <color name="md_blue_A400_38">#612979FF</color>
 
     <color name="md_blue_grey_900">#263238</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a41a94f87a..73e1e47211 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
 
     <style name="Theme.Widget.NavigationView.Dark">
         <item name="colorControlHighlight">@color/md_grey_900</item>
-        <item name="colorPrimary">@color/colorAccent</item>
+        <item name="colorPrimary">?colorAccent</item>
     </style>
 
     <!--===============-->
@@ -168,7 +168,7 @@
     <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">@color/colorAccentLight</item>
         <item name="colorButtonNormal">@color/colorPrimary</item>
         <item name="android:textSize">14sp</item>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4030cb9529..02317d32dd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,7 +12,7 @@
     <style name="Theme.Base" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">@color/colorAccentLight</item>
         <item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
         <item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
         <item name="android:textColorHint">@color/textColorHintLight</item>
@@ -20,7 +20,7 @@
         <item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
         <item name="android:textColorHintInverse">@color/textColorHintDark</item>
         <item name="android:colorBackground">@color/backgroundLight</item>
-        <item name="android:listSelector">@color/colorAccent</item>
+        <item name="android:listSelector">?colorAccent</item>
         <item name="android:divider">@color/dividerLight</item>
 
         <!-- Themes -->
@@ -46,7 +46,7 @@
     <style name="Theme.Base.Dark" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">@color/colorAccentDark</item>
         <item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
         <item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
         <item name="android:textColorHint">@color/textColorHintDark</item>
@@ -54,7 +54,7 @@
         <item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
         <item name="android:textColorHintInverse">@color/textColorHintLight</item>
         <item name="android:colorBackground">@color/backgroundDark</item>
-        <item name="android:listSelector">@color/colorAccent</item>
+        <item name="android:listSelector">?colorAccent</item>
         <item name="android:divider">@color/dividerDark</item>
 
         <!-- Themes -->