From 9d2b9d39a1b43dc26d5598dab801198adbe42009 Mon Sep 17 00:00:00 2001
From: Kurt Hardin <kurthardin.dev@gmail.com>
Date: Wed, 29 Aug 2012 13:25:20 -0700
Subject: Added support for starring albums and songs.

Requires server version 4.7 (currently in beta) for star support.  Currently the Subsonic APIs don't provide adequate star support when listing artists.
---
 subsonic-android/res/layout-land/download.xml   | 16 ++++++++++++----
 subsonic-android/res/layout-port/download.xml   |  9 +++++++++
 subsonic-android/res/layout/album_list_item.xml |  9 +++++++++
 subsonic-android/res/layout/song_list_item.xml  | 10 ++++++++++
 subsonic-android/res/values/strings.xml         |  2 ++
 5 files changed, 42 insertions(+), 4 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 01a9b68d..b0303e52 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -14,15 +14,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_alignParentRight="true"
-                android:background="@color/mediaControlBackground"
-                >
+                android:background="@color/mediaControlBackground">
 
             <LinearLayout
+                    android:id="@+id/download_play_controls_layout"
                     android:orientation="horizontal"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true">
+                    android:layout_centerHorizontal="true">
 
                 <ImageButton
                         android:id="@+id/download_previous"
@@ -87,7 +87,6 @@
                     android:id="@+id/download_song_title"
                     android:layout_width="150dip"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
                     android:layout_above="@+id/download_status"
                     android:layout_centerHorizontal="true"
                     android:layout_marginLeft="12dip"
@@ -99,6 +98,7 @@
                     android:textColor="@color/mediaControlForeground"/>
 
             <LinearLayout
+                    android:id="@+id/download_other_controls_layout"
                     android:orientation="horizontal"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -111,6 +111,7 @@
                         android:background="@android:color/transparent"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_below="@+id/download_play_controls_layout"
                         android:padding="9dip"/>
                 <ImageButton
                         android:id="@+id/download_repeat"
@@ -119,6 +120,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="9dip"/>
+                <ImageButton
+                        android:id="@+id/download_star"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:background="@null"
+                        android:src="@android:drawable/star_big_off"/>
                 <ImageButton
                         android:id="@+id/download_toggle_list"
                         android:src="@drawable/media_toggle_list"
diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index e2a198a2..e6a2358a 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -72,6 +72,15 @@
                     android:paddingTop="12dip"
                     android:paddingRight="12dip"
                     android:paddingBottom="12dip"/>
+            
+            <ImageButton
+                    android:id="@+id/download_star"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignRight="@+id/download_repeat"
+                    android:layout_below="@+id/download_jukebox"
+                    android:background="@null"
+                    android:src="@android:drawable/star_big_off"/>
 
             <ImageView
                     android:id="@+id/download_album_art_image"
diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
index 15d999c3..aa2ac803 100644
--- a/subsonic-android/res/layout/album_list_item.xml
+++ b/subsonic-android/res/layout/album_list_item.xml
@@ -36,6 +36,15 @@
                 android:singleLine="true"/>
 
     </LinearLayout>
+    
+    <ImageButton
+            android:id="@+id/album_star"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|center_vertical"
+            android:background="@null"
+            android:focusable="false"
+            android:src="@android:drawable/star_big_off" />
 
     <ImageView
             android:src="@drawable/list_item_artist"
diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
index 2163ef72..87f56a22 100644
--- a/subsonic-android/res/layout/song_list_item.xml
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -73,4 +73,14 @@
 
         </LinearLayout>
     </LinearLayout>
+    
+    <ImageButton
+            android:id="@+id/song_star"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|center_vertical"
+            android:background="@null"
+            android:focusable="false"
+            android:src="@android:drawable/btn_star_big_off" />
+    
 </LinearLayout>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 7f9f6728..eef510e4 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -110,6 +110,8 @@
     <string name="download.jukebox_server_too_old">Remote control is not supported. Please upgrade your Subsonic server.</string>
     <string name="download.jukebox_offline">Remote control is not available in offline mode.</string>
     <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users &gt; Settings</b> on your Subsonic server.</string>
