Update Multi selection to work from different fragments

8 files changed, 85 insertions, 15 deletions

diff --git a/app/src/main/res/menu/abstract_top_menu.xml b/app/src/main/res/menu/abstract_top_menu.xml
index 22499ae9..7c8d414d 100644
--- a/app/src/main/res/menu/abstract_top_menu.xml
+++ b/app/src/main/res/menu/abstract_top_menu.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
-		android:id="@+id/menu_search"
+		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="always|withText"/>
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 549c5fb6..0970c8ce 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -2,13 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
-		android:id="@+id/menu_search"
+		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="always|withText"/>
 	
 	<item 
-		android:id="@+id/menu_shuffle"
+		android:id="@+id/menu_global_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="always|withText"/>
diff --git a/app/src/main/res/menu/multiselect_media.xml b/app/src/main/res/menu/multiselect_media.xml
new file mode 100644
index 00000000..75865a14
--- /dev/null
+++ b/app/src/main/res/menu/multiselect_media.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_play_now"
+		android:icon="?attr/actionbar_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_download"
+		android:title="@string/common.download"/>
+
+	<item
+		android:id="@+id/menu_cache"
+		android:title="@string/common.pin"/>
+
+	<item
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"/>
+
+	<item
+		android:id="@+id/menu_add_playlist"
+		android:title="@string/menu.add_playlist"/>
+
+	<item
+		android:id="@+id/menu_remove_playlist"
+		android:title="@string/menu.remove_playlist"/>
+
+	<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/app/src/main/res/menu/multiselect_media_offline.xml b/app/src/main/res/menu/multiselect_media_offline.xml
new file mode 100644
index 00000000..5587c106
--- /dev/null
+++ b/app/src/main/res/menu/multiselect_media_offline.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:compat="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/menu_play_now"
+		android:icon="?attr/actionbar_start"
+		android:title="@string/menu.play"
+		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		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>
+
+	<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/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index cab9c4f6..e9377d68 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
-		android:id="@+id/menu_search"
+		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="ifRoom|withText"/>
diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml
index 603f0a3b..66ba37ba 100644
--- a/app/src/main/res/menu/select_artist.xml
+++ b/app/src/main/res/menu/select_artist.xml
@@ -2,13 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item 
-		android:id="@+id/menu_shuffle"
+		android:id="@+id/menu_global_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
 		compat:showAsAction="always|withText"/>
 		
 	<item 
-		android:id="@+id/menu_search"
+		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="ifRoom|withText"/>
diff --git a/app/src/main/res/menu/select_podcasts.xml b/app/src/main/res/menu/select_podcasts.xml
index f30429ce..41ad62fa 100644
--- a/app/src/main/res/menu/select_podcasts.xml
+++ b/app/src/main/res/menu/select_podcasts.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 	<item
-		android:id="@+id/menu_search"
+		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
 		compat:showAsAction="always|withText"/>
diff --git a/app/src/main/res/menu/select_song.xml b/app/src/main/res/menu/select_song.xml
index d47ad933..5718866a 100644
--- a/app/src/main/res/menu/select_song.xml
+++ b/app/src/main/res/menu/select_song.xml
@@ -32,14 +32,6 @@
 	<item 
 		android:id="@+id/menu_delete"
 		android:title="@string/menu.delete_cache"/>
-	
-	<item 
-		android:id="@+id/menu_add_playlist"
-		android:title="@string/menu.add_playlist"/>
-		
-	<item 
-		android:id="@+id/menu_remove_playlist"
-		android:title="@string/menu.remove_playlist"/>
 
 	<group android:id="@+id/hide_play_next">
 		<item