Put back a bunch of context menu options and make everything optional

16 files changed, 246 insertions, 79 deletions

diff --git a/app/src/main/res/menu/nowplaying_context.xml b/app/src/main/res/menu/nowplaying_context.xml
index 845a98c8..60d6288e 100644
--- a/app/src/main/res/menu/nowplaying_context.xml
+++ b/app/src/main/res/menu/nowplaying_context.xml
@@ -18,9 +18,11 @@
 		android:id="@+id/menu_lyrics"
 		android:title="@string/download.menu_lyrics"/>
 
-	<item 
-		android:id="@+id/menu_delete"
-		android:title="@string/menu.delete_cache"/>
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 
 	<group android:id="@+id/hide_star">
 		<item
diff --git a/app/src/main/res/menu/nowplaying_context_offline.xml b/app/src/main/res/menu/nowplaying_context_offline.xml
index 9ce63d79..5f8009ff 100644
--- a/app/src/main/res/menu/nowplaying_context_offline.xml
+++ b/app/src/main/res/menu/nowplaying_context_offline.xml
@@ -14,9 +14,11 @@
 		android:id="@+id/menu_show_album"
 		android:title="@string/download.menu_show_album"/>
 
-	<item 
-		android:id="@+id/menu_delete"
-		android:title="@string/menu.delete_cache"/>
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 
 	<group android:id="@+id/hide_star">
 		<item
diff --git a/app/src/main/res/menu/select_album_context.xml b/app/src/main/res/menu/select_album_context.xml
index b06f2d24..e4a901ac 100644
--- a/app/src/main/res/menu/select_album_context.xml
+++ b/app/src/main/res/menu/select_album_context.xml
@@ -5,9 +5,23 @@
 		android:id="@+id/album_menu_info"
 		android:title="@string/common.info"/>
 
-	<item
-		android:id="@+id/album_menu_play_now"
-		android:title="@string/common.play_now"/>
+	<group android:id="@+id/hide_play_now">
+		<item
+			android:id="@+id/album_menu_play_now"
+			android:title="@string/common.play_now"/>
+	</group>
+
+	<group android:id="@+id/hide_play_shuffled">
+		<item
+			android:id="@+id/album_menu_play_shuffled"
+			android:title="@string/common.play_shuffled"/>
+	</group>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/album_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
 	<group android:id="@+id/hide_play_last">
 		<item
@@ -15,9 +29,23 @@
 			android:title="@string/common.play_last"/>
 	</group>
 
-	<item
-		android:id="@+id/album_menu_download"
-		android:title="@string/common.download"/>
+	<group android:id="@+id/hide_download">
+		<item
+			android:id="@+id/album_menu_download"
+			android:title="@string/common.download"/>
+	</group>
+
+	<group android:id="@+id/hide_pin">
+		<item
+			android:id="@+id/album_menu_pin"
+			android:title="@string/common.pin"/>
+	</group>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/album_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 
 	<item
 		android:id="@+id/album_menu_show_artist"
diff --git a/app/src/main/res/menu/select_album_context_offline.xml b/app/src/main/res/menu/select_album_context_offline.xml
index d65ff725..c10f2c62 100644
--- a/app/src/main/res/menu/select_album_context_offline.xml
+++ b/app/src/main/res/menu/select_album_context_offline.xml
@@ -5,17 +5,39 @@
 		android:id="@+id/album_menu_info"
 		android:title="@string/common.info"/>
 
-	<item 
-		android:id="@+id/album_menu_star"
-		android:title="@string/common.star"/>
+	<group android:id="@+id/hide_play_now">
+		<item
+			android:id="@+id/album_menu_play_now"
+			android:title="@string/common.play_now"/>
+	</group>
 
-	<item
-		android:id="@+id/album_menu_play_now"
-		android:title="@string/common.play_now"/>
+	<group android:id="@+id/hide_play_shuffled">
+		<item
+			android:id="@+id/album_menu_play_shuffled"
+			android:title="@string/common.play_shuffled"/>
+	</group>
+
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/album_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
 	<group android:id="@+id/hide_play_last">
 		<item
 			android:id="@+id/album_menu_play_last"
 			android:title="@string/common.play_last"/>
 	</group>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/album_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/album_menu_star"
