tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - improve fling gesture by calculating animation time from velocity, ignore small fling gestures. (#7676)

Browse Source
This commit is contained in:
Tobrun
2017-01-12 21:25:40 +01:00
committed by GitHub
parent a47600a41d
commit 831bb21dc8
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
View File

@@ -50,7 +50,12 @@ public class MapboxConstants {
/**
* Animation time of a fling gesture
*/
public static final long ANIMATION_DURATION_FLING = 350;
public static final long ANIMATION_DURATION_FLING_BASE = ANIMATION_DURATION_SHORT;
/**
* Velocity threshold for a fling gesture
*/
public static final long VELOCITY_THRESHOLD_IGNORE_FLING = 1000;
/**
* The currently supported minimum zoom level.

33
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
View File

@@ -302,21 +302,32 @@ final class MapGestureDetector {
return false;
}
trackingSettings.resetTrackingModesIfRequired(true, false);
// Cancel any animation
transform.cancelTransitions();
float screenDensity = uiSettings.getPixelRatio();
double tilt = transform.getTilt();
// tilt results in a bigger translation, need to limit input #5281, limitFactor ranges from 2 -> 8
double limitFactor = 2 + ((tilt != 0) ? (tilt / 10) : 0);
double offsetX = velocityX / limitFactor / screenDensity;
double offsetY = velocityY / limitFactor / screenDensity;
// calculate velocity vector for xy dimensions, independent from screen size
double velocityXY = Math.hypot(velocityX / screenDensity, velocityY / screenDensity);
if (velocityXY < MapboxConstants.VELOCITY_THRESHOLD_IGNORE_FLING) {
// ignore short flings, these can occur when other gestures just have finished executing
return false;
}
trackingSettings.resetTrackingModesIfRequired(true, false);
// cancel any animation
transform.cancelTransitions();
// tilt results in a bigger translation, limiting input for #5281
double tilt = transform.getTilt();
double tiltFactor = 1 + ((tilt != 0) ? (tilt / 10) : 0); /* 1 -> 7 */
double offsetX = velocityX / tiltFactor / screenDensity;
double offsetY = velocityY / tiltFactor / screenDensity;
// calculate animation time based on displacement
long animationTime = (long) (velocityXY / 7 / tiltFactor + MapboxConstants.ANIMATION_DURATION_FLING_BASE);
// update transformation
transform.setGestureInProgress(true);
transform.moveBy(offsetX, offsetY, MapboxConstants.ANIMATION_DURATION_FLING);
transform.moveBy(offsetX, offsetY, animationTime);
transform.setGestureInProgress(false);
if (onFlingListener != null) {