wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: check of drag handler

Browse source
This commit is contained in:
FunkyMuse 2023-09-06 18:42:54 +02:00
parent 9402298d2a
commit 7fa5b71ca8
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
commons/src/main/kotlin/com/simplemobiletools/commons/compose/extensions/DragHandler.kt
View file

@ -19,7 +19,8 @@ fun Modifier.dragHandler(
fun LazyListState.gridItemKeyAtPosition(hitPoint: Offset): Long? =
layoutInfo.visibleItemsInfo
.firstOrNull { lazyListItemInfo ->
hitPoint.y.toInt() in lazyListItemInfo.offset..lazyListItemInfo.offset + lazyListItemInfo.size }
hitPoint.y.toInt() in lazyListItemInfo.offset..lazyListItemInfo.offset + lazyListItemInfo.size
}
?.key as? Long
var initialKey: Long? = null
@ -38,10 +39,8 @@ fun Modifier.dragHandler(
onDragCancel = { initialKey = null; autoScrollSpeed.value = 0f },
onDragEnd = { initialKey = null; autoScrollSpeed.value = 0f },
onDrag = { change, _ ->
val initialKeyNotNull = initialKey
if (initialKeyNotNull != null) {
val distFromBottom =
lazyListState.layoutInfo.viewportSize.height - change.position.y
if (initialKey != null) {
val distFromBottom = lazyListState.layoutInfo.viewportSize.height - change.position.y
val distFromTop = change.position.y
autoScrollSpeed.value = when {
distFromBottom < autoScrollThreshold -> autoScrollThreshold - distFromBottom
@ -52,10 +51,10 @@ fun Modifier.dragHandler(
lazyListState.gridItemKeyAtPosition(change.position)?.let { key ->
if (currentKey != key) {
selectedIds.value = selectedIds.value
.minus(initialKeyNotNull..currentKey!!)
.minus(currentKey!!..initialKeyNotNull)
.plus(initialKeyNotNull..key)
.plus(key..initialKeyNotNull)
.minus(initialKey!!..currentKey!!)
.minus(currentKey!!..initialKey!!)
.plus(initialKey!!..key)
.plus(key..initialKey!!)
currentKey = key
}
}