From 1b56144d2b18f7330c0d79e847b52ceafdf53de6 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sat, 8 Sep 2012 21:44:56 -0700
Subject: Revert "Revert "Started to work on move to ActionBarSherlock""

This reverts commit 00646f4aacd09c24d13170fe78bb144f1a98c4f6.
---
 subsonic-android/res/layout/main.xml            |  6 ----
 subsonic-android/res/layout/select_album.xml    |  2 --
 subsonic-android/res/layout/select_artist.xml   |  2 --
 subsonic-android/res/layout/select_playlist.xml |  2 --
 subsonic-android/res/menu/main.xml              | 38 +++++++++++++++----------
 subsonic-android/res/menu/select_album.xml      | 30 +++++++++++++++++++
 subsonic-android/res/menu/select_artist.xml     | 30 +++++++++++++++++++
 subsonic-android/res/menu/select_playlist.xml   | 24 ++++++++++++++++
 subsonic-android/res/values/strings.xml         |  4 +++
 9 files changed, 111 insertions(+), 27 deletions(-)
 create mode 100644 subsonic-android/res/menu/select_album.xml
 create mode 100644 subsonic-android/res/menu/select_artist.xml
 create mode 100644 subsonic-android/res/menu/select_playlist.xml

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml
index e151f319..56b013fe 100644
--- a/subsonic-android/res/layout/main.xml
+++ b/subsonic-android/res/layout/main.xml
@@ -4,12 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include 
-            layout="@layout/action_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="45dp"
-            />
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
index 2c9a00aa..d5a4d0d1 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_artist.xml b/subsonic-android/res/layout/select_artist.xml
index 7cf6fc77..bebfdec4 100644
--- a/subsonic-android/res/layout/select_artist.xml
+++ b/subsonic-android/res/layout/select_artist.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/layout/select_playlist.xml b/subsonic-android/res/layout/select_playlist.xml
index c23e764b..2555687d 100644
--- a/subsonic-android/res/layout/select_playlist.xml
+++ b/subsonic-android/res/layout/select_playlist.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml
index 27698f81..af6a5a7d 100644
--- a/subsonic-android/res/menu/main.xml
+++ b/subsonic-android/res/menu/main.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item 
+		android:id="@+id/menu_search"
+		android:icon="@drawable/action_search"
+		android:title="@string/menu.search"
+		android:showAsAction="ifRoom|withText"/>
+	
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="@drawable/action_shuffle"
+		android:title="@string/menu.shuffle"
+		android:showAsAction="ifRoom|withText"/>
 
-    <item 
-            android:id="@+id/menu_exit"
-            android:icon="@drawable/ic_menu_exit"
-            android:title="@string/menu.exit"
-            />
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/ic_menu_help"
+		android:title="@string/menu.help"/>
 
-    <item 
-            android:id="@+id/menu_settings"
-            android:icon="@drawable/ic_menu_settings"
-            android:title="@string/menu.settings"
-            />
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/ic_menu_settings"
+		android:title="@string/menu.settings"/>
 
-    <item 
-            android:id="@+id/menu_help"
-            android:icon="@drawable/ic_menu_help"
-            android:title="@string/menu.help"
-            />
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/ic_menu_exit"
+		android:title="@string/menu.exit"/>
 
 </menu>
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
new file mode 100644
index 00000000..a5f2a3a9
--- /dev/null
+++ b/subsonic-android/res/menu/select_album.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<item 
+		android:id="@+id/menu_play_all"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play"
+		android:showAsAction="ifRoom|withText"/>
+	
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
new file mode 100644
index 00000000..42916622
--- /dev/null
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="@drawable/action_shuffle"
+		android:title="@string/menu.shuffle"
+		android:showAsAction="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
new file mode 100644
index 00000000..46d863cd
--- /dev/null
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 7f9f6728..ea926fd9 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -33,6 +33,10 @@
     <string name="main.albums_highest">Top rated</string>
     <string name="main.albums_random">Random</string>
 
+	<string name="menu.search">Search</string>
+	<string name="menu.shuffle">Shuffle</string>
+	<string name="menu.refresh">Refresh</string>
+	<string name="menu.play">Play</string>
     <string name="menu.exit">Exit</string>
     <string name="menu.settings">Settings</string>
     <string name="menu.help">Help</string>
-- 
cgit v1.2.3


From 89ebb04737aeefefd5081c4157de90c735eab80c Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 9 Sep 2012 14:54:11 -0700
Subject: Removed Wheat theme + re-added back dynamic themeing to activities

---
 subsonic-android/AndroidManifest.xml                       |  2 +-
 subsonic-android/res/values/arrays.xml                     |  1 -
 subsonic-android/res/values/colors.xml                     |  4 ----
 subsonic-android/res/values/styles.xml                     | 14 +++-----------
 subsonic-android/res/xml/settings.xml                      |  2 +-
 .../daneren2005/dsub/activity/SubsonicTabActivity.java     | 11 ++++++-----
 6 files changed, 11 insertions(+), 23 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/AndroidManifest.xml b/subsonic-android/AndroidManifest.xml
index 04136ffc..ac786d26 100644
--- a/subsonic-android/AndroidManifest.xml
+++ b/subsonic-android/AndroidManifest.xml
@@ -18,7 +18,7 @@
 
     <supports-screens android:anyDensity="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
 
-    <application android:label="@string/common.appname" android:icon="@drawable/launch2" android:theme="@style/Theme.Sherlock.Light">
+    <application android:label="@string/common.appname" android:icon="@drawable/launch2" android:theme="@style/Theme.DSub.Light">
 
         <activity android:name="github.daneren2005.dsub.activity.MainActivity"
                   android:label="DSub"
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 17ea4b6a..e70b566f 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -8,7 +8,6 @@
     </string-array>
 
     <string-array name="themeNames">
-        <item>@string/settings.theme_wheat</item>
         <item>@string/settings.theme_light</item>
         <item>@string/settings.theme_dark</item>
     </string-array>
diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml
index 69ab22a1..7a86d370 100644
--- a/subsonic-android/res/values/colors.xml
+++ b/subsonic-android/res/values/colors.xml
@@ -6,10 +6,6 @@
     <color name="appwidget_text">#FFFFFF</color>
     <color name="notificationArtist">#434343</color>
     <color name="notificationTitle">#000000</color>
-
-    <color name="wheatBackground">#F1F0E6</color>
-    <color name="wheatForeground1">#494B26</color>
-    <color name="wheatForeground2">#830009</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 a970fe1b..9760bb0c 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Wheat" parent="android:Theme.Light">
-        <item name="android:windowBackground">@color/wheatBackground</item>
-        <item name="android:textColorPrimary">@color/wheatForeground1</item>
-        <item name="android:textColorSecondary">@color/wheatForeground2</item>
-        <item name="android:listViewStyle">@style/WheatListView</item>
-    </style>
-
-    <style name="WheatListView" parent="android:style/Widget.ListView.White">
-        <item name="android:cacheColorHint">@color/wheatBackground</item>
-    </style>
-
+    <style name="Theme.DSub.Wheat" parent="Theme.Sherlock.Light"></style>
+	<style name="Theme.DSub.Light" parent="Theme.Sherlock.Light"></style>
+	<style name="Theme.DSub.Dark" parent="Theme.Sherlock"></style>
 </resources>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index daa98b90..455a9dc0 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -109,7 +109,7 @@
         <ListPreference
                 android:title="@string/settings.theme_title"
                 android:key="theme"
