Skip to content

Add modified ScaleGestureDetector from AOSP #1879

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
tomekzaw merged 4 commits into from
Mar 1, 2022
Merged

Add modified ScaleGestureDetector from AOSP #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62e2cf8
Copy `ScaleGestureDetector` from AOSP
j-piasecki Feb 23, 2022
5fd610f
Update ScaleGestureDetector and use it
j-piasecki Feb 23, 2022
2b41e89
Delete NOTICE
kmagiera Mar 1, 2022
186ffc8
Update ScaleGestureDetector.java
kmagiera Mar 1, 2022
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
6 changes: 2 additions & 4 deletions android/lib/src/main/java/com/swmansion/gesturehandler/PinchGestureHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.swmansion.gesturehandler

import android.view.MotionEvent
import android.view.ScaleGestureDetector
import android.view.ScaleGestureDetector.OnScaleGestureListener
import android.view.ViewConfiguration
import kotlin.math.abs

Expand All @@ -19,7 +17,7 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
private var scaleGestureDetector: ScaleGestureDetector? = null
private var startingSpan = 0f
private var spanSlop = 0f
private val gestureListener: OnScaleGestureListener = object : OnScaleGestureListener {
private val gestureListener: ScaleGestureDetector.OnScaleGestureListener = object : ScaleGestureDetector.OnScaleGestureListener {
override fun onScale(detector: ScaleGestureDetector): Boolean {
val prevScaleFactor: Double = scale
scale *= detector.scaleFactor.toDouble()
Expand All @@ -28,7 +26,7 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
velocity = (scale - prevScaleFactor) / delta
}
if (abs(startingSpan - detector.currentSpan) >= spanSlop
&& state == STATE_BEGAN) {
&& state == STATE_BEGAN) {
activate()
}
return true
Expand Down
Loading