+			android:title="@string/common.star"/>
+	</group>
 </menu>
diff --git a/app/src/main/res/menu/select_artist_context.xml b/app/src/main/res/menu/select_artist_context.xml
index 8e87d932..589f044c 100644
--- a/app/src/main/res/menu/select_artist_context.xml
+++ b/app/src/main/res/menu/select_artist_context.xml
@@ -1,25 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<group android:id="@+id/server_1_10">
+	<group android:id="@+id/hide_play_now">
 		<item
 			android:id="@+id/artist_menu_play_now"
 			android:title="@string/common.play_now"/>
+	</group>
 
+	<group android:id="@+id/hide_play_shuffled">
 		<item
 			android:id="@+id/artist_menu_play_shuffled"
 			android:title="@string/common.play_shuffled"/>
+	</group>
 
-		<group android:id="@+id/hide_play_last">
-			<item
-				android:id="@+id/artist_menu_play_last"
-				android:title="@string/common.play_last"/>
-		</group>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/artist_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
+
+	<group android:id="@+id/hide_play_last">
+		<item
+			android:id="@+id/artist_menu_play_last"
+			android:title="@string/common.play_last"/>
+	</group>
 
+	<group android:id="@+id/hide_download">
 		<item
 			android:id="@+id/artist_menu_download"
-			android:title="@string/common.download"
-			/>
+			android:title="@string/common.download"/>
+	</group>
+
+	<group android:id="@+id/hide_pin">
+		<item
+			android:id="@+id/artist_menu_pin"
+			android:title="@string/common.pin"/>
+	</group>
 
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/artist_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
+
+	<group android:id="@+id/server_1_10">
 		<group android:id="@+id/hide_star">
 			<item
 				android:id="@+id/artist_menu_star"
diff --git a/app/src/main/res/menu/select_artist_context_offline.xml b/app/src/main/res/menu/select_artist_context_offline.xml
index 0fb9aad7..a14d6dc8 100644
--- a/app/src/main/res/menu/select_artist_context_offline.xml
+++ b/app/src/main/res/menu/select_artist_context_offline.xml
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/artist_menu_play_now"
-		android:title="@string/common.play_now"/>
+	<group android:id="@+id/hide_play_now">
+		<item
+			android:id="@+id/artist_menu_play_now"
+			android:title="@string/common.play_now"/>
+	</group>
 
-	<item
-		android:id="@+id/artist_menu_play_shuffled"
-		android:title="@string/common.play_shuffled"/>
+	<group android:id="@+id/hide_play_shuffled">
+		<item
+			android:id="@+id/artist_menu_play_shuffled"
+			android:title="@string/common.play_shuffled"/>
+	</group>
 
-	<item
-		android:id="@+id/artist_menu_download"
-		android:title="@string/common.download"
-		/>
+	<group android:id="@+id/hide_play_next">
+		<item
+			android:id="@+id/artist_menu_play_next"
+			android:title="@string/common.play_next"/>
+	</group>
 
 	<group android:id="@+id/hide_play_last">
 		<item
 			android:id="@+id/artist_menu_play_last"
 			android:title="@string/common.play_last"/>
 	</group>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/artist_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/select_bookmark_context.xml b/app/src/main/res/menu/select_bookmark_context.xml
index 20808cf5..468bc2fb 100644
--- a/app/src/main/res/menu/select_bookmark_context.xml
+++ b/app/src/main/res/menu/select_bookmark_context.xml
@@ -25,6 +25,24 @@
 	<item
 		android:id="@+id/song_menu_show_artist"
 		android:title="@string/menu.show_artist"/>
+
+	<group android:id="@+id/hide_download">
+		<item
+			android:id="@+id/song_menu_download"
+			android:title="@string/common.download"/>
+	</group>
+
+	<group android:id="@+id/hide_pin">
+		<item
+			android:id="@+id/song_menu_pin"
+			android:title="@string/common.pin"/>
+	</group>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 		
 	<item 
 		android:id="@+id/bookmark_menu_delete"
