Merge pull request #13008 from dustdfg/playlist_normal_drag

Allow dragging boorkmarked playlist in both directions
This commit is contained in:
Tobi 2026-01-06 09:11:37 -08:00 committed by GitHub
commit 18291b5bd0

View file

@ -1,6 +1,7 @@
package org.schabi.newpipe.local.bookmark; package org.schabi.newpipe.local.bookmark;
import static org.schabi.newpipe.local.bookmark.MergedPlaylistManager.getMergedOrderedPlaylists; import static org.schabi.newpipe.local.bookmark.MergedPlaylistManager.getMergedOrderedPlaylists;
import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
@ -417,10 +418,11 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
} }
private ItemTouchHelper.SimpleCallback getItemTouchCallback() { private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
// if adding grid layout, also include ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
// with an `if (shouldUseGridLayout()) ...` if (shouldUseGridLayout(requireContext())) {
return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
ItemTouchHelper.ACTION_STATE_IDLE) { }
return new ItemTouchHelper.SimpleCallback(directions, ItemTouchHelper.ACTION_STATE_IDLE) {
@Override @Override
public int interpolateOutOfBoundsScroll(@NonNull final RecyclerView recyclerView, public int interpolateOutOfBoundsScroll(@NonNull final RecyclerView recyclerView,
final int viewSize, final int viewSize,