diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-09-17 22:52:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 22:52:50 +0200 |
| commit | 5f90e0cdf27e5499b35954bc9b434a30fb509586 (patch) | |
| tree | ea8277b2ef221ac461034df45b52ee7fab0048c4 /app | |
| parent | f378d2cf34a949f8f80939134e162b7974275f1e (diff) | |
| parent | ebb0c4574498b06a7591b37049d7ce7767b1a79f (diff) | |
| download | AntennaPod-5f90e0cdf27e5499b35954bc9b434a30fb509586.zip | |
Merge pull request #5413 from ByteHamster/hide-multi-select
Multi-select fixes
Diffstat (limited to 'app')
3 files changed, 7 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java index 689f4fcbc..06bfbedf1 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsRecyclerAdapter.java @@ -133,6 +133,7 @@ public class SubscriptionsRecyclerAdapter extends SelectableAdapter<Subscription MenuInflater inflater = mainActivityRef.get().getMenuInflater(); inflater.inflate(R.menu.nav_feed_context, menu); menu.setHeaderTitle(selectedFeed.getTitle()); + menu.findItem(R.id.multi_select).setVisible(true); } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java index 74661d240..4b3988422 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java @@ -273,8 +273,10 @@ public class CompletedDownloadsFragment extends Fragment implements @Override public void afterBindViewHolder(EpisodeItemViewHolder holder, int pos) { - DeleteActionButton actionButton = new DeleteActionButton(getItem(pos)); - actionButton.configure(holder.secondaryActionButton, holder.secondaryActionIcon, getActivity()); + if (!inActionMode()) { + DeleteActionButton actionButton = new DeleteActionButton(getItem(pos)); + actionButton.configure(holder.secondaryActionButton, holder.secondaryActionIcon, getActivity()); + } } @Override diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml index e2b990023..17c15cbb0 100644 --- a/app/src/main/res/menu/nav_feed_context.xml +++ b/app/src/main/res/menu/nav_feed_context.xml @@ -24,5 +24,6 @@ <item android:id="@+id/multi_select" android:menuCategory="container" - android:title="@string/multi_select" /> + android:title="@string/multi_select" + android:visible="false" /> </menu> |