diff --git a/app/src/main/res/menu/select_playlist_context.xml b/app/src/main/res/menu/select_playlist_context.xml
index 4941e94b..ff3618a9 100644
--- a/app/src/main/res/menu/select_playlist_context.xml
+++ b/app/src/main/res/menu/select_playlist_context.xml
@@ -4,8 +4,25 @@
 	
 	<item
 		android:id="@+id/playlist_info"
-        android:title="@string/common.info"
-        />
+        android:title="@string/common.info"/>
+
+	<group android:id="@+id/hide_play_now">
+		<item
+			android:id="@+id/playlist_menu_play_now"
+			android:title="@string/common.play_now"/>
+	</group>
+
+	<group android:id="@+id/hide_play_shuffled">
+		<item
+			android:id="@+id/playlist_menu_play_shuffled"
+			android:title="@string/common.play_shuffled"/>
+	</group>
+
+	<group android:id="@+id/hide_download">
+		<item
+			android:id="@+id/playlist_menu_download"
+			android:title="@string/common.download"/>
+	</group>
 
 	<item
 		android:id="@+id/playlist_menu_sync"
@@ -17,12 +34,10 @@
 		
 	<item 
         android:id="@+id/playlist_update_info"
-        android:title="@string/playlist.update_info"
-        /> 
+        android:title="@string/playlist.update_info"/>
 	
 	<item 
         android:id="@+id/playlist_menu_delete"
-        android:title="@string/playlist.delete"
-        /> 
+        android:title="@string/playlist.delete"/>
         
 </menu>
diff --git a/app/src/main/res/menu/select_playlist_context_offline.xml b/app/src/main/res/menu/select_playlist_context_offline.xml
index 6745d850..6cbc1e11 100644
--- a/app/src/main/res/menu/select_playlist_context_offline.xml
+++ b/app/src/main/res/menu/select_playlist_context_offline.xml
@@ -2,6 +2,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/playlist_info"
-        android:title="@string/common.info"
-        />
+        android:title="@string/common.info"/>
+
+	<group android:id="@+id/hide_play_now">
+		<item
+			android:id="@+id/playlist_menu_play_now"
+			android:title="@string/common.play_now"/>
+	</group>
+
+    <group android:id="@+id/hide_play_shuffled">
+        <item
+            android:id="@+id/playlist_menu_play_shuffled"
+            android:title="@string/common.play_shuffled"/>
+    </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/select_podcast_episode_context.xml b/app/src/main/res/menu/select_podcast_episode_context.xml
index 057ff187..a05e58be 100644
--- a/app/src/main/res/menu/select_podcast_episode_context.xml
+++ b/app/src/main/res/menu/select_podcast_episode_context.xml
@@ -18,12 +18,24 @@
 			android:title="@string/common.play_last"/>
 	</group>
 
+	<group android:id="@+id/hide_download">
+		<item
+			android:id="@+id/song_menu_download"
+			android:title="@string/common.download"/>
+	</group>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
+
 	<group android:id="@+id/server_1.9">
 		<item
 			android:id="@+id/bookmark_menu_delete"
 			android:title="@string/bookmark.delete"/>
 	</group>
-        
+
 	<item 
 		android:id="@+id/song_menu_server_download"
 		android:title="@string/select_podcasts.server_download"/>
diff --git a/app/src/main/res/menu/select_song.xml b/app/src/main/res/menu/select_song.xml
index 5718866a..5277f881 100644
--- a/app/src/main/res/menu/select_song.xml
+++ b/app/src/main/res/menu/select_song.xml
@@ -33,15 +33,11 @@
 		android:id="@+id/menu_delete"
 		android:title="@string/menu.delete_cache"/>
 
-	<group android:id="@+id/hide_play_next">
-		<item
-			android:id="@+id/menu_play_next"
-			android:title="@string/common.play_next"/>
-	</group>
+	<item
+		android:id="@+id/menu_play_next"
+		android:title="@string/common.play_next"/>
 