-                android:defaultValue="wheat"
+                android:defaultValue="light"
                 android:entryValues="@array/themeValues"
                 android:entries="@array/themeNames"/>
 
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index 7d303a8d..03fcf357 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -67,9 +67,8 @@ public class SubsonicTabActivity extends SherlockActivity {
     @Override
     protected void onCreate(Bundle bundle) {
         setUncaughtExceptionHandler();
-        // applyTheme();
+        applyTheme();
         super.onCreate(bundle);
-        // requestWindowFeature(Window.FEATURE_NO_TITLE);
         startService(new Intent(this, DownloadServiceImpl.class));
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
     }
@@ -169,10 +168,12 @@ public class SubsonicTabActivity extends SherlockActivity {
     private void applyTheme() {
         String theme = Util.getTheme(this);
         if ("dark".equals(theme)) {
-            setTheme(android.R.style.Theme);
+            setTheme(R.style.Theme_DSub_Dark);
         } else if ("light".equals(theme)) {
-            setTheme(android.R.style.Theme_Light);
-        }
+            setTheme(R.style.Theme_DSub_Light);
+        } else {
+			setTheme(R.style.Theme_DSub_Light);
+		}
     }
 
     public boolean isDestroyed() {
-- 
cgit v1.2.3


From 9fc7d00c27771367a0150a568b980de5c68a34a0 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 9 Sep 2012 15:49:05 -0700
Subject: Fixed theming

---
 subsonic-android/res/values/arrays.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index e70b566f..aac7e74c 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <string-array name="themeValues">
-        <item>wheat</item>
         <item>light</item>
         <item>dark</item>
     </string-array>
-- 
cgit v1.2.3


From dae6e259f5a336df3b7a821ab9c05dd6e3df6bf4 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 9 Sep 2012 16:20:50 -0700
Subject: Themed ActionBar like old one

---
 subsonic-android/res/values/styles.xml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml
index 9760bb0c..bd76299a 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.DSub.Wheat" parent="Theme.Sherlock.Light"></style>
-	<style name="Theme.DSub.Light" parent="Theme.Sherlock.Light"></style>
-	<style name="Theme.DSub.Dark" parent="Theme.Sherlock"></style>
+    <style name="Theme.DSub.Wheat" parent="Theme.Sherlock.Light">
+		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
+		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
+	</style>
+	<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>
+	</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>
+	</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>
 </resources>
-- 
cgit v1.2.3


From 8335fa5934a1afed90c2542e5749c4b46c54349d Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 9 Sep 2012 16:36:35 -0700
Subject: Converted SearchActivity

---
 subsonic-android/res/layout/action_bar.xml         | 97 ----------------------
 subsonic-android/res/layout/search.xml             |  2 -
 subsonic-android/res/menu/search.xml               | 24 ++++++
 .../daneren2005/dsub/activity/SearchActivity.java  | 62 +++++++-------
 4 files changed, 55 insertions(+), 130 deletions(-)
 delete mode 100644 subsonic-android/res/layout/action_bar.xml
 create mode 100644 subsonic-android/res/menu/search.xml

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/action_bar.xml b/subsonic-android/res/layout/action_bar.xml
deleted file mode 100644
index 2aaa4116..00000000
--- a/subsonic-android/res/layout/action_bar.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/menubar_button_disabled">
-
-    <ImageView
-            android:id="@+id/actionbar_home_icon"
-            android:src="@drawable/main_header_icon2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true"
-            android:paddingLeft="4dip"
-            android:paddingRight="4dip"
-            android:paddingTop="2dip"
-            android:paddingBottom="2dip"
-            android:scaleType="centerInside"
-            />
-			
-	<ImageButton
-            android:id="@+id/action_button_4"
-            android:src="@drawable/action_settings"
-            android:layout_width="44dip"
-            android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:scaleType="fitCenter"
-            android:padding="5dp"
-            android:background="@drawable/actionbar_button"
-            />
-			
-	<ImageButton
-            android:id="@+id/action_button_3"
-            android:src="@drawable/action_help"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-			android:layout_toLeftOf="@id/action_button_4"
-            android:scaleType="center"
-            android:padding="5dp"
-            android:background="@drawable/actionbar_button"
-            />
-
-    <ImageButton
-            android:id="@+id/action_button_2"
-            android:src="@drawable/action_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-			android:layout_toLeftOf="@id/action_button_3"
-            android:scaleType="center"
-            android:padding="5dp"
-            android:background="@drawable/actionbar_button"
-            />
-
-    <ImageButton
-            android:id="@+id/action_button_1"
-            android:src="@drawable/action_shuffle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:layout_toLeftOf="@id/action_button_2"
-            android:scaleType="center"
-            android:padding="5dp"
-            android:background="@drawable/actionbar_button"
-            />
-
-    <TextView
-            android:id="@+id/actionbar_title_text"
-            android:text="Subsonic"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:layout_toLeftOf="@id/action_button_1"
-            android:layout_toRightOf="@id/actionbar_home_icon"
-            android:gravity="center_vertical"
-            android:textColor="#FFFFFF"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            android:shadowColor="#000000"
-            android:shadowDx="1"
-            android:shadowDy="1"
-            android:shadowRadius="1"
-            android:lineSpacingMultiplier="0.85"
-            android:ellipsize="middle"
-            android:inputType="none"
-            />
-
-</RelativeLayout>
diff --git a/subsonic-android/res/layout/search.xml b/subsonic-android/res/layout/search.xml
index f65bcb36..5f5c26e0 100644
--- a/subsonic-android/res/layout/search.xml
+++ b/subsonic-android/res/layout/search.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <include layout="@layout/action_bar"/>
-
     <View
             android:layout_width="fill_parent"
             android:layout_height="1px"
diff --git a/subsonic-android/res/menu/search.xml b/subsonic-android/res/menu/search.xml
new file mode 100644
index 00000000..b9cdecac
--- /dev/null
+++ b/subsonic-android/res/menu/search.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item 
+		android:id="@+id/menu_search"
+		android:icon="@drawable/action_search"
+		android:title="@string/menu.search"
+		android:showAsAction="ifRoom|withText"/>
+
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/ic_menu_help"
+		android:title="@string/menu.help"/>
+
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/ic_menu_settings"
+		android:title="@string/menu.settings"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/ic_menu_exit"
+		android:title="@string/menu.exit"/>
+
+</menu>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SearchActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SearchActivity.java
index 3ea0cabf..4b9d844f 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SearchActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SearchActivity.java
@@ -36,6 +36,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.net.Uri;
+import com.actionbarsherlock.view.Menu;
 import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.Artist;
 import github.daneren2005.dsub.domain.MusicDirectory;
@@ -134,39 +135,38 @@ public class SearchActivity extends SubsonicTabActivity {
             }
         });
         registerForContextMenu(list);
+        onNewIntent(getIntent());
+    }
+	
+	@Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
+        inflater.inflate(R.menu.search, menu);
+        return true;
+    }
 
