Fixes #476: Add Batch Mode for Now Playing tab

6 files changed, 49 insertions, 3 deletions

diff --git a/app/src/main/res/menu/multiselect_nowplaying.xml b/app/src/main/res/menu/multiselect_nowplaying.xml
new file mode 100644
index 00000000..9d361bf0
--- /dev/null
+++ b/app/src/main/res/menu/multiselect_nowplaying.xml
@@ -0,0 +1,27 @@
+<?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_download"
+		android:title="@string/common.download"
+		android:icon="?attr/download"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_delete"
+		android:title="@string/menu.delete_cache"
+		android:icon="?attr/remove"
+		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_cache"
+		android:title="@string/common.pin"/>
+
+	<item
+		android:id="@+id/menu_add_playlist"
+		android:title="@string/menu.add_playlist"/>
+
+	<item
+		android:id="@+id/menu_star"
+		android:title="@string/common.star"/>
+</menu>
diff --git a/app/src/main/res/menu/multiselect_nowplaying_offline.xml b/app/src/main/res/menu/multiselect_nowplaying_offline.xml
new file mode 100644
index 00000000..044836c6
--- /dev/null
+++ b/app/src/main/res/menu/multiselect_nowplaying_offline.xml
@@ -0,0 +1,9 @@
+<?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_delete"
+		android:title="@string/menu.delete_cache"
+		android:icon="?attr/remove"
+		compat:showAsAction="ifRoom|withText"/>
+</menu>
diff --git a/app/src/main/res/menu/nowplaying.xml b/app/src/main/res/menu/nowplaying.xml
index 60255692..9c198e9a 100644
--- a/app/src/main/res/menu/nowplaying.xml
+++ b/app/src/main/res/menu/nowplaying.xml
@@ -33,6 +33,11 @@
 		android:title="@string/equalizer.label"
 		android:checkable="true"/>
 
+	<item
+		android:id="@+id/menu_batch_mode"
+		android:title="@string/download.batch_mode"
+		android:checkable="true"/>
+
     <item
         android:id="@+id/menu_screen_on_off"
         android:title="@string/download.menu_screen_on"
diff --git a/app/src/main/res/menu/nowplaying_context.xml b/app/src/main/res/menu/nowplaying_context.xml
index 60d6288e..06f4afcb 100644
--- a/app/src/main/res/menu/nowplaying_context.xml
+++ b/app/src/main/res/menu/nowplaying_context.xml
@@ -26,7 +26,7 @@
 
 	<group android:id="@+id/hide_star">
 		<item
-			android:id="@+id/menu_star"
+			android:id="@+id/song_menu_star"
 			android:title="@string/common.star"/>
 	</group>
 
@@ -44,7 +44,7 @@
 	
 	<group android:id="@+id/server_1.8">	
 		<item
-			android:id="@+id/menu_add_playlist"
+			android:id="@+id/song_menu_add_playlist"
 			android:title="@string/menu.add_playlist"/>
 	</group>
 </menu>
diff --git a/app/src/main/res/menu/nowplaying_context_offline.xml b/app/src/main/res/menu/nowplaying_context_offline.xml
index 5f8009ff..14c95ab6 100644
--- a/app/src/main/res/menu/nowplaying_context_offline.xml
+++ b/app/src/main/res/menu/nowplaying_context_offline.xml
@@ -22,7 +22,7 @@
 
 	<group android:id="@+id/hide_star">
 		<item
-			android:id="@+id/menu_star"
+			android:id="@+id/song_menu_star"
 			android:title="@string/common.star"/>
 	</group>
 </menu>
diff --git a/app/src/main/res/menu/nowplaying_offline.xml b/app/src/main/res/menu/nowplaying_offline.xml
index bba5ba00..d1f6f706 100644
--- a/app/src/main/res/menu/nowplaying_offline.xml
+++ b/app/src/main/res/menu/nowplaying_offline.xml
@@ -25,6 +25,11 @@
 		android:id="@+id/menu_equalizer"
 		android:title="@string/equalizer.label"
 		android:checkable="true"/>
+
+	<item
+		android:id="@+id/menu_batch_mode"
+		android:title="@string/download.batch_mode"
+		android:checkable="true"/>
 	
 	<item
         android:id="@+id/menu_screen_on_off"