react-native-gesture-handler 1.10.3 → 2.1.2

package/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureDetector.java

@@ -1,169 +0,0 @@
-package com.swmansion.gesturehandler;
-
-import android.view.MotionEvent;
-
-public class RotationGestureDetector {
-
-  public interface OnRotationGestureListener {
-
-    boolean onRotation(RotationGestureDetector detector);
-
-    boolean onRotationBegin(RotationGestureDetector detector);
-
-    void onRotationEnd(RotationGestureDetector detector);
-  }
-
-  private long mCurrTime;
-  private long mPrevTime;
-  private double mPrevAngle;
-  private double mAngleDiff;
-  private float mAnchorX;
-  private float mAnchorY;
-
-  private boolean mInProgress;
-
-  private int mPointerIds[] = new int[2];
-
-  private OnRotationGestureListener mListener;
-
-  public RotationGestureDetector(OnRotationGestureListener listener) {
-    mListener = listener;
-  }
-
-  private void updateCurrent(MotionEvent event) {
-    mPrevTime = mCurrTime;
-    mCurrTime = event.getEventTime();
-
-    int firstPointerIndex = event.findPointerIndex(mPointerIds[0]);
-    int secondPointerIndex = event.findPointerIndex(mPointerIds[1]);
-
-    float firstPtX = event.getX(firstPointerIndex);
-    float firstPtY = event.getY(firstPointerIndex);
-    float secondPtX = event.getX(secondPointerIndex);
-    float secondPtY = event.getY(secondPointerIndex);
-
-    float vectorX = secondPtX - firstPtX;
-    float vectorY = secondPtY - firstPtY;
-
-    mAnchorX = (firstPtX + secondPtX) * 0.5f;
-    mAnchorY = (firstPtY + secondPtY) * 0.5f;
-
-    // Angle diff should be positive when rotating in clockwise direction
-    double angle = -Math.atan2(vectorY, vectorX);
-
-    if (Double.isNaN(mPrevAngle)) {
-      mAngleDiff = 0.;
-    } else {
-      mAngleDiff = mPrevAngle - angle;
-    }
-    mPrevAngle = angle;
-
-    if (mAngleDiff > Math.PI) {
-      mAngleDiff -= Math.PI;
-    } else if (mAngleDiff < -Math.PI) {
-      mAngleDiff += Math.PI;
-    }
-
-    if (mAngleDiff > Math.PI / 2.) {
-      mAngleDiff -= Math.PI;
-    } else if (mAngleDiff < -Math.PI / 2.) {
-      mAngleDiff += Math.PI;
-    }
-  }
-
-  private void finish() {
-    if (mInProgress) {
-      mInProgress = false;
-      if (mListener != null) {
-        mListener.onRotationEnd(this);
-      }
-    }
-  }
-
-  public boolean onTouchEvent(MotionEvent event) {
-    switch (event.getActionMasked()) {
-
-      case MotionEvent.ACTION_DOWN:
-        mInProgress = false;
-        mPointerIds[0] = event.getPointerId(event.getActionIndex());
-        mPointerIds[1] = MotionEvent.INVALID_POINTER_ID;
-        break;
-
-      case MotionEvent.ACTION_POINTER_DOWN:
-        if (!mInProgress) {
-          mPointerIds[1] = event.getPointerId(event.getActionIndex());
-          mInProgress = true;
-          mPrevTime = event.getEventTime();
-          mPrevAngle = Double.NaN;
-          updateCurrent(event);
-          if (mListener != null) {
-            mListener.onRotationBegin(this);
-          }
-        }
-        break;
-
-      case MotionEvent.ACTION_MOVE:
-        if (mInProgress) {
-          updateCurrent(event);
-          if (mListener != null) {
-            mListener.onRotation(this);
-          }
-        }
-        break;
-
-      case MotionEvent.ACTION_POINTER_UP:
-        if (mInProgress) {
-          int pointerId = event.getPointerId(event.getActionIndex());
-          if (pointerId == mPointerIds[0] || pointerId == mPointerIds[1]) {
-            // One of the key pointer has been lifted up, we have to end the gesture
-            finish();
-          }
-        }
-        break;
-
-      case MotionEvent.ACTION_UP:
-        finish();
-        break;
-    }
-    return true;
-  }
-
-  /**
-   * Returns rotation in radians since the previous rotation event.
-   *
-   * @return current rotation step in radians.
-   */
-  public double getRotation() {
-    return mAngleDiff;
-  }
-
-  /**
-   * Return the time difference in milliseconds between the previous
-   * accepted rotation event and the current rotation event.
-   *
-   * @return Time difference since the last rotation event in milliseconds.
-   */
-  public long getTimeDelta() {
-    return mCurrTime - mPrevTime;
-  }
-
-  /**
-   * Returns X coordinate of the rotation anchor point relative to the view that the provided motion
-   * event coordinates (usually relative to the view event was sent to).
-   *
-   * @return X coordinate of the rotation anchor point
-   */
-  public float getAnchorX() {
-    return mAnchorX;
-  }
-
-  /**
-   * Returns Y coordinate of the rotation anchor point relative to the view that the provided motion
-   * event coordinates (usually relative to the view event was sent to).
-   *
-   * @return Y coordinate of the rotation anchor point
-   */
-  public float getAnchorY() {
-    return mAnchorY;
-  }
-}

