From fdec4d50da73b1ca51dcc52ec84e8de23210c037 Mon Sep 17 00:00:00 2001
From: mueller-ma <mueller-ma@users.noreply.github.com>
Date: Sun, 19 Jan 2020 12:12:13 +0100
Subject: [PATCH] Use darker colors for artist images (#984)

* Use darker colors for artist images

Fixes #983

Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>

* Use material colors

Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>

* Update generate-themes.pl

Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
---
 .../android/vanilla/CoverBitmap.java          |  4 +++-
 .../main/res/values-v21/theme-amoled_dark.xml |  1 +
 .../main/res/values-v21/theme-blue_dark.xml   |  1 +
 .../main/res/values-v21/theme-blue_light.xml  |  1 +
 .../main/res/values-v21/theme-grey_dark.xml   |  1 +
 .../main/res/values-v21/theme-grey_light.xml  |  1 +
 .../main/res/values-v21/theme-orange_dark.xml |  1 +
 .../res/values-v21/theme-orange_light.xml     |  1 +
 .../main/res/values-v21/theme-red_dark.xml    |  1 +
 .../main/res/values-v21/theme-red_light.xml   |  1 +
 .../res/values-v21/theme-standard_dark.xml    |  1 +
 .../res/values-v21/theme-standard_light.xml   |  1 +
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/theme-standard.xml    |  1 +
 app/src/main/res/values/tiles_colors.xml      | 19 ++++++++++++++++++-
 generate-themes.pl                            |  2 ++
 16 files changed, 36 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 generate-themes.pl

diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/CoverBitmap.java b/app/src/main/java/ch/blinkenlights/android/vanilla/CoverBitmap.java
index 44adfd97..158dc2d0 100644
--- a/app/src/main/java/ch/blinkenlights/android/vanilla/CoverBitmap.java
+++ b/app/src/main/java/ch/blinkenlights/android/vanilla/CoverBitmap.java
@@ -411,7 +411,9 @@ public final class CoverBitmap {
 		Paint paint = new Paint();
 
 		// Picks a semi-random color from tiles_colors.xml
-		TypedArray colors = context.getResources().obtainTypedArray(R.array.letter_tile_colors);
+		TypedValue tv = new TypedValue();
+		context.getTheme().resolveAttribute(R.attr.themed_letter_tile_colors, tv, false);
+		TypedArray colors = context.getResources().obtainTypedArray(tv.data);
 		int color = colors.getColor(Math.abs(title.hashCode()) % colors.length(), 0);
 		colors.recycle();
 		paint.setColor(color);
diff --git a/app/src/main/res/values-v21/theme-amoled_dark.xml b/app/src/main/res/values-v21/theme-amoled_dark.xml
index 07b78212..898edc38 100644
--- a/app/src/main/res/values-v21/theme-amoled_dark.xml
+++ b/app/src/main/res/values-v21/theme-amoled_dark.xml
@@ -34,6 +34,7 @@
 		<item name="android:colorAccent">#ffd8d8d8</item>
 		<item name="android:colorPrimary">#ff000000</item>
 		<item name="android:colorPrimaryDark">#ff000000</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="Amoled_dark.Playback" parent="Amoled_dark.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-blue_dark.xml b/app/src/main/res/values-v21/theme-blue_dark.xml
index a796961f..98ccc2a3 100644
--- a/app/src/main/res/values-v21/theme-blue_dark.xml
+++ b/app/src/main/res/values-v21/theme-blue_dark.xml
@@ -31,6 +31,7 @@
 		<item name="android:colorAccent">#FF03A9F4</item>
 		<item name="android:colorPrimary">#FF0277BD</item>
 		<item name="android:colorPrimaryDark">#FF01579B</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="Blue_dark.Playback" parent="Blue_dark.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-blue_light.xml b/app/src/main/res/values-v21/theme-blue_light.xml
index d30981f7..8a5f51e1 100644
--- a/app/src/main/res/values-v21/theme-blue_light.xml
+++ b/app/src/main/res/values-v21/theme-blue_light.xml
@@ -30,6 +30,7 @@
 		<item name="android:colorAccent">#FF03A9F4</item>
 		<item name="android:colorPrimary">#FF0277BD</item>
 		<item name="android:colorPrimaryDark">#FF01579B</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="Blue_light.Playback" parent="Blue_light.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-grey_dark.xml b/app/src/main/res/values-v21/theme-grey_dark.xml
index 7db59f50..782960ab 100644
--- a/app/src/main/res/values-v21/theme-grey_dark.xml
+++ b/app/src/main/res/values-v21/theme-grey_dark.xml
@@ -31,6 +31,7 @@
 		<item name="android:colorAccent">#ffd8d8d8</item>
 		<item name="android:colorPrimary">#ff212121</item>
 		<item name="android:colorPrimaryDark">#ff090909</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="Grey_dark.Playback" parent="Grey_dark.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-grey_light.xml b/app/src/main/res/values-v21/theme-grey_light.xml
index 0e20d46b..61696f14 100644
--- a/app/src/main/res/values-v21/theme-grey_light.xml
+++ b/app/src/main/res/values-v21/theme-grey_light.xml
@@ -30,6 +30,7 @@
 		<item name="android:colorAccent">#ff000000</item>
 		<item name="android:colorPrimary">#ff212121</item>
 		<item name="android:colorPrimaryDark">#ff090909</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="Grey_light.Playback" parent="Grey_light.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-orange_dark.xml b/app/src/main/res/values-v21/theme-orange_dark.xml
index 9ab520e8..04cc163c 100644
--- a/app/src/main/res/values-v21/theme-orange_dark.xml
+++ b/app/src/main/res/values-v21/theme-orange_dark.xml
@@ -31,6 +31,7 @@
 		<item name="android:colorAccent">#FFF57F17</item>
 		<item name="android:colorPrimary">#FFE65100</item>
 		<item name="android:colorPrimaryDark">#FFBF360C</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="Orange_dark.Playback" parent="Orange_dark.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-orange_light.xml b/app/src/main/res/values-v21/theme-orange_light.xml
index 0705b0ef..e50066a9 100644
--- a/app/src/main/res/values-v21/theme-orange_light.xml
+++ b/app/src/main/res/values-v21/theme-orange_light.xml
@@ -30,6 +30,7 @@
 		<item name="android:colorAccent">#FFF57F17</item>
 		<item name="android:colorPrimary">#FFE65100</item>
 		<item name="android:colorPrimaryDark">#FFBF360C</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="Orange_light.Playback" parent="Orange_light.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-red_dark.xml b/app/src/main/res/values-v21/theme-red_dark.xml
index 6471a70b..f0e1a683 100644
--- a/app/src/main/res/values-v21/theme-red_dark.xml
+++ b/app/src/main/res/values-v21/theme-red_dark.xml
@@ -31,6 +31,7 @@
 		<item name="android:colorAccent">#ffd50000</item>
 		<item name="android:colorPrimary">#ffc62828</item>
 		<item name="android:colorPrimaryDark">#ffb71c1c</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="Red_dark.Playback" parent="Red_dark.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-red_light.xml b/app/src/main/res/values-v21/theme-red_light.xml
index 42646e0d..97df109b 100644
--- a/app/src/main/res/values-v21/theme-red_light.xml
+++ b/app/src/main/res/values-v21/theme-red_light.xml
@@ -30,6 +30,7 @@
 		<item name="android:colorAccent">#ffd50000</item>
 		<item name="android:colorPrimary">#ffc62828</item>
 		<item name="android:colorPrimaryDark">#ffb71c1c</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="Red_light.Playback" parent="Red_light.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-standard_dark.xml b/app/src/main/res/values-v21/theme-standard_dark.xml
index b69d1010..f90d132d 100644
--- a/app/src/main/res/values-v21/theme-standard_dark.xml
+++ b/app/src/main/res/values-v21/theme-standard_dark.xml
@@ -31,6 +31,7 @@
 		<item name="android:colorAccent">#ff3e677a</item>
 		<item name="android:colorPrimary">#ff37474f</item>
 		<item name="android:colorPrimaryDark">#ff263238</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="Standard_dark.Playback" parent="Standard_dark.VanillaBase">
diff --git a/app/src/main/res/values-v21/theme-standard_light.xml b/app/src/main/res/values-v21/theme-standard_light.xml
index f202e865..d8197848 100644
--- a/app/src/main/res/values-v21/theme-standard_light.xml
+++ b/app/src/main/res/values-v21/theme-standard_light.xml
@@ -30,6 +30,7 @@
 		<item name="android:colorAccent">#ff3e677a</item>
 		<item name="android:colorPrimary">#ff37474f</item>
 		<item name="android:colorPrimaryDark">#ff263238</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="Playback" parent="VanillaBase">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c04321a9..67616de3 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,4 +7,5 @@
 	<attr name="controls_normal"          format="color" />
 	<attr name="controls_active"          format="color" />
 	<attr name="background_circle_color"  format="color" />
+	<attr name="themed_letter_tile_colors" format="reference" />
 </resources>
diff --git a/app/src/main/res/values/theme-standard.xml b/app/src/main/res/values/theme-standard.xml
index 7a1ebc31..874f0499 100644
--- a/app/src/main/res/values/theme-standard.xml
+++ b/app/src/main/res/values/theme-standard.xml
@@ -32,6 +32,7 @@ THE SOFTWARE.
 		<item name="controls_normal">#fff5f5f5</item>
 		<item name="controls_active">@android:color/holo_blue_dark</item>
 		<item name="android:scrollbarStyle">outsideInset</item>
+		<item name="themed_letter_tile_colors">@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="Playback" parent="VanillaBase">
diff --git a/app/src/main/res/values/tiles_colors.xml b/app/src/main/res/values/tiles_colors.xml
index 268f18bd..3b966c17 100644
--- a/app/src/main/res/values/tiles_colors.xml
+++ b/app/src/main/res/values/tiles_colors.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <array name="letter_tile_colors">
+    <array name="letter_tile_colors_light">
         <item>#DB4437</item>
         <item>#E91E63</item>
         <item>#9C27B0</item>
@@ -32,4 +32,21 @@
         <item>#FF5722</item>
         <item>#757575</item>
     </array>
+
+	<array name="letter_tile_colors_dark">
+		<item>#A81104</item>
+		<item>#AD1457</item>
+		<item>#6A1B9A</item>
+		<item>#4527A0</item>
+		<item>#283593</item>
+		<item>#0F52C1</item>
+		<item>#0277BD</item>
+		<item>#006064</item>
+		<item>#00695C</item>
+		<item>#006A25</item>
+		<item>#558B2F</item>
+		<item>#E65100</item>
+		<item>#D84315</item>
+		<item>#424242</item>
+	</array>
 </resources>
diff --git a/generate-themes.pl b/generate-themes.pl
old mode 100644
new mode 100755
index 531278af..f418da96
--- a/generate-themes.pl
+++ b/generate-themes.pl
@@ -117,6 +117,7 @@ EOF
 		<item name="android:colorAccent">$this->{colorAccent}</item>
 		<item name="android:colorPrimary">$this->{colorPrimary}</item>
 		<item name="android:colorPrimaryDark">$this->{colorPrimaryDark}</item>
+		<item name="themed_letter_tile_colors">\@array/letter_tile_colors_light</item>
 	</style>
 
 	<style name="${tid}Playback" parent="${tid}VanillaBase">
@@ -159,6 +160,7 @@ EOF
 		<item name="android:colorAccent">$this->{colorAccent}</item>
 		<item name="android:colorPrimary">$this->{colorPrimary}</item>
 		<item name="android:colorPrimaryDark">$this->{colorPrimaryDark}</item>
+		<item name="themed_letter_tile_colors">\@array/letter_tile_colors_dark</item>
 	</style>
 
 	<style name="${tid}Playback" parent="${tid}VanillaBase">