Compose 1.4, AGP 8.0, refactored forEachGesture with awaitEachGesture #257
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…, refactored onDragStart detection
|
Looks good |
serbelga
reviewed
Nov 11, 2023
| if (down != null && state.onDragStart(down.position.x.toInt(), down.position.y.toInt())) { | ||
| dragStart.offset?.apply { | ||
| state.onDrag(x.toInt(), y.toInt()) | ||
| Modifier.onGloballyPositioned { state.layoutWindowPosition.value = it.positionInWindow()}.pointerInput(Unit) { |
There was a problem hiding this comment.
fun Modifier.reorderable(
state: ReorderableState<*>
): Modifier = this then Modifier.onGloballyPositioned {
state.layoutWindowPosition = it.positionInWindow()
}
serbelga
reviewed
Nov 11, 2023
| awaitLongPressOrCancellation(down)?.also { | ||
| state.interactions.trySend(StartDrag(down.id)) | ||
| } | ||
| fun Modifier.detectReorder(state: ReorderableState<*>) = detect(state){ |
There was a problem hiding this comment.
fun Modifier.detectReorder(state: ReorderableState<*>): Modifier = composed {
var itemPosition by remember { mutableStateOf(Offset.Zero) }
Modifier.onGloballyPositioned {
itemPosition = it.positionInWindow()
}.pointerInput(Unit) {
detectDragGestures(
onDragStart = { offset ->
val relativePosition = itemPosition - state.layoutWindowPosition + offset
state.onDragStart(relativePosition.x.toInt(), relativePosition.y.toInt())
},
onDrag = { change, dragAmount ->
change.consume()
state.onDrag(dragAmount.x.toInt(), dragAmount.y.toInt())
},
onDragCancel = state::onDragCanceled,
onDragEnd = state::onDragCanceled
)
}
}
serbelga
reviewed
Nov 11, 2023
| awaitDragOrCancellation(it) | ||
| } | ||
|
|
||
| fun Modifier.detectReorderAfterLongPress(state: ReorderableState<*>) = detect(state) { |
There was a problem hiding this comment.
fun Modifier.detectReorderAfterLongPress(state: ReorderableState<*>): Modifier = composed {
var itemPosition by remember { mutableStateOf(Offset.Zero) }
Modifier.onGloballyPositioned {
itemPosition = it.positionInWindow()
}.pointerInput(Unit) {
detectDragGesturesAfterLongPress(
onDragStart = { offset ->
val relativePosition = itemPosition - state.layoutWindowPosition + offset
state.onDragStart(relativePosition.x.toInt(), relativePosition.y.toInt())
},
onDrag = { change, dragAmount ->
change.consume()
state.onDrag(dragAmount.x.toInt(), dragAmount.y.toInt())
},
onDragCancel = state::onDragCanceled,
onDragEnd = state::onDragCanceled
)
}
}
|
You can simplify code in Modifiers using |
|
This PR was copied to bpappin#3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates:
Need to be tested and reviewed. Gradle 8.0 could potentionally break something.