From e703dea460dd99c4fbab322d305d52edcbd30d95 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Thu, 10 Aug 2017 10:50:18 +0200
Subject: [PATCH] fix bug #649

---
 generate-themes.pl               |  2 +-
 res/values-v21/theme-greyish.xml |  8 ++--
 res/values-v21/themes-list.xml   | 74 ++++++++++++++++----------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/generate-themes.pl b/generate-themes.pl
index 834ac3d4..d89d85d8 100644
--- a/generate-themes.pl
+++ b/generate-themes.pl
@@ -13,7 +13,7 @@ my $THEMES = [
 	{
 		_name => 'greyish',
 		light => { colorAccent => '#ff000000', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', controlsNormal=>'@color/material_grey_600', _bg => '#fff0f0f0' },
-		dark  => { colorAccent => '#ffffffff', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', controlsNormal=>'@color/material_grey_600', _bg => '#ff2a2a2a' },
+		dark  => { colorAccent => '#ffd8d8d8', colorPrimary => '#ff212121', colorPrimaryDark => '#ff090909', controlsNormal=>'@color/material_grey_600', _bg => '#ff2a2a2a' },
 	},
 	{
 		_name => 'orange',
diff --git a/res/values-v21/theme-greyish.xml b/res/values-v21/theme-greyish.xml
index dd3637b3..4dfe3666 100644
--- a/res/values-v21/theme-greyish.xml
+++ b/res/values-v21/theme-greyish.xml
@@ -58,10 +58,10 @@
 		<item name="float_color">@color/material_grey_900</item>
 		<item name="background_circle_color">@color/material_grey_700</item>
 		<item name="tabs_background">#ff212121</item>
-		<item name="now_playing_marker">#ffffffff</item>
+		<item name="now_playing_marker">#ffd8d8d8</item>
 		<item name="controls_normal">@color/material_grey_600</item>
-		<item name="controls_active">#ffffffff</item>
-		<item name="android:colorAccent">#ffffffff</item>
+		<item name="controls_active">#ffd8d8d8</item>
+		<item name="android:colorAccent">#ffd8d8d8</item>
 		<item name="android:colorPrimary">#ff212121</item>
 		<item name="android:colorPrimaryDark">#ff090909</item>
 	</style>
@@ -82,7 +82,7 @@
 	<style name="Greyish.Dark.PopupDialog" parent="android:Theme.Material.Dialog.MinWidth">
 		<item name="background_circle_color">@color/material_grey_700</item>
 		<item name="controls_normal">@color/material_grey_600</item>
-		<item name="controls_active">#ffffffff</item>
+		<item name="controls_active">#ffd8d8d8</item>
 	</style>
 
 </resources>
diff --git a/res/values-v21/themes-list.xml b/res/values-v21/themes-list.xml
index 5b696452..b84a52ac 100644
--- a/res/values-v21/themes-list.xml
+++ b/res/values-v21/themes-list.xml
@@ -1,31 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- THIS FILE IS AUTOGENERATED BY generate-themes.pl - DO NOT TOUCH! -->
 <resources>
-	<string-array name="theme_entries">
-		<item>Standard</item>
-		<item>Dark.Standard</item>
-		<item>Greyish</item>
-		<item>Dark.Greyish</item>
-		<item>Orange</item>
-		<item>Dark.Orange</item>
-		<item>Blue</item>
-		<item>Dark.Blue</item>
-		<item>Red</item>
-		<item>Dark.Red</item>
-	</string-array>
-
-	<string-array name="theme_values">
-		<item>0,#ff263238,#fff0f0f0,#ff37474f</item>
-		<item>1,#ff263238,#ff2a2a2a,#ff37474f</item>
-		<item>2,#ff090909,#fff0f0f0,#ff212121</item>
-		<item>3,#ff090909,#ff2a2a2a,#ff212121</item>
-		<item>4,#FFBF360C,#fff0f0f0,#FFE65100</item>
-		<item>5,#FFBF360C,#ff2a2a2a,#FFE65100</item>
-		<item>6,#FF01579B,#fff0f0f0,#FF0277BD</item>
-		<item>7,#FF01579B,#ff2a2a2a,#FF0277BD</item>
-		<item>8,#ffb71c1c,#fff0f0f0,#ffc62828</item>
-		<item>9,#ffb71c1c,#ff2a2a2a,#ffc62828</item>
-	</string-array>
+	<integer-array name="theme_category_library">
+		<item>@style/Library</item>
+		<item>@style/Dark.Library</item>
+		<item>@style/Greyish.Library</item>
+		<item>@style/Greyish.Dark.Library</item>
+		<item>@style/Orange.Library</item>
+		<item>@style/Orange.Dark.Library</item>
+		<item>@style/Blue.Library</item>
+		<item>@style/Blue.Dark.Library</item>
+		<item>@style/Red.Library</item>
+		<item>@style/Red.Dark.Library</item>
+	</integer-array>
 
 	<integer-array name="theme_category_backactionbar">
 		<item>@style/BackActionBar</item>
@@ -79,17 +66,30 @@
 		<item>@style/Red.Dark.PopupDialog</item>
 	</integer-array>
 
-	<integer-array name="theme_category_library">
-		<item>@style/Library</item>
-		<item>@style/Dark.Library</item>
-		<item>@style/Greyish.Library</item>
-		<item>@style/Greyish.Dark.Library</item>
-		<item>@style/Orange.Library</item>
-		<item>@style/Orange.Dark.Library</item>
-		<item>@style/Blue.Library</item>
-		<item>@style/Blue.Dark.Library</item>
-		<item>@style/Red.Library</item>
-		<item>@style/Red.Dark.Library</item>
-	</integer-array>
+	<string-array name="theme_values">
+		<item>0,#ff263238,#fff0f0f0,#ff37474f</item>
+		<item>1,#ff263238,#ff2a2a2a,#ff37474f</item>
+		<item>2,#ff090909,#fff0f0f0,#ff212121</item>
+		<item>3,#ff090909,#ff2a2a2a,#ff212121</item>
+		<item>4,#FFBF360C,#fff0f0f0,#FFE65100</item>
+		<item>5,#FFBF360C,#ff2a2a2a,#FFE65100</item>
+		<item>6,#FF01579B,#fff0f0f0,#FF0277BD</item>
+		<item>7,#FF01579B,#ff2a2a2a,#FF0277BD</item>
+		<item>8,#ffb71c1c,#fff0f0f0,#ffc62828</item>
+		<item>9,#ffb71c1c,#ff2a2a2a,#ffc62828</item>
+	</string-array>
+
+	<string-array name="theme_entries">
+		<item>Standard</item>
+		<item>Dark.Standard</item>
+		<item>Greyish</item>
+		<item>Dark.Greyish</item>
+		<item>Orange</item>
+		<item>Dark.Orange</item>
+		<item>Blue</item>
+		<item>Dark.Blue</item>
+		<item>Red</item>
+		<item>Dark.Red</item>
+	</string-array>
 
 </resources>