Replace old episode multi-select with new multi-select. (#5253)

4 files changed, 6 insertions, 77 deletions

diff --git a/app/src/main/res/menu/downloads.xml b/app/src/main/res/menu/downloads.xml
index 142f251fc..54469a101 100644
--- a/app/src/main/res/menu/downloads.xml
+++ b/app/src/main/res/menu/downloads.xml
@@ -2,13 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/episode_actions"
-        android:menuCategory="container"
-        android:title="@string/multi_select"
-        android:icon="@drawable/ic_check_multiple"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-    <item
         android:id="@+id/clear_logs_item"
         android:menuCategory="container"
         android:title="@string/clear_history_label"
diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml
deleted file mode 100644
index 221ec4d59..000000000
--- a/app/src/main/res/menu/episodes_apply_action_options.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/sort"
-        android:icon="@drawable/ic_sort"
-        android:title="@string/sort"
-        app:showAsAction="always">
-        <menu>
-            <item android:id="@+id/sort_title_a_z"
-                  android:title="@string/sort_title_a_z"/>
-            <item android:id="@+id/sort_title_z_a"
-                  android:title="@string/sort_title_z_a"/>
-            <item android:id="@+id/sort_date_new_old"
-                  android:title="@string/sort_date_new_old"/>
-            <item android:id="@+id/sort_date_old_new"
-                  android:title="@string/sort_date_old_new"/>
-            <item android:id="@+id/sort_duration_short_long"
-                  android:title="@string/sort_duration_short_long"/>
-            <item android:id="@+id/sort_duration_long_short"
-                  android:title="@string/sort_duration_long_short"/>
-        </menu>
-    </item>
-
-    <item
-        android:id="@+id/select_options"
-        android:icon="@drawable/ic_filter"
-        android:title="@string/filter"
-        app:showAsAction="always">
-
-        <menu>
-            <item android:id="@+id/check_all"
-                android:title="@string/all_label"/>
-            <item android:id="@+id/check_none"
-                  android:title="@string/select_none_label"/>
-            <item android:id="@+id/check_played"
-                  android:title="@string/played_label"/>
-            <item android:id="@+id/check_unplayed"
-                  android:title="@string/unplayed_label"/>
-            <item android:id="@+id/check_downloaded"
-                  android:title="@string/downloaded_label"/>
-            <item android:id="@+id/check_not_downloaded"
-                  android:title="@string/not_downloaded_label"/>
-            <item android:id="@+id/check_queued"
-                android:title="@string/queued_label"/>
-            <item android:id="@+id/check_not_queued"
-                android:title="@string/not_queued_label"/>
-            <item android:id="@+id/check_has_media"
-                android:title="@string/has_media"/>
-        </menu>
-    </item>
-
-    <item
-        android:id="@+id/select_toggle"
-        android:title="@string/select_all_label"
-        app:showAsAction="always"/>
-</menu>
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index f55afd3f8..27f1af6ca 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/multi_select"
-        android:menuCategory="container"
-        android:title="@string/multi_select"
-        android:visible="false"/>
-
-    <item
         android:id="@id/skip_episode_item"
         android:menuCategory="container"
         android:title="@string/skip_episode_label" />
@@ -75,4 +69,10 @@
         android:id="@+id/share_item"
         android:menuCategory="container"
         android:title="@string/share_label" />
+
+    <item
+        android:id="@+id/multi_select"
+        android:menuCategory="container"
+        android:title="@string/multi_select"
+        android:visible="false" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index adf44b8b1..34d8f32c0 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -115,10 +115,4 @@
         android:title="@string/clear_queue_label"
         custom:showAsAction="collapseActionView"
         android:icon="@drawable/ic_check"/>
-
-    <item
-        android:id="@+id/episode_actions"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/multi_select" />
-
 </menu>