From 391df76b369fce11fba27493c2cfc099ccdde836 Mon Sep 17 00:00:00 2001 From: Wang Yitong Date: Wed, 6 Jul 2016 11:39:26 +0800 Subject: [PATCH] fix compile on rn 0.29.0 add new params to TouchEvent.obtain method --- .../java/com/horcrux/svg/RNSVGSvgView.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java b/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java index 792d4b8a..ee444703 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java @@ -29,6 +29,7 @@ import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.TouchTargetHelper; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.TouchEvent; +import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper; import com.facebook.react.uimanager.events.TouchEventType; import com.facebook.react.views.view.ReactClippingViewGroup; import com.facebook.react.uimanager.events.EventDispatcher; @@ -46,6 +47,9 @@ public class RNSVGSvgView extends ViewGroup { private int mTargetTag; + private final TouchEventCoalescingKeyHelper mTouchEventCoalescingKeyHelper = + new TouchEventCoalescingKeyHelper(); + public RNSVGSvgView(Context context, RNSVGSvgViewShadowNode shadowNode) { super(context); mSvgViewShadowNode = shadowNode; @@ -98,7 +102,8 @@ public class RNSVGSvgView extends ViewGroup { TouchEventType.START, ev, ev.getX(), - ev.getX())); + ev.getX(), + mTouchEventCoalescingKeyHelper)); } else if (mTargetTag == -1) { // All the subsequent action types are expected to be called after ACTION_DOWN thus target // is supposed to be set for them. @@ -116,7 +121,8 @@ public class RNSVGSvgView extends ViewGroup { TouchEventType.END, ev, ev.getX(), - ev.getY())); + ev.getY(), + mTouchEventCoalescingKeyHelper)); mTargetTag = -1; } else if (action == MotionEvent.ACTION_MOVE) { // Update pointer position for current gesture @@ -127,7 +133,8 @@ public class RNSVGSvgView extends ViewGroup { TouchEventType.MOVE, ev, ev.getX(), - ev.getY())); + ev.getY(), + mTouchEventCoalescingKeyHelper)); } else if (action == MotionEvent.ACTION_POINTER_DOWN) { // New pointer goes down, this can only happen after ACTION_DOWN is sent for the first pointer eventDispatcher.dispatchEvent( @@ -137,7 +144,8 @@ public class RNSVGSvgView extends ViewGroup { TouchEventType.START, ev, ev.getX(), - ev.getY())); + ev.getY(), + mTouchEventCoalescingKeyHelper)); } else if (action == MotionEvent.ACTION_POINTER_UP) { // Exactly onw of the pointers goes up eventDispatcher.dispatchEvent( @@ -147,7 +155,8 @@ public class RNSVGSvgView extends ViewGroup { TouchEventType.END, ev, ev.getX(), - ev.getY())); + ev.getY(), + mTouchEventCoalescingKeyHelper)); } else if (action == MotionEvent.ACTION_CANCEL) { dispatchCancelEvent(ev, eventDispatcher); mTargetTag = -1; @@ -177,6 +186,7 @@ public class RNSVGSvgView extends ViewGroup { TouchEventType.CANCEL, androidEvent, androidEvent.getX(), - androidEvent.getY())); + androidEvent.getY(), + mTouchEventCoalescingKeyHelper)); } }