Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bulk edit - refactor - rename menu ids, to be consistent with single edit counterparts

This commit is contained in:
orionlee 2019-04-03 13:40:55 -07:00
parent a1d718a59a
commit 1052b393d2
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
View File

@ -154,41 +154,41 @@ public class EpisodesApplyActionFragment extends Fragment {
// show only specified actions, and bind speed dial UIs to the actual logic // show only specified actions, and bind speed dial UIs to the actual logic
if((actions & ACTION_ADD_TO_QUEUE) == 0) { 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) { 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) { if((actions & ACTION_MARK_PLAYED) == 0) {
mSpeedDialView.removeActionItemById(R.id.markAsPlayed); mSpeedDialView.removeActionItemById(R.id.mark_read_batch);
} }
if((actions & ACTION_MARK_UNPLAYED) == 0) { if((actions & ACTION_MARK_UNPLAYED) == 0) {
mSpeedDialView.removeActionItemById(R.id.markAsUnplayed); mSpeedDialView.removeActionItemById(R.id.mark_unread_batch);
} }
if((actions & ACTION_DOWNLOAD) == 0) { if((actions & ACTION_DOWNLOAD) == 0) {
mSpeedDialView.removeActionItemById(R.id.download); mSpeedDialView.removeActionItemById(R.id.download_batch);
} }
if((actions & ACTION_DELETE) == 0) { if((actions & ACTION_DELETE) == 0) {
mSpeedDialView.removeActionItemById(R.id.delete); mSpeedDialView.removeActionItemById(R.id.delete_batch);
} }
mSpeedDialView.setOnActionSelectedListener(actionItem -> { mSpeedDialView.setOnActionSelectedListener(actionItem -> {
switch(actionItem.getId()) { switch(actionItem.getId()) {
case R.id.addToQueue: case R.id.add_to_queue_batch:
queueChecked(); queueChecked();
break; break;
case R.id.removeFromQueue: case R.id.remove_from_queue_batch:
removeFromQueueChecked(); removeFromQueueChecked();
break; break;
case R.id.markAsPlayed: case R.id.mark_read_batch:
markedCheckedPlayed(); markedCheckedPlayed();
break; break;
case R.id.markAsUnplayed: case R.id.mark_unread_batch:
markedCheckedUnplayed(); markedCheckedUnplayed();
break; break;
case R.id.download: case R.id.download_batch:
downloadChecked(); downloadChecked();
break; break;
case R.id.delete: case R.id.delete_batch:
deleteChecked(); deleteChecked();
break; break;
default: default:

12
app/src/main/res/menu/episodes_apply_action_speeddial.xml
View File

@ -5,29 +5,29 @@
E.g., item @id/delete is the first in the xml, E.g., item @id/delete is the first in the xml,
visually it will be shown at the bottom of the list of actions. 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:icon="?attr/content_discard"
android:title="@string/remove_episode_lable" android:title="@string/remove_episode_lable"
/> />
<item android:id="@+id/download" <item android:id="@+id/download_batch"
android:icon="?attr/av_download" android:icon="?attr/av_download"
android:title="@string/download_label" android:title="@string/download_label"
/> />
<item android:id="@+id/markAsUnplayed" <item android:id="@+id/mark_unread_batch"
android:icon="?attr/navigation_cancel" android:icon="?attr/navigation_cancel"
android:title="@string/mark_unread_label" android:title="@string/mark_unread_label"
/> />
<item <item
android:id="@+id/markAsPlayed" android:id="@+id/mark_read_batch"
android:icon="?attr/navigation_accept" android:icon="?attr/navigation_accept"
android:title="@string/mark_read_label" 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:icon="@drawable/ic_remove_grey600"
android:title="@string/remove_from_queue_label" android:title="@string/remove_from_queue_label"
/> />
<item <item
android:id="@+id/addToQueue" android:id="@+id/add_to_queue_batch"
android:icon="?attr/content_new" android:icon="?attr/content_new"
android:title="@string/add_to_queue_label" android:title="@string/add_to_queue_label"
/> />