diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-10-30 12:28:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-30 12:28:45 +0200 |
commit | ee45ec53bcabd317ee402fb4039a98a47641384b (patch) | |
tree | 95c7ee23794c9f964d33f09a1d1e3082985f1fde /app/src/main | |
parent | e9691cfd8e63a92c6157c1e87d932c59195190ce (diff) | |
parent | 9872471685cb83bd373a5219e272743352f909e8 (diff) | |
download | AntennaPod-ee45ec53bcabd317ee402fb4039a98a47641384b.zip |
Merge pull request #5494 from ByteHamster/queue-lock-swipe
Queue lock now no longer influences swiping
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 13a093be3..8591cf42e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -247,8 +247,9 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi () -> DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds(); private void refreshToolbarState() { - toolbar.getMenu().findItem(R.id.queue_lock).setChecked(UserPreferences.isQueueLocked()); boolean keepSorted = UserPreferences.isQueueKeepSorted(); + toolbar.getMenu().findItem(R.id.queue_lock).setChecked(UserPreferences.isQueueLocked()); + toolbar.getMenu().findItem(R.id.queue_lock).setVisible(!keepSorted); toolbar.getMenu().findItem(R.id.queue_sort_random).setVisible(!keepSorted); toolbar.getMenu().findItem(R.id.queue_keep_sorted).setChecked(keepSorted); isUpdatingFeeds = MenuItemUtils.updateRefreshMenuItem(toolbar.getMenu(), @@ -635,11 +636,6 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi } @Override - public boolean isItemViewSwipeEnabled() { - return !UserPreferences.isQueueLocked(); - } - - @Override public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) { super.clearView(recyclerView, viewHolder); // Check if drag finished |