From f9a6738054febd93932cd3f6ab66e985777d45f1 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 3 Oct 2012 22:15:26 -0700
Subject: Updated star support to only display star when starred + star/unstar
 from long press menu

---
 .../res/drawable-hdpi-v4/ic_stat_star.png            | Bin 0 -> 3611 bytes
 subsonic-android/res/layout/album_list_item.xml      |  19 +++++++++----------
 subsonic-android/res/layout/song_list_item.xml       |  18 +++++++++---------
 subsonic-android/res/menu/nowplaying_context.xml     |   7 +++++--
 subsonic-android/res/menu/select_album_context.xml   |   4 ++++
 subsonic-android/res/menu/select_artist_context.xml  |   4 ++++
 .../res/menu/select_playlist_context.xml             |   2 +-
 subsonic-android/res/menu/select_song_context.xml    |   4 ++++
 subsonic-android/res/values/strings.xml              |   4 ++++
 9 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_stat_star.png

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_stat_star.png b/subsonic-android/res/drawable-hdpi-v4/ic_stat_star.png
new file mode 100644
index 00000000..b16e803c
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/ic_stat_star.png differ
diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
index a0f79fa7..80f40989 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:src="@drawable/ic_stat_star"
+			android:background="@null"
+			android:focusable="false"/>
 
     <ImageView
             android:src="@drawable/list_item_more"
@@ -43,14 +52,4 @@
             android:layout_height="wrap_content"
             android:layout_gravity="right|center_vertical"
             android:paddingRight="6dip"/>
-			
-	<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" />
-
 </LinearLayout>
diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
index 586f6803..e7c2aabb 100644
--- a/subsonic-android/res/layout/song_list_item.xml
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -35,6 +35,15 @@
                     android:drawablePadding="6dip"
                     android:paddingLeft="6dip"
                     android:paddingRight="6dip"/>
+					
+			<ImageButton
+				android:id="@+id/song_star"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="right|center_vertical"
+				android:src="@drawable/ic_stat_star"
+				android:background="@null"
+				android:focusable="false"/>
 
             <TextView
                     android:id="@+id/song_status"
@@ -43,15 +52,6 @@
                     android:layout_gravity="right|center_vertical"
                     android:drawablePadding="1dip"
                     android:paddingRight="6dip"/>
-					
-			<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>
 
         <LinearLayout android:orientation="horizontal"
diff --git a/subsonic-android/res/menu/nowplaying_context.xml b/subsonic-android/res/menu/nowplaying_context.xml
index eeb49a26..9ad2be52 100644
--- a/subsonic-android/res/menu/nowplaying_context.xml
+++ b/subsonic-android/res/menu/nowplaying_context.xml
@@ -1,6 +1,5 @@
 <?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"/>
@@ -15,5 +14,9 @@
 
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/download.menu_delete"/>        
+		android:title="@string/download.menu_delete"/>
+		
+	<item 
+		android:id="@+id/menu_star"
+		android:title="@string/common.star"/>  
 </menu>
diff --git a/subsonic-android/res/menu/select_album_context.xml b/subsonic-android/res/menu/select_album_context.xml
index 95ff22ca..ddfd134e 100644
--- a/subsonic-android/res/menu/select_album_context.xml
+++ b/subsonic-android/res/menu/select_album_context.xml
@@ -25,5 +25,9 @@
         android:id="@+id/album_menu_pin"
         android:title="@string/common.pin"
         />
+		
+	<item 
+		android:id="@+id/album_menu_star"
+		android:title="@string/common.star"/>  
         
 </menu>
diff --git a/subsonic-android/res/menu/select_artist_context.xml b/subsonic-android/res/menu/select_artist_context.xml
index 17f12162..d1fdbb02 100644
--- a/subsonic-android/res/menu/select_artist_context.xml
+++ b/subsonic-android/res/menu/select_artist_context.xml
@@ -25,5 +25,9 @@
         android:id="@+id/artist_menu_pin"
         android:title="@string/common.pin"
         />
+		
+	<item 
+		android:id="@+id/artist_menu_star"
+		android:title="@string/common.star"/>  
         
 </menu>
diff --git a/subsonic-android/res/menu/select_playlist_context.xml b/subsonic-android/res/menu/select_playlist_context.xml
index 5c3bfb48..4fe24f76 100644
--- a/subsonic-android/res/menu/select_playlist_context.xml
+++ b/subsonic-android/res/menu/select_playlist_context.xml
@@ -19,6 +19,6 @@
     <item 
         android:id="@+id/playlist_menu_pin"
         android:title="@string/common.pin"
-        />
+        /> 
         
 </menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_song_context.xml b/subsonic-android/res/menu/select_song_context.xml
index c6393e77..cc88fd9d 100644
--- a/subsonic-android/res/menu/select_song_context.xml
+++ b/subsonic-android/res/menu/select_song_context.xml
@@ -15,5 +15,9 @@
         android:id="@+id/song_menu_play_last"
         android:title="@string/common.play_last"
         />
+		
+	<item 
+		android:id="@+id/song_menu_star"
+		android:title="@string/common.star"/>  
         
 </menu>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 96f1fc93..a71f896a 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -12,6 +12,8 @@
 	<string name="common.download">Download</string>
     <string name="common.pin">Cache</string>
     <string name="common.delete">Delete</string>
+	<string name="common.star">Star</string>
+	<string name="common.unstar">Unstar</string>
 
     <string name="button_bar.home">DSub home</string>
     <string name="button_bar.browse">Media library</string>
@@ -118,6 +120,8 @@
     <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_starred">Starred \"%s\"</string>
+	<string name="starring_content_unstarred">Unstarred \"%s\"</string>
     <string name="starring_content_error">Failed to update \"%s\", please try later.</string>
 
     <string name="song_details.all">%1$s %2$s</string>
-- 
cgit v1.2.3