From bb95fa8c87f9983fbbfce1a83c87d16e124e6f92 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 19 Sep 2012 20:57:50 -0700
Subject: Changes to style + tab icons

---
 .../res/drawable-hdpi-v4/action_home.png           | Bin 1814 -> 0 bytes
 .../res/drawable-hdpi-v4/menu_browse.png           | Bin 4007 -> 1673 bytes
 .../res/drawable-hdpi-v4/menu_home.png             | Bin 3259 -> 1814 bytes
 .../res/drawable-hdpi-v4/menu_now_playing.png      | Bin 3192 -> 1359 bytes
 .../res/drawable-hdpi-v4/menu_playlists.png        | Bin 997 -> 1158 bytes
 .../drawable-hdpi-v4/menubar_button_pressed.9.png  | Bin 312 -> 163 bytes
 subsonic-android/res/drawable/menu_browse.png      | Bin 2355 -> 0 bytes
 subsonic-android/res/drawable/menu_home.png        | Bin 2048 -> 0 bytes
 subsonic-android/res/drawable/menu_now_playing.png | Bin 2078 -> 0 bytes
 subsonic-android/res/drawable/menu_playlists.png   | Bin 706 -> 0 bytes
 subsonic-android/res/drawable/menu_search.png      | Bin 5059 -> 0 bytes
 subsonic-android/res/drawable/menubar_button.xml   |   2 +-
 subsonic-android/res/layout/button_bar.xml         |  23 ++++++++-------------
 subsonic-android/res/values/colors.xml             |   1 +
 subsonic-android/res/values/styles.xml             |  19 ++++++++++-------
 15 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/action_home.png
 delete mode 100644 subsonic-android/res/drawable/menu_browse.png
 delete mode 100644 subsonic-android/res/drawable/menu_home.png
 delete mode 100644 subsonic-android/res/drawable/menu_now_playing.png
 delete mode 100644 subsonic-android/res/drawable/menu_playlists.png
 delete mode 100644 subsonic-android/res/drawable/menu_search.png

(limited to 'subsonic-android')

diff --git a/subsonic-android/res/drawable-hdpi-v4/action_home.png b/subsonic-android/res/drawable-hdpi-v4/action_home.png
deleted file mode 100644
index 3cec6246..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/action_home.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_browse.png b/subsonic-android/res/drawable-hdpi-v4/menu_browse.png
index 70a59154..54296909 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/menu_browse.png and b/subsonic-android/res/drawable-hdpi-v4/menu_browse.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_home.png b/subsonic-android/res/drawable-hdpi-v4/menu_home.png
index 35cb52aa..3cec6246 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/menu_home.png and b/subsonic-android/res/drawable-hdpi-v4/menu_home.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png b/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png
index 10af07fe..6ce5629a 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png and b/subsonic-android/res/drawable-hdpi-v4/menu_now_playing.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png b/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png
index 59345d5b..e9e83e3d 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png and b/subsonic-android/res/drawable-hdpi-v4/menu_playlists.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png b/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png
index 4dff0907..e4b33935 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png and b/subsonic-android/res/drawable-hdpi-v4/menubar_button_pressed.9.png differ
diff --git a/subsonic-android/res/drawable/menu_browse.png b/subsonic-android/res/drawable/menu_browse.png
deleted file mode 100644
index 3f1de60d..00000000
Binary files a/subsonic-android/res/drawable/menu_browse.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/menu_home.png b/subsonic-android/res/drawable/menu_home.png
deleted file mode 100644
index 34943f66..00000000
Binary files a/subsonic-android/res/drawable/menu_home.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/menu_now_playing.png b/subsonic-android/res/drawable/menu_now_playing.png
deleted file mode 100644
index 22f203a8..00000000
Binary files a/subsonic-android/res/drawable/menu_now_playing.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/menu_playlists.png b/subsonic-android/res/drawable/menu_playlists.png
deleted file mode 100644
index c01733d9..00000000
Binary files a/subsonic-android/res/drawable/menu_playlists.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/menu_search.png b/subsonic-android/res/drawable/menu_search.png
deleted file mode 100644
index 94446db9..00000000
Binary files a/subsonic-android/res/drawable/menu_search.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/menubar_button.xml b/subsonic-android/res/drawable/menubar_button.xml
index 06c2c8e7..7a717780 100644
--- a/subsonic-android/res/drawable/menubar_button.xml
+++ b/subsonic-android/res/drawable/menubar_button.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     
     <item android:state_pressed="true"
