Fix light light themed icons against dark background

4 files changed, 70 insertions, 39 deletions

diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index b896509e..c71ff4b7 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -40,7 +40,38 @@
 				android:layout_weight="1"

 				android:background="@android:color/transparent">

 

-				<include layout="@layout/download_action_buttons"/>

+					<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+						android:id="@+id/download_other_controls_layout"

+						android:orientation="horizontal"

+						android:layout_width="wrap_content"

+						android:layout_height="wrap_content"

+						android:layout_gravity="center_horizontal">

+

+						<Button

+							android:id="@+id/download_jukebox"

+							android:text="RC"

+							style="@style/DownloadActionButton"/>

+

+						<Button

+							android:id="@+id/download_equalizer"

+							android:text="EQ"

+							style="@style/DownloadActionButton"/>

+

+						<Button

+							android:id="@+id/download_visualizer"

+							android:text="VIS"

+							style="@style/DownloadActionButton"/>

+

+						<ImageButton

+							android:id="@+id/download_star"

+							style="@style/DownloadActionImageButton"

+							android:src="@android:drawable/star_big_off"/>

+

+						<ImageButton

+							android:id="@+id/download_bookmark"

+							style="@style/DownloadActionImageButton"

+							android:src="?attr/bookmark"/>

+					</LinearLayout>

 

 				<LinearLayout

 						android:id="@+id/download_visualizer_view_layout"

diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index a70160a1..7d89baf3 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -49,7 +49,38 @@
 							android:layout_height="wrap_content"

 							android:layout_centerHorizontal="true">

 

-							<include layout="@layout/download_action_buttons"/>

+							<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+								android:id="@+id/download_other_controls_layout"

+								android:orientation="horizontal"

+								android:layout_width="wrap_content"

+								android:layout_height="wrap_content"

+								android:layout_gravity="center_horizontal">

+

+								<Button

+									android:id="@+id/download_jukebox"

+									android:text="RC"

+									style="@style/DownloadActionButton"/>

+

+								<Button

+									android:id="@+id/download_equalizer"

+									android:text="EQ"

+									style="@style/DownloadActionButton"/>

+

+								<Button

+									android:id="@+id/download_visualizer"

+									android:text="VIS"

+									style="@style/DownloadActionButton"/>

+

+								<ImageButton

+									android:id="@+id/download_star"

+									style="@style/DownloadActionImageButton"

+									android:src="@android:drawable/star_big_off"/>

+

+								<ImageButton

+									android:id="@+id/download_bookmark"

+									style="@style/DownloadActionImageButton"

+									android:src="@drawable/ic_menu_bookmark_dark"/>

+							</LinearLayout>

 						</LinearLayout>

 					</RelativeLayout>

 

diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml
deleted file mode 100644
index e3a45151..00000000
--- a/res/layout/download_action_buttons.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-	android:id="@+id/download_other_controls_layout"

-	android:orientation="horizontal"

-	android:layout_width="wrap_content"

-	android:layout_height="wrap_content"

-	android:layout_gravity="center_horizontal">

-

-	<Button

-		android:id="@+id/download_jukebox"

-		android:text="RC"

-		style="@style/DownloadActionButton"/>

-

-	<Button

-		android:id="@+id/download_equalizer"

-		android:text="EQ"

-		style="@style/DownloadActionButton"/>

-

-	<Button

-		android:id="@+id/download_visualizer"

-		android:text="VIS"

-		style="@style/DownloadActionButton"/>

-

-	<ImageButton

-		android:id="@+id/download_star"

-		style="@style/DownloadActionImageButton"

-		android:src="@android:drawable/star_big_off"/>

-

-	<ImageButton

-		android:id="@+id/download_bookmark"

-		style="@style/DownloadActionImageButton"

-		android:src="?attr/bookmark"/>

-</LinearLayout>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9aa83d2a..8a2bff2c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -25,7 +25,7 @@
 		<item name="share">@drawable/ic_menu_share_light</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
@@ -53,7 +53,7 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
@@ -84,7 +84,7 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 	</style>
 	
 	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -111,6 +111,8 @@
 	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
 	</style>
 
-	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">
+	<style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button">
+	</style>
+	<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
 	</style>
 </resources>