package/android/lib/src/main/java/com/swmansion/gesturehandler/RotationGestureHandler.java

@@ -1,96 +0,0 @@
-package com.swmansion.gesturehandler;
-
-import android.view.MotionEvent;
-
-public class RotationGestureHandler extends GestureHandler<RotationGestureHandler> {
-
-  private static final double ROTATION_RECOGNITION_THRESHOLD = Math.PI / 36.; // 5 deg in radians
-
-  private RotationGestureDetector mRotationGestureDetector;
-  private double mLastRotation;
-  private double mLastVelocity;
-
-  private RotationGestureDetector.OnRotationGestureListener mGestureListener = new RotationGestureDetector.OnRotationGestureListener() {
-
-    @Override
-    public boolean onRotation(RotationGestureDetector detector) {
-      double prevRotation = mLastRotation;
-      mLastRotation += detector.getRotation();
-      long delta = detector.getTimeDelta();
-      if (delta > 0) {
-        mLastVelocity = (mLastRotation - prevRotation) / delta;
-      }
-      if (Math.abs(mLastRotation) >= ROTATION_RECOGNITION_THRESHOLD && getState() == STATE_BEGAN) {
-        activate();
-      }
-      return true;
-    }
-
-    @Override
-    public boolean onRotationBegin(RotationGestureDetector detector) {
-      return true;
-    }
-
-    @Override
-    public void onRotationEnd(RotationGestureDetector detector) {
-      end();
-    }
-  };
-
-  public RotationGestureHandler() {
-    setShouldCancelWhenOutside(false);
-  }
-
-  @Override
-  protected void onHandle(MotionEvent event) {
-    int state = getState();
-    if (state == STATE_UNDETERMINED) {
-      mLastVelocity = 0f;
-      mLastRotation = 0f;
-      mRotationGestureDetector = new RotationGestureDetector(mGestureListener);
-
-      begin();
-    }
-
-    if (mRotationGestureDetector != null) {
-      mRotationGestureDetector.onTouchEvent(event);
-    }
-
-    if (event.getActionMasked() == MotionEvent.ACTION_UP) {
-      if (state == STATE_ACTIVE) {
-        end();
-      } else {
-        fail();
-      }
-    }
-  }
-
-  @Override
-  protected void onReset() {
-    mRotationGestureDetector = null;
-    mLastVelocity = 0f;
-    mLastRotation = 0f;
-  }
-
-  public double getRotation() {
-    return mLastRotation;
-  }
-
-  public double getVelocity() {
-    return mLastVelocity;
-  }
-
-  public float getAnchorX() {
-    if (mRotationGestureDetector == null) {
-      return Float.NaN;
-    }
-    return mRotationGestureDetector.getAnchorX();
-  }
-
-  public float getAnchorY() {
-    if (mRotationGestureDetector == null) {
-      return Float.NaN;
-    }
-    return mRotationGestureDetector.getAnchorY();
-  }
-}

