diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-01-11 12:47:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-11 12:47:22 +0100 |
commit | 2c45c4cd10ca23e293755e8a2049bb82e43e882f (patch) | |
tree | 1ffe80b1dafb04581aadfaba9823d7cc3f917428 /app/src/main/java/de/danoeh/antennapod/adapter | |
parent | 970cdd99054ac6e6b983c7f5664c5b6c5524107d (diff) | |
parent | 7f1c24e26c831a9c73c83a15d03d51cc4a15f81e (diff) | |
download | AntennaPod-2c45c4cd10ca23e293755e8a2049bb82e43e882f.zip |
Merge pull request #3743 from txtd/mark-as-played
Show "mark as read" rather than "mark as play" in case item has no media
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/adapter')
3 files changed, 5 insertions, 25 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java index eafc4b0a6..f1946d9a8 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java @@ -273,17 +273,7 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR if (item != null) { menu.setHeaderTitle(item.getTitle()); } - - FeedItemMenuHandler.MenuInterface contextMenuInterface = (id, visible) -> { - if (menu == null) { - return; - } - MenuItem item1 = menu.findItem(id); - if (item1 != null) { - item1.setVisible(visible); - } - }; - FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item); + FeedItemMenuHandler.onPrepareMenu(menu, item); } public boolean isCurrentlyPlayingItem() { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java index 5ccec0ade..2a39321ef 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java @@ -179,26 +179,16 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap menu.setHeaderTitle(item.getTitle()); } - FeedItemMenuHandler.MenuInterface contextMenuInterface = (id, visible) -> { - if (menu == null) { - return; - } - MenuItem item1 = menu.findItem(id); - if (item1 != null) { - item1.setVisible(visible); - } - }; - - FeedItemMenuHandler.onPrepareMenu(contextMenuInterface, item, + FeedItemMenuHandler.onPrepareMenu(menu, item, R.id.skip_episode_item); // Skip Episode is not useful in Queue, so hide it. // Queue-specific menu preparation final boolean keepSorted = UserPreferences.isQueueKeepSorted(); final LongList queueAccess = itemAccess.getQueueIds(); if (queueAccess.size() == 0 || queueAccess.get(0) == item.getId() || keepSorted) { - contextMenuInterface.setItemVisibility(R.id.move_to_top_item, false); + menu.findItem(R.id.move_to_top_item).setVisible(false); } if (queueAccess.size() == 0 || queueAccess.get(queueAccess.size()-1) == item.getId() || keepSorted) { - contextMenuInterface.setItemVisibility(R.id.move_to_bottom_item, false); + menu.findItem(R.id.move_to_bottom_item).setVisible(false); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java index 354ded73d..71ac07c47 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java @@ -18,7 +18,7 @@ class MarkAsPlayedActionButton extends ItemActionButton { @Override @StringRes public int getLabel() { - return R.string.mark_read_label; + return (item.hasMedia() ? R.string.mark_read_label : R.string.mark_read_no_media_label); } @Override |