-		// Button 1: gone
-		findViewById(R.id.action_button_1).setVisibility(View.GONE);
-
-        // Button 2: search
-        final ImageButton actionSearchButton = (ImageButton)findViewById(R.id.action_button_2);
-        actionSearchButton.setImageResource(R.drawable.action_search);
-        actionSearchButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                onSearchRequested();
-            }
-        });
-		
-		// Button 3: Help
-        ImageButton actionHelpButton = (ImageButton)findViewById(R.id.action_button_3);
-        actionHelpButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(SearchActivity.this, HelpActivity.class));
-            }
-        });
-		
-		// Button 4: Settings
-        ImageButton actionSettingsButton = (ImageButton)findViewById(R.id.action_button_4);
-        actionSettingsButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-            	startActivity(new Intent(SearchActivity.this, SettingsActivity.class));
-            }
-        });
+    @Override
+    public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
+		Intent intent;
+        switch (item.getItemId()) {
+			case R.id.menu_search:
+				onSearchRequested();
+				return true;
+            case R.id.menu_exit:
+                intent = new Intent(this, MainActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true);
+                Util.startActivityWithoutTransition(this, intent);
+                return true;
+            case R.id.menu_settings:
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
+            case R.id.menu_help:
+                startActivity(new Intent(this, HelpActivity.class));
+                return true;
+        }
 
-        onNewIntent(getIntent());
+        return false;
     }
 
     @Override
-- 
cgit v1.2.3


From 959c6551d2ca834c88813e775c1209565d95a3e1 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 9 Sep 2012 17:15:19 -0700
Subject: Added a full set of actionbar icons

---
 subsonic-android/res/drawable-hdpi-v4/action_browse.png  | Bin 0 -> 1673 bytes
 subsonic-android/res/drawable-hdpi-v4/action_compass.png | Bin 0 -> 2069 bytes
 subsonic-android/res/drawable-hdpi-v4/action_exit.png    | Bin 0 -> 923 bytes
 subsonic-android/res/drawable-hdpi-v4/action_home.png    | Bin 0 -> 1814 bytes
 .../res/drawable-hdpi-v4/action_moreoverflow.png         | Bin 0 -> 126 bytes
 subsonic-android/res/drawable-hdpi-v4/action_offline.png | Bin 0 -> 1558 bytes
 .../res/drawable-hdpi-v4/action_playlists.png            | Bin 0 -> 1158 bytes
 .../res/drawable-hdpi-v4/action_remove_all.png           | Bin 0 -> 1201 bytes
 subsonic-android/res/drawable-hdpi-v4/action_save.png    | Bin 0 -> 1044 bytes
 .../res/drawable-hdpi-v4/action_screen_on_off.png        | Bin 0 -> 1525 bytes
 .../res/drawable-hdpi-v4/action_select_artist_folder.png | Bin 0 -> 1920 bytes
 subsonic-android/res/drawable-hdpi-v4/action_share.png   | Bin 0 -> 1823 bytes
 subsonic-android/res/drawable/action_help.png            | Bin 1197 -> 0 bytes
 subsonic-android/res/drawable/action_play_all.png        | Bin 1359 -> 0 bytes
 subsonic-android/res/drawable/action_refresh.png         | Bin 1820 -> 0 bytes
 subsonic-android/res/drawable/action_search.png          | Bin 1592 -> 0 bytes
 subsonic-android/res/drawable/action_settings.png        | Bin 1649 -> 0 bytes
 subsonic-android/res/drawable/action_shuffle.png         | Bin 1386 -> 0 bytes
 18 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_browse.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_compass.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_exit.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_home.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_offline.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_playlists.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_remove_all.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_save.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_share.png
 delete mode 100644 subsonic-android/res/drawable/action_help.png
 delete mode 100644 subsonic-android/res/drawable/action_play_all.png
 delete mode 100644 subsonic-android/res/drawable/action_refresh.png
 delete mode 100644 subsonic-android/res/drawable/action_search.png
 delete mode 100644 subsonic-android/res/drawable/action_settings.png
 delete mode 100644 subsonic-android/res/drawable/action_shuffle.png

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/drawable-hdpi-v4/action_browse.png b/subsonic-android/res/drawable-hdpi-v4/action_browse.png
new file mode 100644
index 00000000..54296909
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_browse.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_compass.png b/subsonic-android/res/drawable-hdpi-v4/action_compass.png
new file mode 100644
index 00000000..39760f89
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_compass.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_exit.png b/subsonic-android/res/drawable-hdpi-v4/action_exit.png
new file mode 100644
index 00000000..09e18dee
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_exit.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_home.png b/subsonic-android/res/drawable-hdpi-v4/action_home.png
new file mode 100644
index 00000000..3cec6246
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_home.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png b/subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png
new file mode 100644
index 00000000..cb6ebdaf
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_moreoverflow.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_offline.png b/subsonic-android/res/drawable-hdpi-v4/action_offline.png
new file mode 100644
index 00000000..a85f0931
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_offline.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_playlists.png b/subsonic-android/res/drawable-hdpi-v4/action_playlists.png
new file mode 100644
index 00000000..e9e83e3d
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_playlists.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_remove_all.png b/subsonic-android/res/drawable-hdpi-v4/action_remove_all.png
new file mode 100644
index 00000000..97b88837
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_remove_all.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_save.png b/subsonic-android/res/drawable-hdpi-v4/action_save.png
new file mode 100644
index 00000000..7bda97d6
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_save.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png b/subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png
new file mode 100644
index 00000000..c7168563
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_screen_on_off.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png b/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
new file mode 100644
index 00000000..c2cefead
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_share.png b/subsonic-android/res/drawable-hdpi-v4/action_share.png
new file mode 100644
index 00000000..28376157
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_share.png differ
diff --git a/subsonic-android/res/drawable/action_help.png b/subsonic-android/res/drawable/action_help.png
deleted file mode 100644
index aaf8304c..00000000
Binary files a/subsonic-android/res/drawable/action_help.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/action_play_all.png b/subsonic-android/res/drawable/action_play_all.png
deleted file mode 100644
index 6ce5629a..00000000
Binary files a/subsonic-android/res/drawable/action_play_all.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/action_refresh.png b/subsonic-android/res/drawable/action_refresh.png
deleted file mode 100644
index 9f30dc95..00000000
Binary files a/subsonic-android/res/drawable/action_refresh.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/action_search.png b/subsonic-android/res/drawable/action_search.png
deleted file mode 100644
index 6bc3d426..00000000
Binary files a/subsonic-android/res/drawable/action_search.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/action_settings.png b/subsonic-android/res/drawable/action_settings.png
deleted file mode 100644
index 1ab7722b..00000000
Binary files a/subsonic-android/res/drawable/action_settings.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/action_shuffle.png b/subsonic-android/res/drawable/action_shuffle.png
deleted file mode 100644
index 0613965c..00000000
Binary files a/subsonic-android/res/drawable/action_shuffle.png and /dev/null differ
-- 
cgit v1.2.3


From 5eadac48eb97f7480e2629e46a6159cdcb21e1a2 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 11 Sep 2012 21:36:52 -0700
Subject: Merged Play Now/Shuffle/Select All into action bar, updated
 help/settings/exist icons for all menus

---
 .../res/drawable-hdpi-v4/action_playlists.png      | Bin 1158 -> 0 bytes
 .../res/drawable-hdpi-v4/action_select.png         | Bin 0 -> 1158 bytes
 subsonic-android/res/layout/select_album.xml       |  45 ++-----------------
 subsonic-android/res/menu/main.xml                 |   6 +--
 subsonic-android/res/menu/select_album.xml         |  18 ++++++--
 subsonic-android/res/menu/select_artist.xml        |   2 +-
 subsonic-android/res/menu/select_playlist.xml      |   2 +-
 subsonic-android/res/values/strings.xml            |   1 +
 .../dsub/activity/SelectAlbumActivity.java         |  50 +++++++--------------
 9 files changed, 41 insertions(+), 83 deletions(-)
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/action_playlists.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/action_select.png

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/drawable-hdpi-v4/action_playlists.png b/subsonic-android/res/drawable-hdpi-v4/action_playlists.png
deleted file mode 100644
index e9e83e3d..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/action_playlists.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_select.png b/subsonic-android/res/drawable-hdpi-v4/action_select.png
new file mode 100644
index 00000000..e9e83e3d
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/action_select.png differ
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
index d5a4d0d1..59860e28 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -62,47 +62,8 @@
 				android:layout_width="0dp"
 				android:layout_height="fill_parent"
 				android:visibility="gone"/>
-					  
-	</LinearLayout>
-	
-	<LinearLayout android:orientation="horizontal"
-		android:layout_marginTop="6dp"
-		android:layout_marginBottom="3dp"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content">
-
-        <Button android:id="@+id/select_album_select"
-                android:text="@string/select_album.select"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:visibility="gone"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="3dp"
-                android:layout_weight="1"
-                android:layout_width="0dp"
-                android:layout_height="fill_parent"/>
-
-        <Button android:id="@+id/select_album_play_now"
-                android:text="@string/common.play_now"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:visibility="gone"
-                android:layout_marginLeft="3dp"
-                android:layout_marginRight="3dp"
-                android:layout_weight="1"
-                android:layout_width="0dp"
-                android:layout_height="fill_parent"/>
-				
-		<Button android:id="@+id/select_album_play_shuffled"
-				android:text="@string/common.play_shuffled"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:visibility="gone"
-				android:layout_marginLeft="3dp"
-				android:layout_marginRight="3dp"
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="fill_parent"/>
 				
-
-        <Button android:id="@+id/select_album_play_last"
+		<Button android:id="@+id/select_album_play_last"
                 android:text="@string/common.play_last"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:visibility="gone"
@@ -111,8 +72,8 @@
                 android:layout_weight="1"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"/>
-
-    </LinearLayout>
+					  
+	</LinearLayout>
 
     <include layout="@layout/button_bar"/>
 
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml
index af6a5a7d..a7642942 100644
--- a/subsonic-android/res/menu/main.xml
+++ b/subsonic-android/res/menu/main.xml
@@ -14,17 +14,17 @@
 
 	<item 
 		android:id="@+id/menu_help"
-		android:icon="@drawable/ic_menu_help"
+		android:icon="@drawable/action_help"
 		android:title="@string/menu.help"/>
 
 	<item 
 		android:id="@+id/menu_settings"
-		android:icon="@drawable/ic_menu_settings"
+		android:icon="@drawable/action_settings"
 		android:title="@string/menu.settings"/>
 
 	<item 
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/ic_menu_exit"
+		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 
 </menu>
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
index a5f2a3a9..87fbab3e 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">		
 	<item 
-		android:id="@+id/menu_play_all"
+		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
 		android:showAsAction="ifRoom|withText"/>
-	
+		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
 		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="@drawable/action_shuffle"
+		android:title="@string/menu.shuffle"
+		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_select"
+		android:icon="@drawable/action_select"
+		android:title="@string/menu.select"
+		android:showAsAction="ifRoom|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
@@ -24,7 +36,7 @@
 
 	<item 
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/ic_menu_exit"
+		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 
 </menu>
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
index 42916622..84c0e370 100644
--- a/subsonic-android/res/menu/select_artist.xml
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -24,7 +24,7 @@
 
 	<item 
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/ic_menu_exit"
+		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 
 </menu>
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
index 46d863cd..3e0f33b6 100644
--- a/subsonic-android/res/menu/select_playlist.xml
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -18,7 +18,7 @@
 
 	<item 
 		android:id="@+id/menu_exit"
-		android:icon="@drawable/ic_menu_exit"
+		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
 
 </menu>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index ea926fd9..a3b6f604 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -36,6 +36,7 @@
 	<string name="menu.search">Search</string>
 	<string name="menu.shuffle">Shuffle</string>
 	<string name="menu.refresh">Refresh</string>
+	<string name="menu.select">Select All</string>
 	<string name="menu.play">Play</string>
     <string name="menu.exit">Exit</string>
     <string name="menu.settings">Settings</string>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index c0013d6f..3e0c496a 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -56,9 +56,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
     private ListView entryList;
     private View footer;
     private View emptyView;
-    private Button selectButton;
-    private Button playNowButton;
-	private Button playShuffledButton;
     private Button playLastButton;
     private Button pinButton;
     private Button unpinButton;
@@ -97,9 +94,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
             }
         });
 		
-        selectButton = (Button) findViewById(R.id.select_album_select);
-        playNowButton = (Button) findViewById(R.id.select_album_play_now);
-		playShuffledButton = (Button) findViewById(R.id.select_album_play_shuffled);
         playLastButton = (Button) findViewById(R.id.select_album_play_last);
         pinButton = (Button) findViewById(R.id.select_album_pin);
         unpinButton = (Button) findViewById(R.id.select_album_unpin);
@@ -107,26 +101,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         moreButton = (Button) footer.findViewById(R.id.select_album_more);
         emptyView = findViewById(R.id.select_album_empty);
 
-        selectButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                selectAllOrNone();
-            }
-        });
-        playNowButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                download(false, false, true, false, false);
-                selectAll(false, false);
-            }
-        });
-		playShuffledButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                download(false, false, true, false, true);
-                selectAll(false, false);
-            }
-        });
         playLastButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -188,8 +162,14 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
     public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
 		Intent intent;
         switch (item.getItemId()) {
-			case R.id.menu_play_all:
-				playAll(false);
+			case R.id.menu_play_now:
+				playNow(false);
+				return true;
+			case R.id.menu_shuffle:
+				playNow(true);
+				return true;
+			case R.id.menu_select:
+				selectAllOrNone();
 				return true;
 			case R.id.menu_refresh:
 				refresh();
@@ -211,6 +191,15 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         return false;
     }
 
+	private void playNow(final boolean shuffle) {
+		if(getSelectedSongs().size() > 0) {
+			download(false, false, true, false, shuffle);
+			selectAll(false, false);
+		}
+		else {
+			playAll(shuffle);
+		}
+	}
     private void playAll(final boolean shuffle) {
         boolean hasSubFolders = false;
         for (int i = 0; i < entryList.getCount(); i++) {
@@ -411,8 +400,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
             }
         }
 
-        playNowButton.setEnabled(enabled);
-		playShuffledButton.setEnabled(enabled);
         playLastButton.setEnabled(enabled);
         pinButton.setEnabled(enabled && !Util.isOffline(this));
         unpinButton.setEnabled(unpinEnabled);