+    
+    <string name="starring_content_error">Failed to update \"%s\", please try later.</string>
 
     <string name="song_details.all">%1$s %2$s</string>
     <string name="song_details.kbps">%d kbps</string>
-- 
cgit v1.2.3


From 72c741b2f3dd35c68c8a81f7d786de673e94f434 Mon Sep 17 00:00:00 2001
From: Kurt Hardin <kurthardin.dev@gmail.com>
Date: Tue, 25 Sep 2012 09:39:52 -0700
Subject: Added 'Starred' section to MainActivity.

---
 subsonic-android/res/layout/main_buttons.xml                 | 12 ++++++++++++
 subsonic-android/res/values/strings.xml                      |  1 +
 .../src/github/daneren2005/dsub/activity/MainActivity.java   |  5 ++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

(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..a532c233 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -102,6 +102,18 @@
             android:paddingLeft="6dip"
             android:paddingRight="6dip"
             android:minHeight="50dip"/>
+    <TextView
+            android:id="@+id/main_albums_starred"
+            android:text="@string/main.albums_starred"
+            android:drawableRight="@drawable/list_item_artist"
+            android:drawablePadding="6dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:gravity="center_vertical"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:minHeight="50dip"/>
     <TextView
             android:id="@+id/main_albums_random"
             android:text="@string/main.albums_random"
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index eef510e4..08407a96 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="main.albums_recent">Recently played</string>
     <string name="main.albums_frequent">Most played</string>
     <string name="main.albums_highest">Top rated</string>
+    <string name="main.albums_starred">Starred</string>
     <string name="main.albums_random">Random</string>
 
     <string name="menu.exit">Exit</string>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
index e5958e57..ff5c29c1 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
@@ -79,6 +79,7 @@ public class MainActivity extends SubsonicTabActivity {
         final View albumsHighestButton = buttons.findViewById(R.id.main_albums_highest);
         final View albumsRecentButton = buttons.findViewById(R.id.main_albums_recent);
         final View albumsFrequentButton = buttons.findViewById(R.id.main_albums_frequent);
+        final View albumsStarredButton = buttons.findViewById(R.id.main_albums_starred);
 
         final View dummyView = findViewById(R.id.main_dummy);
 
@@ -92,7 +93,7 @@ public class MainActivity extends SubsonicTabActivity {
         adapter.addViews(Arrays.asList(serverButton), true);
         if (!Util.isOffline(this)) {
             adapter.addView(albumsTitle, false);
-            adapter.addViews(Arrays.asList(albumsNewestButton, albumsRandomButton, albumsHighestButton, albumsRecentButton, albumsFrequentButton), true);
+            adapter.addViews(Arrays.asList(albumsNewestButton, albumsRandomButton, albumsHighestButton, albumsStarredButton, albumsRecentButton, albumsFrequentButton), true);
         }
         list.setAdapter(adapter);
         registerForContextMenu(dummyView);
@@ -108,6 +109,8 @@ public class MainActivity extends SubsonicTabActivity {
                     showAlbumList("random");
                 } else if (view == albumsHighestButton) {
                     showAlbumList("highest");
+                } else if (view == albumsStarredButton) {
+                    showAlbumList("starred");
                 } else if (view == albumsRecentButton) {
                     showAlbumList("recent");
                 } else if (view == albumsFrequentButton) {
-- 
cgit v1.2.3


From f0c0da7f22ffe19a3832087948582aad343c0c36 Mon Sep 17 00:00:00 2001
From: Kurt Hardin <kurthardin.dev@gmail.com>
Date: Tue, 25 Sep 2012 12:03:50 -0700
Subject: Changed 'Starred' list item in main tab to match new style

---
 subsonic-android/res/layout/main_buttons.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 7fb511ac..48d5b53f 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -106,7 +106,7 @@
     <TextView
             android:id="@+id/main_albums_starred"
             android:text="@string/main.albums_starred"
-            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"
-- 
cgit v1.2.3