Merge pull request #5494 from ByteHamster/queue-lock-swipe
Queue lock now no longer influences swiping
This commit is contained in:
commit
ee45ec53bc
@ -247,8 +247,9 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi
|
|||||||
() -> DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds();
|
() -> DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds();
|
||||||
|
|
||||||
private void refreshToolbarState() {
|
private void refreshToolbarState() {
|
||||||
toolbar.getMenu().findItem(R.id.queue_lock).setChecked(UserPreferences.isQueueLocked());
|
|
||||||
boolean keepSorted = UserPreferences.isQueueKeepSorted();
|
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_sort_random).setVisible(!keepSorted);
|
||||||
toolbar.getMenu().findItem(R.id.queue_keep_sorted).setChecked(keepSorted);
|
toolbar.getMenu().findItem(R.id.queue_keep_sorted).setChecked(keepSorted);
|
||||||
isUpdatingFeeds = MenuItemUtils.updateRefreshMenuItem(toolbar.getMenu(),
|
isUpdatingFeeds = MenuItemUtils.updateRefreshMenuItem(toolbar.getMenu(),
|
||||||
@ -634,11 +635,6 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isItemViewSwipeEnabled() {
|
|
||||||
return !UserPreferences.isQueueLocked();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
|
public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
|
||||||
super.clearView(recyclerView, viewHolder);
|
super.clearView(recyclerView, viewHolder);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user