@@ -567,9 +554,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
             if (songCount > 0) {
                 getImageLoader().loadImage(getSupportActionBar(), entries.get(0));
                 entryList.addFooterView(footer);
-                selectButton.setVisibility(View.VISIBLE);
-                playNowButton.setVisibility(View.VISIBLE);
-				playShuffledButton.setVisibility(View.VISIBLE);
                 playLastButton.setVisibility(View.VISIBLE);
 				pinButton.setVisibility(View.VISIBLE);
 				unpinButton.setVisibility(View.VISIBLE);
-- 
cgit v1.2.3


From 00bfa0e939560b11633d714251ee3813d9b952e3 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 11 Sep 2012 22:30:08 -0700
Subject: Changed secondary color to cyan for some differentiation

---
 subsonic-android/res/values/styles.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml
index bd76299a..8a319e4a 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.DSub.Wheat" parent="Theme.Sherlock.Light">
-		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
-		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle</item>
-	</style>
 	<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="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="android:textColorSecondary">@color/cyan</item>
 	</style>
 	
 	<style name="Widget.DSub.ActionBarStyle" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
-- 
cgit v1.2.3


From d30475bfc714a8d17e48a8c19bfcc52e636f2409 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 11 Sep 2012 22:37:09 -0700
Subject: Added Fullscreen themes for both light and dark

---
 subsonic-android/res/values/arrays.xml                             | 4 ++++
 subsonic-android/res/values/strings.xml                            | 2 ++
 subsonic-android/res/values/styles.xml                             | 7 +++++++
 .../src/github/daneren2005/dsub/activity/SubsonicTabActivity.java  | 6 +++++-
 4 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index aac7e74c..e9b66161 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -4,11 +4,15 @@
     <string-array name="themeValues">
         <item>light</item>
         <item>dark</item>
+		<item>light_fullscreen</item>
+		<item>dark_fullscreen</item>
     </string-array>
 
     <string-array name="themeNames">
         <item>@string/settings.theme_light</item>
         <item>@string/settings.theme_dark</item>
+		<item>@string/settings.theme_light_fullscreen</item>
+        <item>@string/settings.theme_dark_fullscreen</item>
     </string-array>
 
     <string-array name="preloadCountValues">
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index a3b6f604..a2a9df56 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -148,6 +148,8 @@
     <string name="settings.theme_wheat">Wheat</string>
     <string name="settings.theme_light">Light</string>
     <string name="settings.theme_dark">Dark</string>
+	<string name="settings.theme_light_fullscreen">Light Fullscreen</string>
+    <string name="settings.theme_dark_fullscreen">Dark Fullscreen</string>
     <string name="settings.network_title">Network</string>
     <string name="settings.max_bitrate_wifi">Max bitrate - Wi-Fi</string>
     <string name="settings.max_bitrate_mobile">Max bitrate - Mobile</string>
diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml
index 8a319e4a..6db3df58 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -11,6 +11,13 @@
 		<item name="android:textColorSecondary">@color/cyan</item>
 	</style>
 	
+	<style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light">
+		<item name="android:windowFullscreen">true</item>
+	</style>
+	<style name="Theme.DSub.Dark.Fullscreen" parent="Theme.DSub.Dark">
+		<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>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index 8d388347..9b1ab55e 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -181,7 +181,11 @@ public class SubsonicTabActivity extends SherlockActivity {
             setTheme(R.style.Theme_DSub_Dark);
         } else if ("light".equals(theme)) {
             setTheme(R.style.Theme_DSub_Light);
-        } else {
+        } else if ("dark_fullscreen".equals(theme)) {
+            setTheme(R.style.Theme_DSub_Dark_Fullscreen);
+        } else if ("light_fullscreen".equals(theme)) {
+            setTheme(R.style.Theme_DSub_Light_Fullscreen);
+        }else {
 			setTheme(R.style.Theme_DSub_Light);
 		}
     }
-- 
cgit v1.2.3


From 2b93e03190fa73f6c66c3f7121ab8c942b6133e5 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 13 Sep 2012 20:06:43 -0700
Subject: Removed border around Albums on main tab (ugly as hell in dark mode)

---
 subsonic-android/res/layout/main_buttons.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 969ad99e..0c471585 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -48,11 +48,12 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="#EFEFEF"
-            android:textStyle="bold"
-            android:background="#A5A5A5"
+            android:textColor="@color/cyan"
             android:gravity="center_vertical"
-            android:paddingLeft="4dp"/>
+            android:paddingLeft="6dp"
+			android:textAllCaps="true"
+			android:textStyle="bold"
+			android:textSize="16sp"/>
 
     <TextView
             android:id="@+id/main_albums_newest"
-- 
cgit v1.2.3


From 75a688847ca797905106d95bf6f41660c6ed650b Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 13 Sep 2012 21:03:46 -0700
Subject: Some more actionbar menu item changes

---
 subsonic-android/res/menu/main.xml                 |  4 +--
 subsonic-android/res/menu/select_album.xml         |  4 +--
 subsonic-android/res/menu/select_artist.xml        |  4 +--
 subsonic-android/res/menu/select_playlist.xml      |  2 +-
 .../dsub/activity/SelectAlbumActivity.java         | 36 ++++++++++++----------
 5 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml
index a7642942..8edf5304 100644
--- a/subsonic-android/res/menu/main.xml
+++ b/subsonic-android/res/menu/main.xml
@@ -4,13 +4,13 @@
 		android:id="@+id/menu_search"
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 	
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
index 87fbab3e..b725469a 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -4,13 +4,13 @@
 		android:id="@+id/menu_play_now"
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
index 84c0e370..06be773a 100644
--- a/subsonic-android/res/menu/select_artist.xml
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -4,13 +4,13 @@
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 		
 	<item 
 		android:id="@+id/menu_shuffle"
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
index 3e0f33b6..a2c05a2f 100644
--- a/subsonic-android/res/menu/select_playlist.xml
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -4,7 +4,7 @@
 		android:id="@+id/menu_refresh"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
-		android:showAsAction="ifRoom|withText"/>
+		android:showAsAction="always|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index 3e0c496a..abbfe67b 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -56,6 +56,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
     private ListView entryList;
     private View footer;
     private View emptyView;
+	private com.actionbarsherlock.view.MenuItem selectAll;
     private Button playLastButton;
     private Button pinButton;
     private Button unpinButton;
@@ -155,6 +156,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
         inflater.inflate(R.menu.select_album, menu);
+		selectAll = menu.findItem(R.id.menu_select);
         return true;
     }
 
@@ -503,23 +505,23 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         builder.setMessage(R.string.select_album_donate_dialog_message);
 
         builder.setPositiveButton(R.string.select_album_donate_dialog_now,
-                                  new DialogInterface.OnClickListener() {
-                                      @Override
-                                      public void onClick(DialogInterface dialogInterface, int i) {
-                                          startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.DONATION_URL)));
-                                      }
-                                  });
+			new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialogInterface, int i) {
+					startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.DONATION_URL)));
+				}
+			});
 
         builder.setNegativeButton(R.string.select_album_donate_dialog_later,
-                                  new DialogInterface.OnClickListener() {
-                                      @Override
-                                      public void onClick(DialogInterface dialogInterface, int i) {
-                                          dialogInterface.dismiss();
-                                          if (onValid != null) {
-                                              onValid.run();
-                                          }
-                                      }
-                                  });
+			new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialogInterface, int i) {
+					dialogInterface.dismiss();
+					if (onValid != null) {
+						onValid.run();
+					}
+				}
+			});
 
         builder.create().show();
     }
@@ -558,7 +560,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 				pinButton.setVisibility(View.VISIBLE);
 				unpinButton.setVisibility(View.VISIBLE);
 				deleteButton.setVisibility(View.VISIBLE);
-            }
+            } else {
+				selectAll.setVisible(false);
+			}
 
             emptyView.setVisibility(entries.isEmpty() ? View.VISIBLE : View.GONE);
             entryList.setAdapter(new EntryAdapter(SelectAlbumActivity.this, getImageLoader(), entries, true));
