From bb5c427118b5c7370735ed4be8d9220a7a08faea Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sat, 11 Apr 2015 09:35:15 +0200
Subject: [PATCH] minor theming tweaks

---
 res/layout/full_playback.xml     |  4 ++--
 res/layout/full_playback_alt.xml | 40 ++++++++++++++++----------------
 res/values-v21/theme.xml         |  6 ++---
 res/values/theme.xml             |  6 ++---
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/res/layout/full_playback.xml b/res/layout/full_playback.xml
index 51d36cb4..ffb605a1 100644
--- a/res/layout/full_playback.xml
+++ b/res/layout/full_playback.xml
@@ -30,7 +30,7 @@ THE SOFTWARE.
 		android:layout_height="wrap_content"
 		android:layout_width="fill_parent"
 		android:layout_gravity="top"
-		android:background="@color/overlay_color"
+		android:background="@color/overlay_background_color"
 		android:orientation="horizontal">
 		<TextView
 			android:id="@+id/elapsed"
@@ -61,7 +61,7 @@ THE SOFTWARE.
 		android:layout_width="fill_parent"
 		android:layout_gravity="bottom|left"
 		android:layout_margin="0dip"
-		android:background="@color/overlay_color"
+		android:background="@color/overlay_background_color"
 		android:orientation="horizontal">
 		<include layout="@layout/controls" />
 	</LinearLayout>
diff --git a/res/layout/full_playback_alt.xml b/res/layout/full_playback_alt.xml
index 55bcc42a..bb962f24 100644
--- a/res/layout/full_playback_alt.xml
+++ b/res/layout/full_playback_alt.xml
@@ -33,18 +33,18 @@ THE SOFTWARE.
 		android:collapseColumns="0"
 		android:stretchColumns="1"
 		android:shrinkColumns="1"
-		android:background="@color/overlay_color"
+		android:background="@color/overlay_background_color"
 		android:paddingLeft="5dip"
 		android:paddingRight="5dip">
 		<TableRow>
 			<TextView
 				android:text="@string/_title"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
 			<TextView
 				android:id="@+id/title"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:textStyle="bold" />
 			<TextView
 				android:id="@+id/queue_pos"
@@ -54,66 +54,66 @@ THE SOFTWARE.
 		<TableRow>
 			<TextView
 				android:text="@string/_artist"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/artist" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/artist" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_album"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/album" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/album" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_genre"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/genre" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/genre" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_track"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/track" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/track" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_year"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/year" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/year" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_composer"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/composer" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/composer" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_format"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/format" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/format" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<TableRow>
 			<TextView
 				android:text="@string/_replaygain"
-				android:textColor="@color/playback_color"
+				android:textColor="@color/overlay_foreground_color"
 				android:paddingRight="5dip"
 				android:gravity="right" />
-			<TextView android:id="@+id/replaygain" android:textColor="@color/playback_color"/>
+			<TextView android:id="@+id/replaygain" android:textColor="@color/overlay_foreground_color"/>
 		</TableRow>
 		<LinearLayout android:id="@+id/controls_top">
 			<TextView
@@ -144,7 +144,7 @@ THE SOFTWARE.
 		android:layout_width="fill_parent"
 		android:layout_gravity="bottom|left"
 		android:layout_margin="0dip"
-		android:background="@color/overlay_color"
+		android:background="@color/overlay_background_color"
 		android:orientation="horizontal">
 		<include layout="@layout/controls" />
 	</LinearLayout>
diff --git a/res/values-v21/theme.xml b/res/values-v21/theme.xml
index 55660a84..fc715f5f 100644
--- a/res/values-v21/theme.xml
+++ b/res/values-v21/theme.xml
@@ -23,14 +23,14 @@ THE SOFTWARE.
 <resources>
 	<!-- Color used in LibraryActivity list dividers -->
 	<color name="divider_color">#ffd6d7d7</color>
-	<color name="overlay_color">#ffefefef</color>
+	<color name="overlay_background_color">#ffefefef</color>
+	<color name="overlay_foreground_color">#f000</color>
 	<color name="float_color">#ffd6d7d7</color>
-	<color name="playback_color">#f000</color>
 
 	<!-- Material design primary colors -->
 	<color name="vanillaPrimary">#607D8B</color>
 	<color name="vanillaPrimaryDark">#455A64</color>
-	<color name="vanillaAccent">#607D8B</color>
+	<color name="vanillaAccent">#455A64</color>
 	<color name="material_grey_900">#ff212121</color>
 
 	<!-- styles -->
diff --git a/res/values/theme.xml b/res/values/theme.xml
index d1512c34..fe97cb07 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -23,10 +23,10 @@ THE SOFTWARE.
 <resources>
 	<!-- Color used in LibraryActivity list dividers -->
 	<color name="divider_color">#f444</color>
-	<color name="overlay_color">#a000</color>
-	<color name="float_color">#f222</color>
+	<color name="overlay_background_color">#a000</color>
 	<!-- color to use in full_playback text, set to bright_foreground_disabled_holo_light //-->
-	<color name="playback_color">#ffb2b2b2</color>
+	<color name="overlay_foreground_color">#ffb2b2b2</color>
+	<color name="float_color">#f222</color>
 
 	<!-- styles -->
 	<style name="Dialog" parent="android:Theme.Holo.Dialog" />