-          android:drawable="@drawable/menubar_button_pressed"/>
+          android:drawable="@color/background_holo_light"/>
 
     <item android:state_enabled="true"
           android:drawable="@drawable/menubar_button_normal"/>
diff --git a/subsonic-android/res/layout/button_bar.xml b/subsonic-android/res/layout/button_bar.xml
index 1d576775..52c78ba1 100644
--- a/subsonic-android/res/layout/button_bar.xml
+++ b/subsonic-android/res/layout/button_bar.xml
@@ -6,47 +6,42 @@
               android:layout_width="fill_parent"
               android:layout_height="wrap_content">
 
-    <View
-            android:layout_width="fill_parent"
-            android:layout_height="1px"
-            android:background="@color/dividerColor"/>
-
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
+                  android:layout_height="48dp"
                   android:gravity="center_horizontal">
 
         <ImageButton android:id="@+id/button_bar_home"
                      android:src="@drawable/menu_home"
                      android:contentDescription="@string/button_bar.home"
                      android:background="@drawable/menubar_button"
+					 android:layout_height="match_parent"
                      android:layout_weight="1"
-                     android:layout_width="0dp"
-                     android:layout_height="wrap_content"/>
+                     android:layout_width="0dp"/>
 
         <ImageButton android:id="@+id/button_bar_music"
                      android:src="@drawable/menu_browse"
                      android:contentDescription="@string/button_bar.browse"
                      android:background="@drawable/menubar_button"
+					 android:layout_height="match_parent"
                      android:layout_weight="1"
-                     android:layout_width="0dp"
-                     android:layout_height="wrap_content"/>
+                     android:layout_width="0dp"/>
 
         <ImageButton android:id="@+id/button_bar_playlists"
                      android:src="@drawable/menu_playlists"
                      android:contentDescription="@string/button_bar.playlists"
                      android:background="@drawable/menubar_button"
+					 android:layout_height="match_parent"
                      android:layout_weight="1"
-                     android:layout_width="0dp"
-                     android:layout_height="wrap_content"/>
+                     android:layout_width="0dp"/>
 
         <ImageButton android:id="@+id/button_bar_now_playing"
                      android:src="@drawable/menu_now_playing"
                      android:contentDescription="@string/button_bar.now_playing"
                      android:background="@drawable/menubar_button"
+					 android:layout_height="match_parent"
                      android:layout_weight="1"
-                     android:layout_width="0dp"
-                     android:layout_height="wrap_content"/>
+                     android:layout_width="0dp"/>
 
     </LinearLayout>
 </LinearLayout>
diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml
index 7a86d370..841acdb8 100644
--- a/subsonic-android/res/values/colors.xml
+++ b/subsonic-android/res/values/colors.xml
@@ -6,6 +6,7 @@
     <color name="appwidget_text">#FFFFFF</color>
     <color name="notificationArtist">#434343</color>
     <color name="notificationTitle">#000000</color>
+	<color name="background_holo_light">#ff33b5e5</color>
 	
 	<color name="ics_opaque">#8033b5e5</color>
 	<color name="cyan">#ff0099cc</color>
diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml
index 6db3df58..383c9195 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="Theme.DSub.Light" parent="Theme.Sherlock.Light">
-		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
-		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
+		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
+		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
 		<item name="android:textColorSecondary">@color/cyan</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="Theme.Sherlock">
-		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
-		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
+		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
+		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
 		<item name="android:textColorSecondary">@color/cyan</item>
 	</style>
 	
@@ -18,8 +18,13 @@
 		<item name="android:windowFullscreen">true</item>
 	</style>
 	
-	<style name="Widget.DSub.ActionBarStyle" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
-		<item name="background">@drawable/menubar_button_disabled</item>
-		<item name="android:background">@drawable/menubar_button_disabled</item>
+	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
+		<item name="background">@drawable/menubar_button_normal</item>
+		<item name="android:background">@drawable/menubar_button_normal</item>
+	</style>
+	
+	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
+		<item name="background">@drawable/menubar_button_normal</item>
+		<item name="android:background">@drawable/menubar_button_normal</item>
 	</style>
 </resources>
-- 
cgit v1.2.3