-- 
cgit v1.2.3


From d0e7ff24e162532daf90176f21059c06ae0f9e84 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 13 Sep 2012 21:20:45 -0700
Subject: Finished removing AlbumActivities bottom buttons and integrate them
 into the Action Bar

---
 subsonic-android/res/layout/select_album.xml       | 48 -----------
 subsonic-android/res/menu/select_album.xml         | 18 +++++
 subsonic-android/res/values/strings.xml            |  4 +-
 .../dsub/activity/SelectAlbumActivity.java         | 94 +++++-----------------
 4 files changed, 41 insertions(+), 123 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
index 59860e28..a5802246 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -26,54 +26,6 @@
               android:layout_weight="1.0"
               android:fastScrollEnabled="true"
             />
-			
-	<LinearLayout android:orientation="horizontal"
-		android:layout_marginTop="6dp"
-		android:layout_marginBottom="3dp"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content">				
-				
-		<Button android:id="@+id/select_album_pin"
-				android:text="@string/common.pin"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginLeft="6dp"
-				android:layout_marginRight="3dp"
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="fill_parent"
-				android:visibility="gone"/>
-
-		<Button android:id="@+id/select_album_unpin"
-				android:text="@string/common.unpin"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginLeft="3dp"
-				android:layout_marginRight="3dp"
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="fill_parent"
-				android:visibility="gone"/>
-
-		<Button android:id="@+id/select_album_delete"
-				android:text="@string/common.delete"
-				android:textAppearance="?android:attr/textAppearanceSmall"
-				android:layout_marginLeft="3dp"
-				android:layout_marginRight="6dp"
-				android:layout_weight="1"
-				android:layout_width="0dp"
-				android:layout_height="fill_parent"
-				android:visibility="gone"/>
-				
-		<Button android:id="@+id/select_album_play_last"
-                android:text="@string/common.play_last"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:visibility="gone"
-                android:layout_marginLeft="3dp"
-                android:layout_marginRight="6dp"
-                android:layout_weight="1"
-                android:layout_width="0dp"
-                android:layout_height="fill_parent"/>
-					  
-	</LinearLayout>
 
     <include layout="@layout/button_bar"/>
 
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
index b725469a..fe6e8eba 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -23,6 +23,24 @@
 		android:icon="@drawable/action_select"
 		android:title="@string/menu.select"
 		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_cache"
+		android:icon="@drawable/action_save"
+		android:title="@string/common.pin"
+		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_delete"
+		android:icon="@drawable/action_remove_all"
+		android:title="@string/common.delete"
+		android:showAsAction="ifRoom|withText"/>
+		
+	<item 
+		android:id="@+id/menu_play_last"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play_last"
+		android:showAsAction="ifRoom|withText"/>
 
 	<item 
 		android:id="@+id/menu_help"
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index a2a9df56..b183c95c 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -9,8 +9,7 @@
 	<string name="common.play_shuffled">Play shuffled</string>
     <string name="common.play_next">Play next</string>
     <string name="common.play_last">Play last</string>
-    <string name="common.pin">Pin</string>
-    <string name="common.unpin">Unpin</string>
+    <string name="common.pin">Cache</string>
     <string name="common.delete">Delete</string>
 
     <string name="button_bar.home">DSub home</string>
@@ -38,6 +37,7 @@
 	<string name="menu.refresh">Refresh</string>
 	<string name="menu.select">Select All</string>
 	<string name="menu.play">Play</string>
+	<string name="menu.play_last">Play Last</string>
     <string name="menu.exit">Exit</string>
     <string name="menu.settings">Settings</string>
     <string name="menu.help">Help</string>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index abbfe67b..9d1936ab 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -57,10 +57,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
     private View footer;
     private View emptyView;
 	private com.actionbarsherlock.view.MenuItem selectAll;
-    private Button playLastButton;
-    private Button pinButton;
-    private Button unpinButton;
-    private Button deleteButton;
+	private com.actionbarsherlock.view.MenuItem cache;
+	private com.actionbarsherlock.view.MenuItem delete;
+	private com.actionbarsherlock.view.MenuItem playLast;
     private Button moreButton;
     private boolean licenseValid;
 
@@ -88,53 +87,16 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                         Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
                     } else if (entry.isVideo()) {
                         playVideo(entry);
-                    } else {
-                        enableButtons();
                     }
                 }
             }
         });
 		
-        playLastButton = (Button) findViewById(R.id.select_album_play_last);
-        pinButton = (Button) findViewById(R.id.select_album_pin);
-        unpinButton = (Button) findViewById(R.id.select_album_unpin);
-        deleteButton = (Button) findViewById(R.id.select_album_delete);
         moreButton = (Button) footer.findViewById(R.id.select_album_more);
         emptyView = findViewById(R.id.select_album_empty);
 
-        playLastButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                download(true, false, false, false, false);
-                selectAll(false, false);
-            }
-        });
-        pinButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                download(true, true, false, false, false);
-                selectAll(false, false);
-            }
-        });
-        unpinButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                unpin();
-                selectAll(false, false);
-            }
-        });
-        deleteButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                delete();
-                selectAll(false, false);
-            }
-        });
-
         registerForContextMenu(entryList);
 
-        enableButtons();
-
         String id = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ID);
         String name = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_NAME);
         String playlistId = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_PLAYLIST_ID);
@@ -157,6 +119,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
         inflater.inflate(R.menu.select_album, menu);
 		selectAll = menu.findItem(R.id.menu_select);
+		cache = menu.findItem(R.id.menu_cache);
+		delete = menu.findItem(R.id.menu_delete);
+		playLast = menu.findItem(R.id.menu_play_last);
         return true;
     }
 
@@ -167,6 +132,10 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 			case R.id.menu_play_now:
 				playNow(false);
 				return true;
+			case R.id.menu_play_last:
+				download(true, false, false, false, false);
+                selectAll(false, false);
+				return true;
 			case R.id.menu_shuffle:
 				playNow(true);
 				return true;
@@ -176,6 +145,14 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 			case R.id.menu_refresh:
 				refresh();
 				return true;
+			case R.id.menu_cache:
+				download(true, true, false, false, false);
+                selectAll(false, false);
+				return true;
+			case R.id.menu_delete:
+				delete();
+                selectAll(false, false);
+				return true;
             case R.id.menu_exit:
                 intent = new Intent(this, MainActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -378,34 +355,6 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                                       : R.string.select_album_n_unselected;
             Util.toast(this, getString(toastResId, selectedCount));
         }
-
-        enableButtons();
-    }
-
-    private void enableButtons() {
-        if (getDownloadService() == null) {
-            return;
-        }
-
-        List<MusicDirectory.Entry> selection = getSelectedSongs();
-        boolean enabled = !selection.isEmpty();
-        boolean unpinEnabled = false;
-        boolean deleteEnabled = false;
-
-        for (MusicDirectory.Entry song : selection) {
-            DownloadFile downloadFile = getDownloadService().forSong(song);
-            if (downloadFile.isCompleteFileAvailable()) {
-                deleteEnabled = true;
-            }
-            if (downloadFile.isSaved()) {
-                unpinEnabled = true;
-            }
-        }
-
-        playLastButton.setEnabled(enabled);
-        pinButton.setEnabled(enabled && !Util.isOffline(this));
-        unpinButton.setEnabled(unpinEnabled);
-        deleteButton.setEnabled(deleteEnabled);
     }
 
     private List<MusicDirectory.Entry> getSelectedSongs() {
@@ -556,12 +505,11 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
             if (songCount > 0) {
                 getImageLoader().loadImage(getSupportActionBar(), entries.get(0));
                 entryList.addFooterView(footer);
-                playLastButton.setVisibility(View.VISIBLE);
-				pinButton.setVisibility(View.VISIBLE);
-				unpinButton.setVisibility(View.VISIBLE);
-				deleteButton.setVisibility(View.VISIBLE);
             } else {
 				selectAll.setVisible(false);
+				cache.setVisible(false);
+				delete.setVisible(false);
+				playLast.setVisible(false);
 			}
 
             emptyView.setVisibility(entries.isEmpty() ? View.VISIBLE : View.GONE);
-- 
cgit v1.2.3


From d494f0d99fe539238f53120e59fa8193bb31218a Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 14 Sep 2012 21:29:24 -0700
Subject: Removed Help/Settings/Exit from all the menus except the main tab

---
 subsonic-android/res/menu/select_album.xml    | 16 ----------------
 subsonic-android/res/menu/select_artist.xml   | 16 ----------------
 subsonic-android/res/menu/select_playlist.xml | 16 ----------------
 3 files changed, 48 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
index fe6e8eba..0d7fed68 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -41,20 +41,4 @@
 		android:icon="@drawable/action_play_all"
 		android:title="@string/menu.play_last"
 		android:showAsAction="ifRoom|withText"/>
-
-	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/action_help"
-		android:title="@string/menu.help"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-
 </menu>
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
index 06be773a..df3aa9fb 100644
--- a/subsonic-android/res/menu/select_artist.xml
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -11,20 +11,4 @@
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
 		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/action_help"
-		android:title="@string/menu.help"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-
 </menu>
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
index a2c05a2f..8576faaa 100644
--- a/subsonic-android/res/menu/select_playlist.xml
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -5,20 +5,4 @@
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
 		android:showAsAction="always|withText"/>
-
-	<item 
-		android:id="@+id/menu_help"
-		android:icon="@drawable/action_help"
-		android:title="@string/menu.help"/>
-
-	<item 
-		android:id="@+id/menu_settings"
-		android:icon="@drawable/action_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
-		android:id="@+id/menu_exit"
-		android:icon="@drawable/action_exit"
-		android:title="@string/menu.exit"/>
-
 </menu>
-- 
cgit v1.2.3


From a68545e6192ebf856917a2bd8ac82518fa4be3a4 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 14 Sep 2012 21:57:47 -0700
Subject: Updated a bunch of icons to match other forks

---
 .../action_select_artist_folder.png                | Bin 1920 -> 0 bytes
 .../drawable-hdpi-v4/btn_check_buttonless_off.png  | Bin 0 -> 762 bytes
 .../drawable-hdpi-v4/btn_check_buttonless_on.png   | Bin 0 -> 2996 bytes
 .../res/drawable-hdpi-v4/ic_menu_settings.png      | Bin 3812 -> 0 bytes
 .../res/drawable-hdpi-v4/list_item_artist.9.png    | Bin 2505 -> 0 bytes
 .../res/drawable-hdpi-v4/list_item_more.9.png      | Bin 0 -> 5838 bytes
 .../res/drawable-hdpi-v4/list_item_playlist.9.png  | Bin 2505 -> 0 bytes
 .../res/drawable-hdpi-v4/main_exit.png             | Bin 4532 -> 0 bytes
 .../res/drawable-hdpi-v4/main_help.png             | Bin 4123 -> 0 bytes
 .../res/drawable-hdpi-v4/main_select_server.png    | Bin 4458 -> 1920 bytes
 .../res/drawable-hdpi-v4/main_settings.png         | Bin 3401 -> 0 bytes
 .../res/drawable-hdpi-v4/main_shuffle.png          | Bin 4445 -> 0 bytes
 .../res/drawable-hdpi-v4/menu_search.png           | Bin 3808 -> 0 bytes
 .../res/drawable-hdpi-v4/select_artist_folder.png  | Bin 4458 -> 0 bytes
 subsonic-android/res/drawable/btn_check.xml        |  28 +++++++++++++++++++++
 subsonic-android/res/layout/album_list_item.xml    |   2 +-
 subsonic-android/res/layout/artist_list_item.xml   |   2 +-
 subsonic-android/res/layout/main_buttons.xml       |  10 ++++----
 subsonic-android/res/layout/playlist_list_item.xml |   2 +-
 .../res/layout/select_artist_header.xml            |   2 +-
 subsonic-android/res/layout/song_list_item.xml     |   2 +-
 21 files changed, 38 insertions(+), 10 deletions(-)
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_exit.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_help.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_settings.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_shuffle.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/menu_search.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png
 create mode 100644 subsonic-android/res/drawable/btn_check.xml

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png b/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
deleted file mode 100644
index c2cefead..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png
new file mode 100644
index 00000000..d705b420
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png
new file mode 100644
index 00000000..a2612d7d
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png
deleted file mode 100644
index 2ffcec52..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png
deleted file mode 100644
index 7bddbcef..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png
new file mode 100644
index 00000000..79ca860d
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png
deleted file mode 100644
index 7bddbcef..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_exit.png b/subsonic-android/res/drawable-hdpi-v4/main_exit.png
deleted file mode 100644
index 9a8b2a5e..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_exit.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_help.png b/subsonic-android/res/drawable-hdpi-v4/main_help.png
deleted file mode 100644
index cb063b00..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_help.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png
index ccecc1d9..c2cefead 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png and b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_settings.png b/subsonic-android/res/drawable-hdpi-v4/main_settings.png
deleted file mode 100644
index 81bca4ae..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_settings.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png b/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png
deleted file mode 100644
index 22ee1d50..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_search.png b/subsonic-android/res/drawable-hdpi-v4/menu_search.png
deleted file mode 100644
index f78234e4..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/menu_search.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png b/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png
deleted file mode 100644
index ccecc1d9..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/btn_check.xml b/subsonic-android/res/drawable/btn_check.xml
new file mode 100644
index 00000000..f363a2d2
--- /dev/null
+++ b/subsonic-android/res/drawable/btn_check.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true"
+        android:drawable="@drawable/btn_check_buttonless_on" />
+
+    <item android:state_checked="false"
+        android:drawable="@drawable/btn_check_buttonless_off" />
+        
+    <item
+        android:drawable="@drawable/btn_check_buttonless_off" />
+
+</selector>
diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
index 15d999c3..2e74390f 100644
--- a/subsonic-android/res/layout/album_list_item.xml
+++ b/subsonic-android/res/layout/album_list_item.xml
@@ -38,7 +38,7 @@
     </LinearLayout>
 
     <ImageView
-            android:src="@drawable/list_item_artist"
+            android:src="@drawable/list_item_more"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right|center_vertical"
diff --git a/subsonic-android/res/layout/artist_list_item.xml b/subsonic-android/res/layout/artist_list_item.xml
index 8aaa42d0..3c99ccbd 100644
--- a/subsonic-android/res/layout/artist_list_item.xml
+++ b/subsonic-android/res/layout/artist_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@android:id/text1"
-          android:drawableRight="@drawable/list_item_artist"
+          android:drawableRight="@drawable/list_item_more"
           android:drawablePadding="6dip"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 0c471585..655854be 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -58,7 +58,7 @@
     <TextView
             android:id="@+id/main_albums_newest"
             android:text="@string/main.albums_newest"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
     <TextView
             android:id="@+id/main_albums_recent"
             android:text="@string/main.albums_recent"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
     <TextView
             android:id="@+id/main_albums_frequent"
             android:text="@string/main.albums_frequent"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
     <TextView
             android:id="@+id/main_albums_highest"
             android:text="@string/main.albums_highest"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
     <TextView
             android:id="@+id/main_albums_random"
             android:text="@string/main.albums_random"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/playlist_list_item.xml b/subsonic-android/res/layout/playlist_list_item.xml
index 20706dc9..3c99ccbd 100644
--- a/subsonic-android/res/layout/playlist_list_item.xml
+++ b/subsonic-android/res/layout/playlist_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@android:id/text1"
-          android:drawableRight="@drawable/list_item_playlist"
+          android:drawableRight="@drawable/list_item_more"
           android:drawablePadding="6dip"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/select_artist_header.xml b/subsonic-android/res/layout/select_artist_header.xml
index 247eb806..50e10742 100644
--- a/subsonic-android/res/layout/select_artist_header.xml
+++ b/subsonic-android/res/layout/select_artist_header.xml
@@ -10,7 +10,7 @@
         android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
-            android:src="@drawable/select_artist_folder"
+            android:src="@drawable/main_select_server"
             android:layout_gravity="center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
index 2163ef72..f8d518ad 100644
--- a/subsonic-android/res/layout/song_list_item.xml
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -9,7 +9,7 @@
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
-            android:checkMark="?android:attr/textCheckMark"
+            android:checkMark="@drawable/btn_check"
             android:paddingLeft="3dip"/>
 
     <LinearLayout android:orientation="vertical"
-- 
cgit v1.2.3


From a52052785e9c54b96b56ee73dab798c727edcf12 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 14 Sep 2012 22:09:39 -0700
Subject: DownloadActivity show ActionBar on playlist view

---
 .../res/drawable-hdpi-v4/ic_menu_exit.png          | Bin 3820 -> 0 bytes
 .../res/drawable-hdpi-v4/ic_menu_help.png          | Bin 3468 -> 0 bytes
 .../res/drawable-hdpi-v4/ic_menu_remove_all.png    | Bin 2546 -> 0 bytes
 .../res/drawable-hdpi-v4/ic_menu_save.png          | Bin 1899 -> 0 bytes
 .../res/drawable-hdpi-v4/ic_menu_screen_on_off.png | Bin 1497 -> 0 bytes
 subsonic-android/res/menu/nowplaying.xml           |  24 ++++++------
 subsonic-android/res/menu/nowplaying_context.xml   |  42 ++++++---------------
 .../dsub/activity/DownloadActivity.java            |   4 +-
 8 files changed, 25 insertions(+), 45 deletions(-)
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png
deleted file mode 100644
index 28cad85e..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png
deleted file mode 100644
index 7e14e95d..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png
deleted file mode 100644
index 112196be..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png
deleted file mode 100644
index 34f6e01a..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png
deleted file mode 100644
index db9235fc..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png and /dev/null differ
diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml
index 28bcb5ef..a880438e 100644
--- a/subsonic-android/res/menu/nowplaying.xml
+++ b/subsonic-android/res/menu/nowplaying.xml
@@ -3,25 +3,25 @@
 
     <item
         android:id="@+id/menu_shuffle"
-        android:icon="@drawable/ic_menu_shuffle"
+        android:icon="@drawable/action_shuffle"
         android:title="@string/download.menu_shuffle"
-        />
+        android:showAsAction="always|withText"/>
+		
+	<item
+        android:id="@+id/menu_remove_all"
+        android:icon="@drawable/action_remove_all"
+        android:title="@string/download.menu_remove_all"
+        android:showAsAction="always|withText"/>
 
     <item
         android:id="@+id/menu_save_playlist"
-        android:icon="@drawable/ic_menu_save"
+        android:icon="@drawable/action_save"
         android:title="@string/download.menu_save"
-        />
-
-    <item
-        android:id="@+id/menu_remove_all"
-        android:icon="@drawable/ic_menu_remove_all"
-        android:title="@string/download.menu_remove_all"
-        />
+        android:showAsAction="ifRoom|withText"/>
 
     <item
         android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/ic_menu_screen_on_off"
+        android:icon="@drawable/action_screen_on_off"
         android:title="@string/download.menu_screen_on"
-        />
+        android:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/subsonic-android/res/menu/nowplaying_context.xml b/subsonic-android/res/menu/nowplaying_context.xml
index 04e56e1a..eeb49a26 100644
--- a/subsonic-android/res/menu/nowplaying_context.xml
+++ b/subsonic-android/res/menu/nowplaying_context.xml
@@ -1,39 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item 
-        android:id="@+id/menu_show_album"
-        android:title="@string/download.menu_show_album"
-        />
-
-    <item 
-        android:id="@+id/menu_lyrics"
-        android:title="@string/download.menu_lyrics"
-        />
-
-    <item 
-        android:id="@+id/menu_remove"
-        android:title="@string/download.menu_remove"
-        />
-		
 	<item 
-        android:id="@+id/menu_delete"
-        android:title="@string/download.menu_delete"
-        />
+		android:id="@+id/menu_show_album"
+		android:title="@string/download.menu_show_album"/>
 
-    <item 
-        android:id="@+id/menu_remove_all"
-        android:title="@string/download.menu_remove_all"
-        />
+	<item 
+		android:id="@+id/menu_lyrics"
+		android:title="@string/download.menu_lyrics"/>
 
-    <item 
-        android:id="@+id/menu_shuffle"
-        android:title="@string/download.menu_shuffle"
-        />
+	<item 
+		android:id="@+id/menu_remove"
+		android:title="@string/download.menu_remove"/>
 
-    <item 
-        android:id="@+id/menu_save_playlist"
-        android:title="@string/download.menu_save"
-        />
-        
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/download.menu_delete"/>        
 </menu>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index 2f20c20e..9b65b351 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -645,8 +645,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
             buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_in));
             buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_out));
             buttonBarFlipper.setDisplayedChild(0);
-
-
+			getSupportActionBar().hide();
         } else {
             playlistFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
             playlistFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
@@ -654,6 +653,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
             buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
             buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
             buttonBarFlipper.setDisplayedChild(1);
+			getSupportActionBar().show();
         }
     }
 
-- 
cgit v1.2.3


From 8585a5a82f921442f2f0eb0f3385b70ac38f30ed Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 19 Sep 2012 18:23:47 -0700
Subject: Added help/settings/exit to artist + playlist tabs but kept it off
 album's

---
 subsonic-android/res/menu/select_artist.xml   | 15 +++++++++++++++
 subsonic-android/res/menu/select_playlist.xml | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
index df3aa9fb..71672710 100644
--- a/subsonic-android/res/menu/select_artist.xml
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -11,4 +11,19 @@
 		android:icon="@drawable/action_shuffle"
 		android:title="@string/menu.shuffle"
 		android:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
index 8576faaa..fb5e678b 100644
--- a/subsonic-android/res/menu/select_playlist.xml
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -5,4 +5,19 @@
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
 		android:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_help"
+		android:icon="@drawable/action_help"
+		android:title="@string/menu.help"/>
+
+	<item 
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
-- 
cgit v1.2.3


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/res')

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