Bug 1810780 - Add reorder gesture to composed tabs tray
Alexandru2909
10 months ago
committed by
mergify[bot]
parent
26f92d8590
commit
ed303f6814
@ -0,0 +1,294 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.fenix.tabstray.browser.compose
|
||||
|
||||
import androidx.compose.animation.core.Animatable
|
||||
import androidx.compose.animation.core.Spring
|
||||
import androidx.compose.animation.core.VectorConverter
|
||||
import androidx.compose.animation.core.VisibilityThreshold
|
||||
import androidx.compose.animation.core.spring
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||
import androidx.compose.foundation.gestures.detectDragGestures
|
||||
import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
|
||||
import androidx.compose.foundation.gestures.scrollBy
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.lazy.grid.LazyGridItemInfo
|
||||
import androidx.compose.foundation.lazy.grid.LazyGridItemScope
|
||||
import androidx.compose.foundation.lazy.grid.LazyGridState
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.geometry.Offset
|
||||
import androidx.compose.ui.graphics.graphicsLayer
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedback
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||
import androidx.compose.ui.input.pointer.pointerInput
|
||||
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||
import androidx.compose.ui.platform.LocalViewConfiguration
|
||||
import androidx.compose.ui.unit.IntOffset
|
||||
import androidx.compose.ui.unit.toOffset
|
||||
import androidx.compose.ui.unit.toSize
|
||||
import androidx.compose.ui.zIndex
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/**
|
||||
* Remember the reordering state for reordering grid items.
|
||||
*
|
||||
* @param gridState State of the grid.
|
||||
* @param onMove Callback to be invoked when switching between two items.
|
||||
* @param ignoredItems List of keys for non-draggable items.
|
||||
* @param onLongPress Optional callback to be invoked when long pressing an item.
|
||||
* @param onExitLongPress Optional callback to be invoked when the item is dragged after long press.
|
||||
*/
|
||||
@Composable
|
||||
fun createGridReorderState(
|
||||
gridState: LazyGridState,
|
||||
onMove: (LazyGridItemInfo, LazyGridItemInfo) -> Unit,
|
||||
ignoredItems: List<Any>,
|
||||
onLongPress: (LazyGridItemInfo) -> Unit = {},
|
||||
onExitLongPress: () -> Unit = {},
|
||||
): GridReorderState {
|
||||
val scope = rememberCoroutineScope()
|
||||
val touchSlop = LocalViewConfiguration.current.touchSlop
|
||||
val hapticFeedback = LocalHapticFeedback.current
|
||||
val state = remember(gridState) {
|
||||
GridReorderState(
|
||||
gridState = gridState,
|
||||
onMove = onMove,
|
||||
scope = scope,
|
||||
touchSlop = touchSlop,
|
||||
ignoredItems = ignoredItems,
|
||||
onLongPress = onLongPress,
|
||||
hapticFeedback = hapticFeedback,
|
||||
onExitLongPress = onExitLongPress,
|
||||
)
|
||||
}
|
||||
return state
|
||||
}
|
||||
|
||||
/**
|
||||
* Class containing details about the current state of dragging in grid.
|
||||
*
|
||||
* @param gridState State of the grid.
|
||||
* @param scope [CoroutineScope] used for scrolling to the target item.
|
||||
* @param hapticFeedback [HapticFeedback] used for performing haptic feedback on item long press.
|
||||
* @param touchSlop Distance in pixels the user can wander until we consider they started dragging.
|
||||
* @param onMove Callback to be invoked when switching between two items.
|
||||
* @param onLongPress Optional callback to be invoked when long pressing an item.
|
||||
* @param onExitLongPress Optional callback to be invoked when the item is dragged after long press.
|
||||
* @param ignoredItems List of keys for non-draggable items.
|
||||
*/
|
||||
class GridReorderState internal constructor(
|
||||
private val gridState: LazyGridState,
|
||||
private val scope: CoroutineScope,
|
||||
private val hapticFeedback: HapticFeedback,
|
||||
private val touchSlop: Float,
|
||||
private val onMove: (LazyGridItemInfo, LazyGridItemInfo) -> Unit,
|
||||
private val onLongPress: (LazyGridItemInfo) -> Unit = {},
|
||||
private val onExitLongPress: () -> Unit = {},
|
||||
private val ignoredItems: List<Any> = emptyList(),
|
||||
) {
|
||||
internal var draggingItemKey by mutableStateOf<Any?>(null)
|
||||
private set
|
||||
|
||||
private var draggingItemCumulatedOffset by mutableStateOf(Offset.Zero)
|
||||
private var draggingItemInitialOffset by mutableStateOf(Offset.Zero)
|
||||
internal var moved by mutableStateOf(false)
|
||||
internal val draggingItemOffset: Offset
|
||||
get() = draggingItemLayoutInfo?.let { item ->
|
||||
draggingItemInitialOffset + draggingItemCumulatedOffset - item.offset.toOffset()
|
||||
} ?: Offset.Zero
|
||||
|
||||
private val draggingItemLayoutInfo: LazyGridItemInfo?
|
||||
get() = gridState.layoutInfo.visibleItemsInfo.firstOrNull { it.key == draggingItemKey }
|
||||
|
||||
internal var previousKeyOfDraggedItem by mutableStateOf<Any?>(null)
|
||||
private set
|
||||
internal var previousItemOffset = Animatable(Offset.Zero, Offset.VectorConverter)
|
||||
private set
|
||||
|
||||
internal fun onTouchSlopPassed(offset: Offset, shouldLongPress: Boolean) {
|
||||
gridState.findItem(offset)?.also {
|
||||
draggingItemKey = it.key
|
||||
if (shouldLongPress) {
|
||||
hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
|
||||
onLongPress(it)
|
||||
}
|
||||
draggingItemInitialOffset = it.offset.toOffset()
|
||||
moved = !shouldLongPress
|
||||
}
|
||||
}
|
||||
|
||||
internal fun onDragInterrupted() {
|
||||
if (draggingItemKey != null) {
|
||||
previousKeyOfDraggedItem = draggingItemKey
|
||||
val startOffset = draggingItemOffset
|
||||
scope.launch {
|
||||
previousItemOffset.snapTo(startOffset)
|
||||
previousItemOffset.animateTo(
|
||||
Offset.Zero,
|
||||
spring(
|
||||
stiffness = Spring.StiffnessMediumLow,
|
||||
visibilityThreshold = Offset.VisibilityThreshold,
|
||||
),
|
||||
)
|
||||
previousKeyOfDraggedItem = null
|
||||
}
|
||||
}
|
||||
draggingItemCumulatedOffset = Offset.Zero
|
||||
draggingItemKey = null
|
||||
draggingItemInitialOffset = Offset.Zero
|
||||
}
|
||||
|
||||
internal fun onDrag(offset: Offset) {
|
||||
draggingItemCumulatedOffset += offset
|
||||
|
||||
if (draggingItemLayoutInfo == null) {
|
||||
moved = false
|
||||
}
|
||||
val draggingItem = draggingItemLayoutInfo ?: return
|
||||
|
||||
if (!moved && draggingItemCumulatedOffset.getDistance() > touchSlop) {
|
||||
onExitLongPress()
|
||||
}
|
||||
val startOffset = draggingItem.offset.toOffset() + draggingItemOffset
|
||||
val endOffset = Offset(
|
||||
startOffset.x + draggingItem.size.toSize().width,
|
||||
startOffset.y + draggingItem.size.toSize().height,
|
||||
)
|
||||
val middleOffset = startOffset + (endOffset - startOffset) / 2f
|
||||
|
||||
val targetItem = gridState.layoutInfo.visibleItemsInfo.find { item ->
|
||||
middleOffset.x.toInt() in item.offset.x..item.endOffset.x &&
|
||||
middleOffset.y.toInt() in item.offset.y..item.endOffset.y &&
|
||||
draggingItemKey != item.key
|
||||
}
|
||||
if (targetItem != null && targetItem.key !in ignoredItems) {
|
||||
if (draggingItem.index == gridState.firstVisibleItemIndex) {
|
||||
scope.launch {
|
||||
gridState.scrollBy(-draggingItem.size.height.toFloat())
|
||||
}
|
||||
}
|
||||
onMove.invoke(draggingItem, targetItem)
|
||||
} else {
|
||||
val overscroll = when {
|
||||
draggingItemCumulatedOffset.y > 0 ->
|
||||
(endOffset.y - gridState.layoutInfo.viewportEndOffset).coerceAtLeast(0f)
|
||||
|
||||
draggingItemCumulatedOffset.y < 0 ->
|
||||
(startOffset.y - gridState.layoutInfo.viewportStartOffset).coerceAtMost(0f)
|
||||
|
||||
else -> 0f
|
||||
}
|
||||
if (overscroll != 0f) {
|
||||
scope.launch {
|
||||
gridState.scrollBy(overscroll)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Container for draggable grid item.
|
||||
*
|
||||
* @param state State of the lazy grid.
|
||||
* @param key Key of the item to be displayed.
|
||||
* @param content Content of the item to be displayed.
|
||||
*/
|
||||
@ExperimentalFoundationApi
|
||||
@Composable
|
||||
fun LazyGridItemScope.DragItemContainer(
|
||||
state: GridReorderState,
|
||||
key: Any,
|
||||
content: @Composable () -> Unit,
|
||||
) {
|
||||
val modifier = when (key) {
|
||||
state.draggingItemKey -> {
|
||||
Modifier
|
||||
.zIndex(1f)
|
||||
.graphicsLayer {
|
||||
translationX = state.draggingItemOffset.x
|
||||
translationY = state.draggingItemOffset.y
|
||||
}
|
||||
}
|
||||
|
||||
state.previousKeyOfDraggedItem -> {
|
||||
Modifier
|
||||
.zIndex(1f)
|
||||
.graphicsLayer {
|
||||
translationX = state.previousItemOffset.value.x
|
||||
translationY = state.previousItemOffset.value.y
|
||||
}
|
||||
}
|
||||
|
||||
else -> {
|
||||
Modifier
|
||||
.zIndex(0f)
|
||||
.animateItemPlacement(tween())
|
||||
}
|
||||
}
|
||||
|
||||
Box(modifier = modifier, propagateMinConstraints = true) {
|
||||
content()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate the offset of an item taking its width and height into account.
|
||||
*/
|
||||
private val LazyGridItemInfo.endOffset: IntOffset
|
||||
get() = IntOffset(offset.x + size.width, offset.y + size.height)
|
||||
|
||||
/**
|
||||
* Find item based on position on screen.
|
||||
*
|
||||
* @param offset Position on screen used to find the item.
|
||||
*/
|
||||
private fun LazyGridState.findItem(offset: Offset) =
|
||||
layoutInfo.visibleItemsInfo.firstOrNull { item ->
|
||||
offset.x.toInt() in item.offset.x..item.endOffset.x && offset.y.toInt() in item.offset.y..item.endOffset.y
|
||||
}
|
||||
|
||||
/**
|
||||
* Detects press, long press and drag gestures.
|
||||
*
|
||||
* @param gridState State of the grid.
|
||||
* @param reorderState Grid reordering state used for dragging callbacks.
|
||||
* @param shouldLongPressToDrag Whether or not an item should be long pressed to start the dragging gesture.
|
||||
*/
|
||||
fun Modifier.detectGridPressAndDragGestures(
|
||||
gridState: LazyGridState,
|
||||
reorderState: GridReorderState,
|
||||
shouldLongPressToDrag: Boolean,
|
||||
): Modifier = pointerInput(gridState, shouldLongPressToDrag) {
|
||||
if (shouldLongPressToDrag) {
|
||||
detectDragGesturesAfterLongPress(
|
||||
onDragStart = { offset -> reorderState.onTouchSlopPassed(offset, true) },
|
||||
onDrag = { change, dragAmount ->
|
||||
change.consume()
|
||||
reorderState.onDrag(dragAmount)
|
||||
},
|
||||
onDragEnd = reorderState::onDragInterrupted,
|
||||
onDragCancel = reorderState::onDragInterrupted,
|
||||
)
|
||||
} else {
|
||||
detectDragGestures(
|
||||
onDragStart = { offset -> reorderState.onTouchSlopPassed(offset, false) },
|
||||
onDrag = { change, dragAmount ->
|
||||
change.consume()
|
||||
reorderState.onDrag(dragAmount)
|
||||
},
|
||||
onDragEnd = reorderState::onDragInterrupted,
|
||||
onDragCancel = reorderState::onDragInterrupted,
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,271 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.fenix.tabstray.browser.compose
|
||||
|
||||
import androidx.compose.animation.core.Animatable
|
||||
import androidx.compose.animation.core.Spring
|
||||
import androidx.compose.animation.core.spring
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||
import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
|
||||
import androidx.compose.foundation.gestures.scrollBy
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.lazy.LazyItemScope
|
||||
import androidx.compose.foundation.lazy.LazyListItemInfo
|
||||
import androidx.compose.foundation.lazy.LazyListState
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.graphicsLayer
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedback
|
||||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
|
||||
import androidx.compose.ui.input.pointer.pointerInput
|
||||
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||
import androidx.compose.ui.platform.LocalViewConfiguration
|
||||
import androidx.compose.ui.zIndex
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/**
|
||||
* Remember the reordering state for reordering list items.
|
||||
*
|
||||
* @param listState State of the list.
|
||||
* @param onMove Callback to be invoked when switching between two items.
|
||||
* @param ignoredItems List of keys for non-draggable items.
|
||||
* @param onLongPress Callback to be invoked when long pressing an item.
|
||||
* @param onExitLongPress Callback to be invoked when the item is dragged after long press.
|
||||
*/
|
||||
@Composable
|
||||
fun createListReorderState(
|
||||
listState: LazyListState,
|
||||
onMove: (LazyListItemInfo, LazyListItemInfo) -> Unit,
|
||||
ignoredItems: List<Any>,
|
||||
onLongPress: (LazyListItemInfo) -> Unit = {},
|
||||
onExitLongPress: () -> Unit = {},
|
||||
): ListReorderState {
|
||||
val scope = rememberCoroutineScope()
|
||||
val touchSlop = LocalViewConfiguration.current.touchSlop
|
||||
val hapticFeedback = LocalHapticFeedback.current
|
||||
val state = remember(listState) {
|
||||
ListReorderState(
|
||||
listState = listState,
|
||||
onMove = onMove,
|
||||
scope = scope,
|
||||
touchSlop = touchSlop,
|
||||
hapticFeedback = hapticFeedback,
|
||||
ignoredItems = ignoredItems,
|
||||
onLongPress = onLongPress,
|
||||
onExitLongPress = onExitLongPress,
|
||||
)
|
||||
}
|
||||
return state
|
||||
}
|
||||
|
||||
/**
|
||||
* Class containing details about the current state of dragging in list.
|
||||
*
|
||||
* @param listState State of the list.
|
||||
* @param scope [CoroutineScope] used for scrolling to the target item.
|
||||
* @param hapticFeedback [HapticFeedback] used for performing haptic feedback on item long press.
|
||||
* @param touchSlop Distance in pixels the user can wander until we consider they started dragging.
|
||||
* @param onMove Callback to be invoked when switching between two items.
|
||||
* @param onLongPress Optional callback to be invoked when long pressing an item.
|
||||
* @param onExitLongPress Optional callback to be invoked when the item is dragged after long press.
|
||||
* @param ignoredItems List of keys for non-draggable items.
|
||||
*/
|
||||
@Suppress("LongParameterList")
|
||||
class ListReorderState internal constructor(
|
||||
private val listState: LazyListState,
|
||||
private val scope: CoroutineScope,
|
||||
private val hapticFeedback: HapticFeedback,
|
||||
private val touchSlop: Float,
|
||||
private val onMove: (LazyListItemInfo, LazyListItemInfo) -> Unit,
|
||||
private val ignoredItems: List<Any>,
|
||||
private val onLongPress: (LazyListItemInfo) -> Unit,
|
||||
private val onExitLongPress: () -> Unit,
|
||||
) {
|
||||
var draggingItemKey by mutableStateOf<Any?>(null)
|
||||
private set
|
||||
|
||||
private var draggingItemCumulatedOffset by mutableStateOf(0f)
|
||||
private var draggingItemInitialOffset by mutableStateOf(0f)
|
||||
internal var moved by mutableStateOf(false)
|
||||
internal val draggingItemOffset: Float
|
||||
get() = draggingItemLayoutInfo?.let { item ->
|
||||
draggingItemInitialOffset + draggingItemCumulatedOffset - item.offset
|
||||
} ?: 0f
|
||||
|
||||
private val draggingItemLayoutInfo: LazyListItemInfo?
|
||||
get() = listState.layoutInfo.visibleItemsInfo.firstOrNull { it.key == draggingItemKey }
|
||||
|
||||
internal var previousKeyOfDraggedItem by mutableStateOf<Any?>(null)
|
||||
private set
|
||||
internal var previousItemOffset = Animatable(0f)
|
||||
private set
|
||||
|
||||
internal fun onTouchSlopPassed(offset: Float, shouldLongPress: Boolean) {
|
||||
listState.findItem(offset)?.also {
|
||||
draggingItemKey = it.key
|
||||
if (shouldLongPress) {
|
||||
hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
|
||||
onLongPress(it)
|
||||
}
|
||||
draggingItemInitialOffset = it.offset.toFloat()
|
||||
moved = !shouldLongPress
|
||||
}
|
||||
}
|
||||
|
||||
internal fun onDragInterrupted() {
|
||||
if (draggingItemKey != null) {
|
||||
previousKeyOfDraggedItem = draggingItemKey
|
||||
val startOffset = draggingItemOffset
|
||||
scope.launch {
|
||||
previousItemOffset.snapTo(startOffset)
|
||||
previousItemOffset.animateTo(
|
||||
0f,
|
||||
spring(
|
||||
stiffness = Spring.StiffnessMediumLow,
|
||||
visibilityThreshold = 1f,
|
||||
),
|
||||
)
|
||||
previousKeyOfDraggedItem = null
|
||||
}
|
||||
}
|
||||
draggingItemCumulatedOffset = 0f
|
||||
draggingItemKey = null
|
||||
draggingItemInitialOffset = 0f
|
||||
}
|
||||
|
||||
internal fun onDrag(offset: Float) {
|
||||
draggingItemCumulatedOffset += offset
|
||||
|
||||
if (draggingItemLayoutInfo == null) {
|
||||
moved = false
|
||||
}
|
||||
val draggingItem = draggingItemLayoutInfo ?: return
|
||||
|
||||
if (!moved && draggingItemCumulatedOffset > touchSlop) {
|
||||
onExitLongPress()
|
||||
}
|
||||
val startOffset = draggingItem.offset + draggingItemOffset
|
||||
val endOffset = startOffset + draggingItem.size
|
||||
val middleOffset = startOffset + (endOffset - startOffset) / 2f
|
||||
|
||||
val targetItem = listState.layoutInfo.visibleItemsInfo.find { item ->
|
||||
middleOffset.toInt() in item.offset..item.endOffset && draggingItemKey != item.key
|
||||
}
|
||||
|
||||
if (targetItem != null && targetItem.key !in ignoredItems) {
|
||||
if (draggingItem.index == listState.firstVisibleItemIndex) {
|
||||
scope.launch {
|
||||
listState.scrollBy(-draggingItem.size.toFloat())
|
||||
}
|
||||
}
|
||||
onMove.invoke(draggingItem, targetItem)
|
||||
} else {
|
||||
val overscroll = when {
|
||||
draggingItemCumulatedOffset > 0 ->
|
||||
(endOffset - listState.layoutInfo.viewportEndOffset).coerceAtLeast(0f)
|
||||
|
||||
draggingItemCumulatedOffset < 0 ->
|
||||
(startOffset - listState.layoutInfo.viewportStartOffset).coerceAtMost(0f)
|
||||
|
||||
else -> 0f
|
||||
}
|
||||
if (overscroll != 0f) {
|
||||
scope.launch {
|
||||
listState.scrollBy(overscroll)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Container for draggable list item.
|
||||
*
|
||||
* @param state List reordering state.
|
||||
* @param key Key of the item to be displayed.
|
||||
* @param content Content of the item to be displayed.
|
||||
*/
|
||||
@ExperimentalFoundationApi
|
||||
@Composable
|
||||
fun LazyItemScope.DragItemContainer(
|
||||
state: ListReorderState,
|
||||
key: Any,
|
||||
content: @Composable () -> Unit,
|
||||
) {
|
||||
val modifier = when (key) {
|
||||
state.draggingItemKey -> {
|
||||
Modifier
|
||||
.zIndex(1f)
|
||||
.graphicsLayer {
|
||||
translationY = state.draggingItemOffset
|
||||
}
|
||||
}
|
||||
|
||||
state.previousKeyOfDraggedItem -> {
|
||||
Modifier
|
||||
.zIndex(1f)
|
||||
.graphicsLayer {
|
||||
translationY = state.previousItemOffset.value
|
||||
}
|
||||
}
|
||||
|
||||
else -> {
|
||||
Modifier
|
||||
.zIndex(0f)
|
||||
.animateItemPlacement(tween())
|
||||
}
|
||||
}
|
||||
Box(modifier = modifier, propagateMinConstraints = true) {
|
||||
content()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates the offset of an item taking its height into account.
|
||||
*/
|
||||
private val LazyListItemInfo.endOffset: Int
|
||||
get() = offset + size
|
||||
|
||||
/**
|
||||
* Find item based on position on screen.
|
||||
*
|
||||
* @param offset Position on screen used to find the item.
|
||||
*/
|
||||
private fun LazyListState.findItem(offset: Float) =
|
||||
layoutInfo.visibleItemsInfo.firstOrNull { item ->
|
||||
offset.toInt() in item.offset..item.endOffset
|
||||
}
|
||||
|
||||
/**
|
||||
* Detects press, long press and drag gestures.
|
||||
*
|
||||
* @param listState State of the list.
|
||||
* @param reorderState List reordering state used for dragging callbacks.
|
||||
* @param shouldLongPressToDrag Whether or not an item should be long pressed to start the dragging gesture.
|
||||
*/
|
||||
fun Modifier.detectVerticalPressAndDrag(
|
||||
listState: LazyListState,
|
||||
reorderState: ListReorderState,
|
||||
shouldLongPressToDrag: Boolean,
|
||||
): Modifier = pointerInput(listState, shouldLongPressToDrag) {
|
||||
if (shouldLongPressToDrag) {
|
||||
detectDragGesturesAfterLongPress(
|
||||
onDragStart = { offset -> reorderState.onTouchSlopPassed(offset.y, true) },
|
||||
onDrag = { change, dragAmount ->
|
||||
change.consume()
|
||||
reorderState.onDrag(dragAmount.y)
|
||||
},
|
||||
onDragEnd = reorderState::onDragInterrupted,
|
||||
onDragCancel = reorderState::onDragInterrupted,
|
||||
)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue