9 files changed, 54 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"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d97a3b21..c8553dc0 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -37,6 +37,7 @@
 	<attr name="rating_good" format="reference"/>
 	<attr name="radio" format="reference"/>
 	<attr name="star_outline" format="reference"/>
+	<attr name="download" format="reference"/>
 	<attr name="drawerItemsIcons" format="reference"/>
 	<attr name="drawerHome" format="reference"/>
 	<attr name="drawerLibrary" format="reference"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 821f2ad3..b7efff1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -232,6 +232,7 @@
 	<string name="download.restore_play_queue">continue from where you left off on another device at</string>
 	<string name="download.thumbs_up">Thumbs Up</string>
 	<string name="download.thumbs_down">Thumbs Down</string>
+	<string name="download.batch_mode">Batch Mode</string>
 
 	<string name="sync.new_podcasts">New podcasts available</string>
 	<string name="sync.new_playlists">New songs in playlists</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 790d91de..4915c012 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -38,6 +38,7 @@
 		<item name="rating_good">@drawable/ic_action_rating_good_light</item>
 		<item name="radio">@drawable/ic_menu_radio_dark</item>
 		<item name="star_outline">@drawable/ic_toggle_star_outline_light</item>
+		<item name="download">@drawable/ic_menu_download_dark</item>
 		<item name="drawerHome">@drawable/main_offline_light</item>
 		<item name="drawerLibrary">@drawable/ic_menu_library_light</item>
 		<item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item>
@@ -103,6 +104,7 @@
 		<item name="rating_good">@drawable/ic_action_rating_good_dark</item>
 		<item name="radio">@drawable/ic_menu_radio_dark</item>
 		<item name="star_outline">@drawable/ic_toggle_star_outline_dark</item>
+		<item name="download">@drawable/ic_menu_download_dark</item>
 		<item name="drawerHome">@drawable/main_offline_dark</item>
 		<item name="drawerLibrary">@drawable/ic_menu_library_dark</item>
 		<item name="drawerPlaylists">@drawable/ic_menu_playlist_dark</item>
@@ -190,6 +192,7 @@
 		<item name="add_person">@drawable/ic_menu_add_person_light</item>
 		<item name="password">@drawable/ic_menu_password_light</item>
 		<item name="radio">@drawable/ic_menu_radio_light</item>
+		<item name="download">@drawable/ic_menu_download_light</item>
 		<item name="actionModeBackground">@color/background_material_light</item>
 		<item name="actionModeStyle">@style/LightActionMode</item>
 		<item name="actionModeCloseButtonStyle">@style/DarkCloseButton</item>