#227 Add ability to hide Play next/last/Star

11 files changed, 127 insertions, 83 deletions

diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml
index 405b8e51..57e5bde5 100644
--- a/res/menu/nowplaying_context.xml
+++ b/res/menu/nowplaying_context.xml
@@ -21,10 +21,12 @@
 	<item 
 		android:id="@+id/menu_delete"
 		android:title="@string/download.menu_delete"/>
-		
-	<item 
-		android:id="@+id/menu_star"
-		android:title="@string/common.star"/>  
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/menu_star"
+			android:title="@string/common.star"/>
+	</group>
 		
 	<item 
 		android:id="@+id/menu_add_playlist"
diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml
index 0679cd54..6da0150b 100644
--- a/res/menu/select_album_context.xml
+++ b/res/menu/select_album_context.xml
@@ -17,14 +17,17 @@
         android:title="@string/common.play_shuffled"
         />
 
-	<item
-		android:id="@+id/album_menu_play_next"
-		android:title="@string/common.play_next"/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/album_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
-    <item 
-        android:id="@+id/album_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/album_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 
     <item 
         android:id="@+id/album_menu_download"
@@ -43,9 +46,10 @@
 	<item
 		android:id="@+id/album_menu_show_artist"
 		android:title="@string/menu.show_artist"/>
-		
-	<item 
-		android:id="@+id/album_menu_star"
-		android:title="@string/common.star"/>  
-        
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/album_menu_star"
+			android:title="@string/common.star"/>
+	</group>
 </menu>
diff --git a/res/menu/select_album_context_offline.xml b/res/menu/select_album_context_offline.xml
index c0fa32de..9eb5995f 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -11,14 +11,17 @@
         android:title="@string/common.play_shuffled"
         />
 
-	<item
-		android:id="@+id/album_menu_play_next"
-		android:title="@string/common.play_next"/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/album_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
-    <item 
-        android:id="@+id/album_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/album_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 
 	<item 
 		android:id="@+id/album_menu_delete"
diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml
index e2a401a0..2a71cec9 100644
--- a/res/menu/select_artist_context.xml
+++ b/res/menu/select_artist_context.xml
@@ -12,14 +12,17 @@
         android:title="@string/common.play_shuffled"
         />
 
-	<item
-		android:id="@+id/artist_menu_play_next"
-		android:title="@string/common.play_next"/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/artist_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
-    <item 
-        android:id="@+id/artist_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/artist_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 		
 	<item 
         android:id="@+id/artist_menu_download"
@@ -36,8 +39,10 @@
 		android:title="@string/common.delete"/>
 
 	<group android:id="@+id/server_1_10">
-		<item 
-			android:id="@+id/artist_menu_star"
-			android:title="@string/common.star"/>
+		<group android:id="@+id/hide_star">
+			<item
+				android:id="@+id/artist_menu_star"
+				android:title="@string/common.star"/>
+		</group>
 	</group>
 </menu>
diff --git a/res/menu/select_artist_context_offline.xml b/res/menu/select_artist_context_offline.xml
index b48471be..bfd7685a 100644
--- a/res/menu/select_artist_context_offline.xml
+++ b/res/menu/select_artist_context_offline.xml
@@ -12,14 +12,17 @@
         android:title="@string/common.play_shuffled"
         />
 
-	<item
-		android:id="@+id/artist_menu_play_next"
-		android:title="@string/common.play_next"/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/artist_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
-    <item 
-        android:id="@+id/artist_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/artist_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 
 	<item 
 		android:id="@+id/artist_menu_delete"
diff --git a/res/menu/select_podcast_episode_context.xml b/res/menu/select_podcast_episode_context.xml
index deffdecf..79eaa04d 100644
--- a/res/menu/select_podcast_episode_context.xml
+++ b/res/menu/select_podcast_episode_context.xml
@@ -12,10 +12,17 @@
         android:title="@string/common.play_now"
         />
 
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 		
 	<item 
         android:id="@+id/song_menu_download"
diff --git a/res/menu/select_podcast_episode_context_offline.xml b/res/menu/select_podcast_episode_context_offline.xml
index 8d1508ac..a7dc1619 100644
--- a/res/menu/select_podcast_episode_context_offline.xml
+++ b/res/menu/select_podcast_episode_context_offline.xml
@@ -12,10 +12,17 @@
         android:title="@string/common.play_now"
         />
 
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 		
 	<item 
 		android:id="@+id/song_menu_delete"
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index c2c0b437..38bebb39 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -43,11 +43,15 @@
 		android:id="@+id/menu_remove_playlist"
 		android:title="@string/menu.remove_playlist"/>
 
-	<item
-		android:id="@+id/menu_play_next"
-		android:title="@string/common.play_next"/>
-		
-	<item 
-		android:id="@+id/menu_play_last"
-		android:title="@string/menu.play_last"/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/menu_play_last"
+			android:title="@string/menu.play_last"/>
+	</group>
 </menu>
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml
index e2048b20..686ef308 100644
--- a/res/menu/select_song_context.xml
+++ b/res/menu/select_song_context.xml
@@ -12,15 +12,17 @@
         android:title="@string/common.play_now"
         />
 
-    <item 
-        android:id="@+id/song_menu_play_next"
-        android:title="@string/common.play_next"
-        />
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 		
 	<item 
         android:id="@+id/song_menu_download"
@@ -43,9 +45,10 @@
 	<item 
 		android:id="@+id/song_menu_remove_playlist"
 		android:title="@string/menu.remove_playlist"/>
-		
-	<item 
-		android:id="@+id/song_menu_star"
-		android:title="@string/common.star"/>  
-        
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/song_menu_star"
+			android:title="@string/common.star"/>
+	</group>
 </menu>
diff --git a/res/menu/select_song_context_offline.xml b/res/menu/select_song_context_offline.xml
index 36a0c1ff..401a9b69 100644
--- a/res/menu/select_song_context_offline.xml
+++ b/res/menu/select_song_context_offline.xml
@@ -12,15 +12,17 @@
         android:title="@string/common.play_now"
         />
 
-    <item 
-        android:id="@+id/song_menu_play_next"
-        android:title="@string/common.play_next"
-        />
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/song_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
-    <item 
-        android:id="@+id/song_menu_play_last"
-        android:title="@string/common.play_last"
-        />
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/song_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 		
 	<item 
 		android:id="@+id/song_menu_delete"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index c379714a..f0ca1cee 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -27,11 +27,15 @@
 		android:id="@+id/menu_delete"
 		android:title="@string/common.delete"/>
 
-	<item
-		android:id="@+id/menu_play_next"
-		android:title="@string/common.play_next"/>
-		
-	<item 
-		android:id="@+id/menu_play_last"
-		android:title="@string/menu.play_last"/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/menu_play_last"
+			android:title="@string/menu.play_last"/>
+	</group>
 </menu>