package/android/lib/src/main/java/com/swmansion/gesturehandler/TapGestureHandler.java

@@ -1,172 +0,0 @@
-package com.swmansion.gesturehandler;
-
-import android.os.Handler;
-import android.view.MotionEvent;
-
-public class TapGestureHandler extends GestureHandler<TapGestureHandler> {
-  private static float MAX_VALUE_IGNORE = Float.MIN_VALUE;
-  private static final long DEFAULT_MAX_DURATION_MS = 500;
-  private static final long DEFAULT_MAX_DELAY_MS = 500;
-  private static final int DEFAULT_NUMBER_OF_TAPS = 1;
-  private static final int DEFAULT_MIN_NUMBER_OF_POINTERS = 1;
-
-  private float mMaxDeltaX = MAX_VALUE_IGNORE;
-  private float mMaxDeltaY = MAX_VALUE_IGNORE;
-  private float mMaxDistSq = MAX_VALUE_IGNORE;
-
-  private long mMaxDurationMs = DEFAULT_MAX_DURATION_MS;
-  private long mMaxDelayMs = DEFAULT_MAX_DELAY_MS;
-  private int mNumberOfTaps = DEFAULT_NUMBER_OF_TAPS;
-  private int mMinNumberOfPointers = DEFAULT_MIN_NUMBER_OF_POINTERS;
-  private int mNumberOfPointers = 1;
-
-  private float mStartX, mStartY;
-  private float mOffsetX, mOffsetY;
-  private float mLastX, mLastY;
-
-  private Handler mHandler;
-  private int mTapsSoFar;
-
-  private final Runnable mFailDelayed = new Runnable() {
-    @Override
-    public void run() {
-      fail();
-    }
-  };
-
-  public TapGestureHandler setNumberOfTaps(int numberOfTaps) {
-    mNumberOfTaps = numberOfTaps;
-    return this;
-  }
-
-  public TapGestureHandler setMaxDelayMs(long maxDelayMs) {
-    mMaxDelayMs = maxDelayMs;
-    return this;
-  }
-
-  public TapGestureHandler setMaxDurationMs(long maxDurationMs) {
-    mMaxDurationMs = maxDurationMs;
-    return this;
-  }
-
-  public TapGestureHandler setMaxDx(float deltaX) {
-    mMaxDeltaX = deltaX;
-    return this;
-  }
-
-  public TapGestureHandler setMaxDy(float deltaY) {
-    mMaxDeltaY = deltaY;
-    return this;
-  }
-  public TapGestureHandler setMaxDist(float maxDist) {
-    mMaxDistSq = maxDist * maxDist;
-    return this;
-  }
-
-  public TapGestureHandler setMinNumberOfPointers(int minNumberOfPointers) {
-    mMinNumberOfPointers = minNumberOfPointers;
-    return this;
-  }
-
-  public TapGestureHandler() {
-    setShouldCancelWhenOutside(true);
-  }
-
-  private void startTap() {
-    if (mHandler == null) {
-      mHandler = new Handler();
-    } else {
-      mHandler.removeCallbacksAndMessages(null);
-    }
-    mHandler.postDelayed(mFailDelayed, mMaxDurationMs);
-  }
-
-  private void endTap() {
-    if (mHandler == null) {
-      mHandler = new Handler();
-    } else {
-      mHandler.removeCallbacksAndMessages(null);
-    }
-    if (++mTapsSoFar == mNumberOfTaps && mNumberOfPointers >= mMinNumberOfPointers) {
-      activate();
-      end();
-    } else {
-      mHandler.postDelayed(mFailDelayed, mMaxDelayMs);
-    }
-  }
-
-  private boolean shouldFail() {
-    float dx = mLastX - mStartX + mOffsetX;
-    if (mMaxDeltaX != MAX_VALUE_IGNORE && Math.abs(dx) > mMaxDeltaX) {
-      return true;
-    }
-
-    float dy = mLastY - mStartY + mOffsetY;
-    if (mMaxDeltaY != MAX_VALUE_IGNORE && Math.abs(dy) > mMaxDeltaY) {
-      return true;
-    }
-
-    float dist = dy * dy + dx * dx;
-    return mMaxDistSq != MAX_VALUE_IGNORE && dist > mMaxDistSq;
-  }
-
-  @Override
-  protected void onHandle(MotionEvent event) {
-    int state = getState();
-    int action = event.getActionMasked();
-
-    if (state == STATE_UNDETERMINED) {
-      mOffsetX = 0;
-      mOffsetY = 0;
-      mStartX = event.getRawX();
-      mStartY = event.getRawY();
-    }
-
-    if (action == MotionEvent.ACTION_POINTER_UP || action == MotionEvent.ACTION_POINTER_DOWN) {
-      mOffsetX += mLastX - mStartX;
-      mOffsetY += mLastY - mStartY;
-      mLastX = GestureUtils.getLastPointerX(event, true);
-      mLastY = GestureUtils.getLastPointerY(event, true);
-      mStartX = mLastX;
-      mStartY = mLastY;
-    } else {
-      mLastX = GestureUtils.getLastPointerX(event, true);
-      mLastY = GestureUtils.getLastPointerY(event, true);
-    }
-
-    if (mNumberOfPointers < event.getPointerCount()) {
-      mNumberOfPointers = event.getPointerCount();
-    }
-
-    if (shouldFail()) {
-      fail();
-    } else if (state == STATE_UNDETERMINED) {
-      if (action == MotionEvent.ACTION_DOWN) {
-        begin();
-      }
-      startTap();
-  } else if (state == STATE_BEGAN) {
-      if (action == MotionEvent.ACTION_UP) {
-        endTap();
-      } else if (action == MotionEvent.ACTION_DOWN) {
-        startTap();
-      }
-    }
-  }
-
-  @Override
-  protected void onCancel() {
-    if (mHandler != null) {
-      mHandler.removeCallbacksAndMessages(null);
-    }
-  }
-
-  @Override
-  protected void onReset() {
-    mTapsSoFar = 0;
-    mNumberOfPointers = 0;
-    if (mHandler != null) {
-      mHandler.removeCallbacksAndMessages(null);
-    }
-  }
-}

