From 1052b393d2129eff8aafa9e8cb68f3fb785c2eb2 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Wed, 3 Apr 2019 13:40:55 -0700
Subject: [PATCH] bulk edit - refactor - rename menu ids, to be consistent with
 single edit counterparts

---
 .../dialog/EpisodesApplyActionFragment.java   | 24 +++++++++----------
 .../menu/episodes_apply_action_speeddial.xml  | 12 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index cee11d1ba..df02e2d37 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -154,41 +154,41 @@ public class EpisodesApplyActionFragment extends Fragment {
 
         // show only specified actions, and bind speed dial UIs to the actual logic
         if((actions & ACTION_ADD_TO_QUEUE) == 0) {
-            mSpeedDialView.removeActionItemById(R.id.addToQueue);
+            mSpeedDialView.removeActionItemById(R.id.add_to_queue_batch);
         }
         if((actions & ACTION_REMOVE_FROM_QUEUE) == 0) {
-            mSpeedDialView.removeActionItemById(R.id.removeFromQueue);
+            mSpeedDialView.removeActionItemById(R.id.remove_from_queue_batch);
         }
         if((actions & ACTION_MARK_PLAYED) == 0) {
-            mSpeedDialView.removeActionItemById(R.id.markAsPlayed);
+            mSpeedDialView.removeActionItemById(R.id.mark_read_batch);
         }
         if((actions & ACTION_MARK_UNPLAYED) == 0) {
-            mSpeedDialView.removeActionItemById(R.id.markAsUnplayed);
+            mSpeedDialView.removeActionItemById(R.id.mark_unread_batch);
         }
         if((actions & ACTION_DOWNLOAD) == 0) {
-            mSpeedDialView.removeActionItemById(R.id.download);
+            mSpeedDialView.removeActionItemById(R.id.download_batch);
         }
         if((actions & ACTION_DELETE) == 0) {
-            mSpeedDialView.removeActionItemById(R.id.delete);
+            mSpeedDialView.removeActionItemById(R.id.delete_batch);
         }
         mSpeedDialView.setOnActionSelectedListener(actionItem -> {
             switch(actionItem.getId()) {
-                case R.id.addToQueue:
+                case R.id.add_to_queue_batch:
                     queueChecked();
                     break;
-                case R.id.removeFromQueue:
+                case R.id.remove_from_queue_batch:
                     removeFromQueueChecked();
                     break;
-                case R.id.markAsPlayed:
+                case R.id.mark_read_batch:
                     markedCheckedPlayed();
                     break;
-                case R.id.markAsUnplayed:
+                case R.id.mark_unread_batch:
                     markedCheckedUnplayed();
                     break;
-                case R.id.download:
+                case R.id.download_batch:
                     downloadChecked();
                     break;
-                case R.id.delete:
+                case R.id.delete_batch:
                     deleteChecked();
                     break;
                 default:
diff --git a/app/src/main/res/menu/episodes_apply_action_speeddial.xml b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
index e002a55e8..6c00982e6 100644
--- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml
+++ b/app/src/main/res/menu/episodes_apply_action_speeddial.xml
@@ -5,29 +5,29 @@
          E.g., item @id/delete is the first in the xml,
          visually it will be shown at the bottom of the list of actions.
       -->
-    <item android:id="@+id/delete"
+    <item android:id="@+id/delete_batch"
         android:icon="?attr/content_discard"
         android:title="@string/remove_episode_lable"
         />
-    <item android:id="@+id/download"
+    <item android:id="@+id/download_batch"
         android:icon="?attr/av_download"
         android:title="@string/download_label"
         />
-    <item android:id="@+id/markAsUnplayed"
+    <item android:id="@+id/mark_unread_batch"
         android:icon="?attr/navigation_cancel"
         android:title="@string/mark_unread_label"
         />
     <item
-        android:id="@+id/markAsPlayed"
+        android:id="@+id/mark_read_batch"
         android:icon="?attr/navigation_accept"
         android:title="@string/mark_read_label"
         />
-    <item android:id="@+id/removeFromQueue"
+    <item android:id="@+id/remove_from_queue_batch"
         android:icon="@drawable/ic_remove_grey600"
         android:title="@string/remove_from_queue_label"
         />
     <item
-        android:id="@+id/addToQueue"
+        android:id="@+id/add_to_queue_batch"
         android:icon="?attr/content_new"
         android:title="@string/add_to_queue_label"
         />