Moved all the menus to separate online/offline menus

10 files changed, 226 insertions, 34 deletions

diff --git a/subsonic-android/res/menu/nowplaying_context_offline.xml b/subsonic-android/res/menu/nowplaying_context_offline.xml
new file mode 100644
index 00000000..25d5031b
--- /dev/null
+++ b/subsonic-android/res/menu/nowplaying_context_offline.xml
@@ -0,0 +1,14 @@
+<?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_remove"
+		android:title="@string/download.menu_remove"/>
+
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/download.menu_delete"/> 
+</menu>
diff --git a/subsonic-android/res/menu/nowplaying_downloading.xml b/subsonic-android/res/menu/nowplaying_downloading.xml
new file mode 100644
index 00000000..60b81a7c
--- /dev/null
+++ b/subsonic-android/res/menu/nowplaying_downloading.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<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_screen_on_off"
+        android:icon="@drawable/action_screen_on_off"
+        android:title="@string/download.menu_screen_on"
+        android:showAsAction="ifRoom|withText"/>
+		
+	<item
+        android:id="@+id/menu_toggle_timer"
+        android:title="@string/download.start_timer"/>
+		
+	<item
+        android:id="@+id/menu_toggle_now_playing"
+        android:title="@string/download.show_downloading"/>
+		
+	<item 
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
+</menu>
diff --git a/subsonic-android/res/menu/nowplaying_offline.xml b/subsonic-android/res/menu/nowplaying_offline.xml
new file mode 100644
index 00000000..677f654f
--- /dev/null
+++ b/subsonic-android/res/menu/nowplaying_offline.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_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_toggle_timer"
+        android:title="@string/download.start_timer"/>
+		
+	<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_album.xml b/subsonic-android/res/menu/select_album.xml
index cd49e44f..5ca9c537 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -17,38 +17,4 @@
 		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_download"
-		android:icon="@drawable/action_save"
-		android:title="@string/common.download"
-		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_add_playlist"
-		android:title="@string/menu.add_playlist"/>
-		
-	<item 
-		android:id="@+id/menu_play_last"
-		android:icon="@drawable/action_play_all"
-		android:title="@string/menu.play_last"
-		android:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/subsonic-android/res/menu/select_album_context_offline.xml b/subsonic-android/res/menu/select_album_context_offline.xml
new file mode 100644
index 00000000..801b6c5d
--- /dev/null
+++ b/subsonic-android/res/menu/select_album_context_offline.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item 
+        android:id="@+id/album_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/album_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
+    <item 
+        android:id="@+id/album_menu_play_last"
+        android:title="@string/common.play_last"
+        />
+</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_artist_context_offline.xml b/subsonic-android/res/menu/select_artist_context_offline.xml
new file mode 100644
index 00000000..2a6ed744
--- /dev/null
+++ b/subsonic-android/res/menu/select_artist_context_offline.xml
@@ -0,0 +1,18 @@
+<?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"
+        />
+		
+	<item 
+        android:id="@+id/artist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
+    <item 
+        android:id="@+id/artist_menu_play_last"
+        android:title="@string/common.play_last"
+        />       
+</menu>
diff --git a/subsonic-android/res/menu/select_playlist_context_offline.xml b/subsonic-android/res/menu/select_playlist_context_offline.xml
new file mode 100644
index 00000000..90ce9573
--- /dev/null
+++ b/subsonic-android/res/menu/select_playlist_context_offline.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/playlist_info"
+        android:title="@string/common.info"
+        />
+
+    <item 
+        android:id="@+id/playlist_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+		
+	<item 
+        android:id="@+id/playlist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />        
+</menu>
\ No newline at end of file
diff --git a/subsonic-android/res/menu/select_song.xml b/subsonic-android/res/menu/select_song.xml
new file mode 100644
index 00000000..cd49e44f
--- /dev/null
+++ b/subsonic-android/res/menu/select_song.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<item 
+		android:id="@+id/menu_play_now"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play"
+		android:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="always|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_download"
+		android:icon="@drawable/action_save"
+		android:title="@string/common.download"
+		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_add_playlist"
+		android:title="@string/menu.add_playlist"/>
+		
+	<item 
+		android:id="@+id/menu_play_last"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play_last"
+		android:showAsAction="ifRoom|withText"/>
+</menu>
diff --git a/subsonic-android/res/menu/select_song_context_offline.xml b/subsonic-android/res/menu/select_song_context_offline.xml
new file mode 100644
index 00000000..97f24319
--- /dev/null
+++ b/subsonic-android/res/menu/select_song_context_offline.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item 
+        android:id="@+id/song_menu_play_now"
+        android:title="@string/common.play_now"
+        />
+
+    <item 
+        android:id="@+id/song_menu_play_next"
+        android:title="@string/common.play_next"
+        />
+
+    <item 
+        android:id="@+id/song_menu_play_last"
+        android:title="@string/common.play_last"
+        />
+</menu>
diff --git a/subsonic-android/res/menu/select_song_offline.xml b/subsonic-android/res/menu/select_song_offline.xml
new file mode 100644
index 00000000..6ed43b71
--- /dev/null
+++ b/subsonic-android/res/menu/select_song_offline.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">		
+	<item 
+		android:id="@+id/menu_play_now"
+		android:icon="@drawable/action_play_all"
+		android:title="@string/menu.play"
+		android:showAsAction="always|withText"/>
+		
+	<item 
+		android:id="@+id/menu_refresh"
+		android:icon="@drawable/action_refresh"
+		android:title="@string/menu.refresh"
+		android:showAsAction="always|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_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"/>
+</menu>