package/android/lib/src/main/java/com/swmansion/gesturehandler/ViewConfigurationHelper.java

@@ -1,10 +0,0 @@
-package com.swmansion.gesturehandler;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-public interface ViewConfigurationHelper {
-  PointerEventsConfig getPointerEventsConfigForView(View view);
-  View getChildInDrawingOrderAtIndex(ViewGroup parent, int index);
-  boolean isViewClippingChildren(ViewGroup view);
-}

package/android/src/main/java/com/facebook/react/views/modal/RNGHModalUtils.java

@@ -1,21 +0,0 @@
-package com.facebook.react.views.modal;
-
-import android.view.MotionEvent;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-
-/**
- * For handling gestures inside RNGH we need to have access to some methods of
- * `ReactModalHostView.DialogRootViewGroup`. This class is not available outside
- * package so this file exports important features.
- */
-
-public class RNGHModalUtils {
-  public static void dialogRootViewGroupOnChildStartedNativeGesture(ViewGroup modal, MotionEvent androidEvent) {
-    ((ReactModalHostView.DialogRootViewGroup) modal).onChildStartedNativeGesture(androidEvent);
-  }
-
-  public static boolean isDialogRootViewGroup(ViewParent modal) {
-    return modal instanceof ReactModalHostView.DialogRootViewGroup;
-  }
-}