-	<group android:id="@+id/hide_play_last">
-		<item
-			android:id="@+id/menu_play_last"
-			android:title="@string/menu.play_last"/>
-	</group>
+	<item
+		android:id="@+id/menu_play_last"
+		android:title="@string/menu.play_last"/>
 </menu>
diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml
index ef5478b6..34ea27a6 100644
--- a/app/src/main/res/menu/select_song_context.xml
+++ b/app/src/main/res/menu/select_song_context.xml
@@ -18,6 +18,24 @@
 			android:id="@+id/song_menu_play_last"
 			android:title="@string/common.play_last"/>
 	</group>
+
+	<group android:id="@+id/hide_download">
+		<item
+			android:id="@+id/song_menu_download"
+			android:title="@string/common.download"/>
+	</group>
+
+	<group android:id="@+id/hide_pin">
+		<item
+			android:id="@+id/song_menu_pin"
+			android:title="@string/common.pin"/>
+	</group>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 	
 	<group android:id="@+id/server_1.8">
 		<item 
diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml
index da0f366e..1c52e792 100644
--- a/app/src/main/res/menu/select_song_context_offline.xml
+++ b/app/src/main/res/menu/select_song_context_offline.xml
@@ -18,7 +18,15 @@
 			android:title="@string/common.play_last"/>
 	</group>
 
-	<item 
-		android:id="@+id/song_menu_star"
-		android:title="@string/common.star"/>
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
+
+	<group android:id="@+id/hide_star">
+		<item
+			android:id="@+id/song_menu_star"
+			android:title="@string/common.star"/>
+	</group>
 </menu>
diff --git a/app/src/main/res/menu/select_song_offline.xml b/app/src/main/res/menu/select_song_offline.xml
index 7a4a5407..383e1be3 100644
--- a/app/src/main/res/menu/select_song_offline.xml
+++ b/app/src/main/res/menu/select_song_offline.xml
@@ -17,15 +17,11 @@
 		android:id="@+id/menu_delete"
 		android:title="@string/menu.delete_cache"/>
 
-	<group android:id="@+id/hide_play_next">
-		<item
-			android:id="@+id/menu_play_next"
-			android:title="@string/common.play_next"/>
-	</group>
+	<item
+		android:id="@+id/menu_play_next"
+		android:title="@string/common.play_next"/>
 
-	<group android:id="@+id/hide_play_last">
-		<item
-			android:id="@+id/menu_play_last"
-			android:title="@string/menu.play_last"/>
-	</group>
+	<item
+		android:id="@+id/menu_play_last"
+		android:title="@string/menu.play_last"/>
 </menu>
diff --git a/app/src/main/res/menu/select_video_context.xml b/app/src/main/res/menu/select_video_context.xml
index 3eda2df7..41d2b1a6 100644
--- a/app/src/main/res/menu/select_video_context.xml
+++ b/app/src/main/res/menu/select_video_context.xml
@@ -13,12 +13,15 @@
 		android:id="@+id/song_menu_play_external"
 		android:title="@string/common.play_external"/>
 
-	<item 
-		android:id="@+id/song_menu_download"
-		android:title="@string/common.download"
-		/>
+	<group android:id="@+id/hide_download">
+		<item
+			android:id="@+id/song_menu_download"
+			android:title="@string/common.download"/>
+	</group>
 
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/menu.delete_cache"/>
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 </menu>
diff --git a/app/src/main/res/menu/select_video_context_offline.xml b/app/src/main/res/menu/select_video_context_offline.xml
index 3fea9f5e..fdf8f288 100644
--- a/app/src/main/res/menu/select_video_context_offline.xml
+++ b/app/src/main/res/menu/select_video_context_offline.xml
@@ -8,8 +8,10 @@
 	<item 
 		android:id="@+id/song_menu_play_external"
 		android:title="@string/common.play_external"/>
-		
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/menu.delete_cache"/>
+
+	<group android:id="@+id/hide_delete">
+		<item
+			android:id="@+id/song_menu_delete"
+			android:title="@string/menu.delete_cache"/>
+	</group>
 </menu>