1 files changed, 89 insertions, 40 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index d6bde6c481..865b3c97aa 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -77,6 +77,13 @@ final class MapGestureDetector {
   private final CopyOnWriteArrayList<MapboxMap.OnShoveListener> onShoveListenerList
     = new CopyOnWriteArrayList<>();
 
+  private StandardGestureListener standardGestureListener;
+  private MoveGestureListener moveGestureListener;
+  private ScaleGestureListener scaleGestureListener;
+  private RotateGestureListener rotateGestureListener;
+  private ShoveGestureListener shoveGestureListener;
+  private TapGestureListener tapGestureListener;
+
   /**
    * User-set focal point.
    */
@@ -105,8 +112,30 @@ final class MapGestureDetector {
 
     // Checking for context != null for testing purposes
     if (context != null) {
-      gesturesManager = new AndroidGesturesManager(context);
+      // Initialize gesture listeners
+      initializeGestureListeners(context);
 
+      // Initialize gestures manager
+      AndroidGesturesManager androidGesturesManager = new AndroidGesturesManager(context);
+      initializeGesturesManager(androidGesturesManager, true, true);
+    }
+  }
+
+  private void initializeGestureListeners(Context context) {
+    standardGestureListener = new StandardGestureListener();
+    moveGestureListener = new MoveGestureListener();
+    scaleGestureListener = new ScaleGestureListener(
+      context.getResources().getDimension(R.dimen.mapbox_minimum_scale_velocity));
+    rotateGestureListener = new RotateGestureListener(
+      context.getResources().getDimension(R.dimen.mapbox_minimum_scale_span_when_rotating),
+      context.getResources().getDimension(R.dimen.mapbox_minimum_angular_velocity));
+    shoveGestureListener = new ShoveGestureListener();
+    tapGestureListener = new TapGestureListener();
+  }
+
+  private void initializeGesturesManager(AndroidGesturesManager androidGesturesManager,
+                                         boolean attachDefaultListeners, boolean setDefaultMutuallyExclusives) {
+    if (setDefaultMutuallyExclusives) {
       Set<Integer> shoveScaleSet = new HashSet<>();
       shoveScaleSet.add(AndroidGesturesManager.GESTURE_TYPE_SHOVE);
       shoveScaleSet.add(AndroidGesturesManager.GESTURE_TYPE_SCALE);
@@ -119,20 +148,19 @@ final class MapGestureDetector {
       ScaleLongPressSet.add(AndroidGesturesManager.GESTURE_TYPE_SCALE);
       ScaleLongPressSet.add(AndroidGesturesManager.GESTURE_TYPE_LONG_PRESS);
 
-      gesturesManager.setMutuallyExclusiveGestures(shoveScaleSet, shoveRotateSet, ScaleLongPressSet);
-
-      gesturesManager.setStandardGestureListener(new StandardGestureListener());
-      gesturesManager.setMoveGestureListener(new MoveGestureListener());
-      gesturesManager.setStandardScaleGestureListener(new ScaleGestureListener(
-        context.getResources().getDimension(R.dimen.mapbox_minimum_scale_velocity)
-      ));
-      gesturesManager.setRotateGestureListener(new RotateGestureListener(
-        context.getResources().getDimension(R.dimen.mapbox_minimum_scale_span_when_rotating),
-        context.getResources().getDimension(R.dimen.mapbox_minimum_angular_velocity)
-      ));
-      gesturesManager.setShoveGestureListener(new ShoveGestureListener());
-      gesturesManager.setMultiFingerTapGestureListener(new TapGestureListener());
+      androidGesturesManager.setMutuallyExclusiveGestures(shoveScaleSet, shoveRotateSet, ScaleLongPressSet);
+    }
+
+    if (attachDefaultListeners) {
+      androidGesturesManager.setStandardGestureListener(standardGestureListener);
+      androidGesturesManager.setMoveGestureListener(moveGestureListener);
+      androidGesturesManager.setStandardScaleGestureListener(scaleGestureListener);
+      androidGesturesManager.setRotateGestureListener(rotateGestureListener);
+      androidGesturesManager.setShoveGestureListener(shoveGestureListener);
+      androidGesturesManager.setMultiFingerTapGestureListener(tapGestureListener);
     }
+
+    gesturesManager = androidGesturesManager;
   }
 
   /**
@@ -367,8 +395,14 @@ final class MapGestureDetector {
 
     @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-      if ((!uiSettings.isScrollGesturesEnabled())) {
-        // don't allow a fling is scroll is disabled
+      if (!uiSettings.isScrollGesturesEnabled()) {
+        // don't allow a fling if scroll is disabled
+        return false;
+      }
+
+      notifyOnFlingListeners();
+
+      if (!uiSettings.isFlingVelocityAnimationEnabled()) {
         return false;
       }
 
@@ -396,8 +430,6 @@ final class MapGestureDetector {
       // update transformation
       transform.moveBy(offsetX, offsetY, animationTime);
 
-      notifyOnFlingListeners();
-
       return true;
     }
   }
@@ -466,11 +498,13 @@ final class MapGestureDetector {
         gesturesManager.getMoveGestureDetector().setEnabled(false);
       }
 
-      // increase rotate angle threshold when scale is detected first
-      gesturesManager.getRotateGestureDetector().setAngleThreshold(
-        gesturesManager.getRotateGestureDetector().getDefaultAngleThreshold()
-          + MapboxConstants.ROTATION_THRESHOLD_INCREASE_WHEN_SCALING
-      );
+      if (uiSettings.isIncreaseRotateThresholdWhenScaling()) {
+        // increase rotate angle threshold when scale is detected first
+        gesturesManager.getRotateGestureDetector().setAngleThreshold(
+          gesturesManager.getRotateGestureDetector().getDefaultAngleThreshold()
+            + MapboxConstants.ROTATION_THRESHOLD_INCREASE_WHEN_SCALING
+        );
+      }
 
       // setting focalPoint in #onScaleBegin() as well, because #onScale() might not get called before #onScaleEnd()
       setScaleFocalPoint(detector);
@@ -507,10 +541,18 @@ final class MapGestureDetector {
         gesturesManager.getMoveGestureDetector().setEnabled(true);
       }
 
-      // resetting default angle threshold
-      gesturesManager.getRotateGestureDetector().setAngleThreshold(
-        gesturesManager.getRotateGestureDetector().getDefaultAngleThreshold()
-      );
+      if (uiSettings.isIncreaseRotateThresholdWhenScaling()) {
+        // resetting default angle threshold
+        gesturesManager.getRotateGestureDetector().setAngleThreshold(
+          gesturesManager.getRotateGestureDetector().getDefaultAngleThreshold()
+        );
+      }
+
+      notifyOnScaleEndListeners(detector);
+
+      if (!uiSettings.isScaleVelocityAnimationEnabled()) {
+        return;
+      }
 
       float velocityXY = Math.abs(velocityX) + Math.abs(velocityY);
       if (velocityXY > minimumVelocity) {
@@ -520,8 +562,6 @@ final class MapGestureDetector {
         scaleAnimator = createScaleAnimator(currentZoom, zoomAddition, scaleFocalPoint, animationTime);
         scheduleAnimator(scaleAnimator);
       }
-
-      notifyOnScaleEndListeners(detector);
     }
 
     private void setScaleFocalPoint(StandardScaleGestureDetector detector) {
@@ -578,10 +618,12 @@ final class MapGestureDetector {
       transform.cancelTransitions();
       cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
 
-      // when rotation starts, interrupting scale and increasing the threshold
-      // to make rotation without scaling easier
-      gesturesManager.getStandardScaleGestureDetector().setSpanSinceStartThreshold(minimumScaleSpanWhenRotating);
-      gesturesManager.getStandardScaleGestureDetector().interrupt();
+      if (uiSettings.isIncreaseScaleThresholdWhenRotating()) {
+        // when rotation starts, interrupting scale and increasing the threshold
+        // to make rotation without scaling easier
+        gesturesManager.getStandardScaleGestureDetector().setSpanSinceStartThreshold(minimumScaleSpanWhenRotating);
+        gesturesManager.getStandardScaleGestureDetector().interrupt();
+      }
 
       // setting in #onRotateBegin() as well, because #onRotate() might not get called before #onRotateEnd()
       setRotateFocalPoint(detector);
@@ -616,9 +658,17 @@ final class MapGestureDetector {
     public void onRotateEnd(RotateGestureDetector detector, float velocityX, float velocityY, float angularVelocity) {
       cameraChangeDispatcher.onCameraIdle();
 
-      // resetting default scale threshold values
-      gesturesManager.getStandardScaleGestureDetector().setSpanSinceStartThreshold(
-        gesturesManager.getStandardScaleGestureDetector().getDefaultSpanSinceStartThreshold());
+      if (uiSettings.isIncreaseScaleThresholdWhenRotating()) {
+        // resetting default scale threshold values
+        gesturesManager.getStandardScaleGestureDetector().setSpanSinceStartThreshold(
+          gesturesManager.getStandardScaleGestureDetector().getDefaultSpanSinceStartThreshold());
+      }
+
+      notifyOnRotateEndListeners(detector);
+
+      if (!uiSettings.isRotateVelocityAnimationEnabled()) {
+        return;
+      }
 
       if (Math.abs(angularVelocity) < minimumAngularVelocity) {
         return;
@@ -637,8 +687,6 @@ final class MapGestureDetector {
 
       rotateAnimator = createRotateAnimator(angularVelocity, animationTime);
       scheduleAnimator(rotateAnimator);
-
-      notifyOnRotateEndListeners(detector);
     }
 
     private void setRotateFocalPoint(RotateGestureDetector detector) {
@@ -1059,7 +1107,8 @@ final class MapGestureDetector {
     return gesturesManager;
   }
 
-  void setGesturesManager(AndroidGesturesManager gesturesManager) {
-    this.gesturesManager = gesturesManager;
+  void setGesturesManager(AndroidGesturesManager gesturesManager, boolean attachDefaultListeners,
+                          boolean setDefaultMutuallyExclusives) {
+    initializeGesturesManager(gesturesManager, attachDefaultListeners, setDefaultMutuallyExclusives);
   }
 }
\ No newline at end of file