Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bulk edit - refactor - rename internal constant flags so that the names are consistent

Browse Source
This commit is contained in:
orionlee 2019-04-03 13:31:32 -07:00
parent 4322e8646f
commit a1d718a59a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,14 +42,14 @@ public class EpisodesApplyActionFragment extends Fragment {
public static final String TAG = "EpisodeActionFragment"; public static final String TAG = "EpisodeActionFragment";
public static final int ACTION_QUEUE = 1; public static final int ACTION_ADD_TO_QUEUE = 1;
private static final int ACTION_MARK_PLAYED = 2; private static final int ACTION_REMOVE_FROM_QUEUE = 2;
private static final int ACTION_MARK_UNPLAYED = 4; private static final int ACTION_MARK_PLAYED = 4;
private static final int ACTION_DOWNLOAD = 8; private static final int ACTION_MARK_UNPLAYED = 8;
public static final int ACTION_REMOVE = 16; private static final int ACTION_DOWNLOAD = 16;
public static final int ACTION_REMOVE_FROM_QUEUE = 32; public static final int ACTION_DELETE = 32;
private static final int ACTION_ALL = ACTION_QUEUE | ACTION_REMOVE_FROM_QUEUE private static final int ACTION_ALL = ACTION_ADD_TO_QUEUE | ACTION_REMOVE_FROM_QUEUE
| ACTION_MARK_PLAYED | ACTION_MARK_UNPLAYED | ACTION_DOWNLOAD | ACTION_REMOVE; | ACTION_MARK_PLAYED | ACTION_MARK_UNPLAYED | ACTION_DOWNLOAD | ACTION_DELETE;
private ListView mListView; private ListView mListView;
private ArrayAdapter<String> mAdapter; private ArrayAdapter<String> mAdapter;
@ -153,7 +153,7 @@ public class EpisodesApplyActionFragment extends Fragment {
mSpeedDialView.inflate(R.menu.episodes_apply_action_speeddial); mSpeedDialView.inflate(R.menu.episodes_apply_action_speeddial);
// 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_QUEUE) == 0) { if((actions & ACTION_ADD_TO_QUEUE) == 0) {
mSpeedDialView.removeActionItemById(R.id.addToQueue); mSpeedDialView.removeActionItemById(R.id.addToQueue);
} }
if((actions & ACTION_REMOVE_FROM_QUEUE) == 0) { if((actions & ACTION_REMOVE_FROM_QUEUE) == 0) {
@ -168,7 +168,7 @@ public class EpisodesApplyActionFragment extends Fragment {
if((actions & ACTION_DOWNLOAD) == 0) { if((actions & ACTION_DOWNLOAD) == 0) {
mSpeedDialView.removeActionItemById(R.id.download); mSpeedDialView.removeActionItemById(R.id.download);
} }
if((actions & ACTION_REMOVE) == 0) { if((actions & ACTION_DELETE) == 0) {
mSpeedDialView.removeActionItemById(R.id.delete); mSpeedDialView.removeActionItemById(R.id.delete);
} }
mSpeedDialView.setOnActionSelectedListener(actionItem -> { mSpeedDialView.setOnActionSelectedListener(actionItem -> {

2
app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
View File

@ -143,7 +143,7 @@ public class CompletedDownloadsFragment extends ListFragment {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.episode_actions: case R.id.episode_actions:
EpisodesApplyActionFragment fragment = EpisodesApplyActionFragment EpisodesApplyActionFragment fragment = EpisodesApplyActionFragment
.newInstance(items, EpisodesApplyActionFragment.ACTION_REMOVE | EpisodesApplyActionFragment.ACTION_QUEUE); .newInstance(items, EpisodesApplyActionFragment.ACTION_DELETE | EpisodesApplyActionFragment.ACTION_ADD_TO_QUEUE);
((MainActivity) getActivity()).loadChildFragment(fragment); ((MainActivity) getActivity()).loadChildFragment(fragment);
return true; return true;
default: default: