From f761dc861fe2aa8a6891c7892500ee1e1d2f72d5 Mon Sep 17 00:00:00 2001
From: enricocid <enrico2588@gmail.com>
Date: Thu, 31 May 2018 20:33:35 +0200
Subject: [PATCH] Improve fast scroller popup text color

Signed-off-by: enricocid <enrico2588@gmail.com>
---
 .../app/src/main/res/layout/main_activity.xml |  2 +-
 project/app/src/main/res/values/attrs.xml     |  1 +
 .../src/main/res/values/themes_inverted.xml   | 17 ++++++++++++++
 .../app/src/main/res/values/themes_light.xml  | 22 ++++++++++++++-----
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/project/app/src/main/res/layout/main_activity.xml b/project/app/src/main/res/layout/main_activity.xml
index a4fe79d33..e7f02464a 100644
--- a/project/app/src/main/res/layout/main_activity.xml
+++ b/project/app/src/main/res/layout/main_activity.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:fastScrollPopupBgColor="?attr/accent_color"
-        app:fastScrollPopupTextColor="?android:textColorSecondary"
+        app:fastScrollPopupTextColor="?attr/popup_text_color"
         app:fastScrollThumbColor="?attr/accent_color"
         app:fastScrollThumbInactiveColor="?attr/accent_color"
         tools:context="com.iven.musicplayergo.MainActivity" />
diff --git a/project/app/src/main/res/values/attrs.xml b/project/app/src/main/res/values/attrs.xml
index 6ffc1e8f4..1c71fcc36 100644
--- a/project/app/src/main/res/values/attrs.xml
+++ b/project/app/src/main/res/values/attrs.xml
@@ -3,4 +3,5 @@
     <attr name="accent_color" format="color" />
     <attr name="icon_color" format="color" />
     <attr name="secondary_bg_color" format="color" />
+    <attr name="popup_text_color" format="color" />
 </resources>
\ No newline at end of file
diff --git a/project/app/src/main/res/values/themes_inverted.xml b/project/app/src/main/res/values/themes_inverted.xml
index ea77dbb7d..1ce9eb589 100644
--- a/project/app/src/main/res/values/themes_inverted.xml
+++ b/project/app/src/main/res/values/themes_inverted.xml
@@ -2,86 +2,103 @@
 <resources>
     <!-- ACCENTS THEMES Inverted -->
     <style name="AppThemeRedInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/red_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemePinkInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/pink_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemePurpleInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/purple_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeDeepPurpleInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/deep_purple_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeIndigoInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/indigo_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeBlueInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/blue_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeLightBlueInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/light_blue_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeCyanInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/cyan_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeTealInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/teal_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeGreenInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/green_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeAmberInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/amber_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeOrangeInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/orange_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeDeepOrangeInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/deep_orange_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeBrownInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/brown_400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeGrayLightInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/gray_400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeGrayDarkInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/gray_800</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeBlueGrayInverted" parent="AppThemeInverted">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/blue_gray_400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
diff --git a/project/app/src/main/res/values/themes_light.xml b/project/app/src/main/res/values/themes_light.xml
index ea5aa4e08..0999885ac 100644
--- a/project/app/src/main/res/values/themes_light.xml
+++ b/project/app/src/main/res/values/themes_light.xml
@@ -2,91 +2,103 @@
 <resources>
     <!-- ACCENTS THEMES LIGHT -->
     <style name="AppThemeRed" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/red_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemePink" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/pink_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemePurple" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/purple_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeDeepPurple" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/deep_purple_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeIndigo" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/indigo_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeBlue" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/blue_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeLightBlue" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/light_blue_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeCyan" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/cyan_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeTeal" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/teal_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeGreen" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/green_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeAmber" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/amber_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeOrange" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/orange_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeDeepOrange" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/deep_orange_A400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeBrown" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/brown_400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
-    <style name="AppThemeGray" parent="AppTheme">
-        <item name="accent_color">@color/gray_400</item>
-        <item name="android:seekBarStyle">@style/SeekBarStyle</item>
-    </style>
-
     <style name="AppThemeGrayLight" parent="AppTheme">
+        <item name="popup_text_color">@color/inverted</item>
         <item name="accent_color">@color/gray_400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeGrayDark" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/gray_800</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>
 
     <style name="AppThemeBlueGray" parent="AppTheme">
+        <item name="popup_text_color">@color/light</item>
         <item name="accent_color">@color/blue_gray_400</item>
         <item name="android:seekBarStyle">@style/SeekBarStyle</item>
     </style>