Skip to content

Fix of rotation and pinch gesture on android #2983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coado merged 7 commits into from
Jul 9, 2024
Merged

Fix of rotation and pinch gesture on android #2983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae06290
Fix rotation and pinch gesture on android
Jul 4, 2024
5b30e8c
remove unused vars
coado Jul 4, 2024
cbf3771
Update android/src/main/java/com/swmansion/gesturehandler/core/Rotati…
coado Jul 5, 2024
5e820d6
Update android/src/main/java/com/swmansion/gesturehandler/core/Rotati…
coado Jul 5, 2024
2df344c
removing useless code
coado Jul 5, 2024
c8716e3
resolving build issues
coado Jul 5, 2024
c98b9b3
minor pinch and rotation gesture handler fixes
coado Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions android/src/main/java/com/swmansion/gesturehandler/core/PinchGestureHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,13 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
this.focalPointX = point.x
this.focalPointY = point.y
}
var activePointers = sourceEvent.pointerCount
if (sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_UP) {
activePointers -= 1
}
if (state == STATE_ACTIVE && activePointers < 2) {
end()
} else if (sourceEvent.actionMasked == MotionEvent.ACTION_UP) {
fail()

if (sourceEvent.actionMasked == MotionEvent.ACTION_UP) {
if (state == STATE_ACTIVE) {
end()
} else {
fail()
}
}
}

Expand Down
18 changes: 14 additions & 4 deletions android/src/main/java/com/swmansion/gesturehandler/core/RotationGestureDetector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,21 @@ class RotationGestureDetector(private val gestureListener: OnRotationGestureList
updateCurrent(event)
gestureListener?.onRotation(this)
}
MotionEvent.ACTION_POINTER_UP -> if (isInProgress) {
MotionEvent.ACTION_POINTER_UP -> {
val pointerId = event.getPointerId(event.actionIndex)
if (pointerId == pointerIds[0] || pointerId == pointerIds[1]) {
// One of the key pointer has been lifted up, we have to end the gesture
finish()

// All key pointers are up
if (!isInProgress && pointerId == pointerIds[0]) {
gestureListener?.onRotationEnd(this)
}

// One of the key pointers is up
if (isInProgress && pointerIds.contains(pointerId)) {
if (pointerId == pointerIds[0]) {
pointerIds[0] = pointerIds[1]
}
pointerIds[1] = MotionEvent.INVALID_POINTER_ID
isInProgress = false
}
Comment thread
j-piasecki marked this conversation as resolved.
}
MotionEvent.ACTION_UP -> finish()
Expand Down