From c06f28e95157050b2869976c2cbc9e170bdb8c2b Mon Sep 17 00:00:00 2001 From: Horcrux Date: Tue, 8 Nov 2016 23:10:15 +0800 Subject: [PATCH] mark update seen when child is drawn --- .../com/horcrux/svg/RNSVGDefinitionShadowNode.java | 1 - .../java/com/horcrux/svg/RNSVGGroupShadowNode.java | 3 +-- .../java/com/horcrux/svg/RNSVGImageShadowNode.java | 1 - .../java/com/horcrux/svg/RNSVGPathShadowNode.java | 1 - .../com/horcrux/svg/RNSVGRenderableViewManager.java | 4 ---- .../src/main/java/com/horcrux/svg/RNSVGSvgView.java | 11 ----------- .../java/com/horcrux/svg/RNSVGSvgViewManager.java | 7 ------- .../java/com/horcrux/svg/RNSVGSvgViewShadowNode.java | 3 +-- .../java/com/horcrux/svg/RNSVGTextShadowNode.java | 1 - .../main/java/com/horcrux/svg/RNSVGVirtualNode.java | 2 +- 10 files changed, 3 insertions(+), 31 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/RNSVGDefinitionShadowNode.java b/android/src/main/java/com/horcrux/svg/RNSVGDefinitionShadowNode.java index 76cd756a..846ed0ed 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGDefinitionShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGDefinitionShadowNode.java @@ -14,7 +14,6 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Point; -import android.view.View; import com.facebook.react.bridge.ReadableArray; diff --git a/android/src/main/java/com/horcrux/svg/RNSVGGroupShadowNode.java b/android/src/main/java/com/horcrux/svg/RNSVGGroupShadowNode.java index 195fab62..f7493e42 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGGroupShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGGroupShadowNode.java @@ -14,8 +14,6 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Point; -import android.view.View; -import android.view.ViewGroup; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.ReactShadowNode; @@ -44,6 +42,7 @@ public class RNSVGGroupShadowNode extends RNSVGPathShadowNode { child.mergeProperties(this, mOwnedPropList, true); child.draw(canvas, paint, opacity * mOpacity); + child.markUpdateSeen(); if (child.isResponsible()) { svg.enableTouchEvents(); diff --git a/android/src/main/java/com/horcrux/svg/RNSVGImageShadowNode.java b/android/src/main/java/com/horcrux/svg/RNSVGImageShadowNode.java index 3b42d3b9..47f57252 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGImageShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGImageShadowNode.java @@ -18,7 +18,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; import android.net.Uri; -import android.util.Log; import com.facebook.common.executors.UiThreadImmediateExecutorService; import com.facebook.common.logging.FLog; diff --git a/android/src/main/java/com/horcrux/svg/RNSVGPathShadowNode.java b/android/src/main/java/com/horcrux/svg/RNSVGPathShadowNode.java index 49d5e827..72a135b1 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGPathShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGPathShadowNode.java @@ -21,7 +21,6 @@ import android.graphics.Point; import android.graphics.RectF; import android.graphics.Color; -import android.view.View; import com.facebook.common.logging.FLog; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; diff --git a/android/src/main/java/com/horcrux/svg/RNSVGRenderableViewManager.java b/android/src/main/java/com/horcrux/svg/RNSVGRenderableViewManager.java index 4b1e1ea5..2a075b64 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGRenderableViewManager.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGRenderableViewManager.java @@ -10,13 +10,9 @@ package com.horcrux.svg; import android.view.View; -import android.view.ViewGroup; -import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.LayoutShadowNode; -import com.facebook.react.uimanager.ReactShadowNode; import com.facebook.react.uimanager.ThemedReactContext; -import com.facebook.react.uimanager.ViewGroupManager; import com.facebook.react.uimanager.ViewManager; /** diff --git a/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java b/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java index df972c6d..f25ca37f 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGSvgView.java @@ -9,27 +9,17 @@ package com.horcrux.svg; -import javax.annotation.Nullable; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Point; import android.util.Log; import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; import android.view.TextureView; import com.facebook.react.ReactRootView; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.WritableMap; -import com.facebook.react.touch.OnInterceptTouchEventListener; -import com.facebook.react.touch.ReactInterceptingViewGroup; -import com.facebook.react.uimanager.TouchTargetHelper; import com.facebook.react.uimanager.UIManagerModule; -import com.facebook.react.uimanager.events.NativeGestureUtil; import com.facebook.react.uimanager.events.RCTEventEmitter; import com.facebook.react.uimanager.events.TouchEvent; import com.facebook.react.uimanager.events.TouchEventCoalescingKeyHelper; @@ -136,7 +126,6 @@ public class RNSVGSvgView extends TextureView { dispatch(ev, TouchEventType.END); mTargetTag = -1; } else if (action == MotionEvent.ACTION_MOVE) { - Log.e("asdasd", "asdasd"); // Update pointer position for current gesture dispatch(ev, TouchEventType.MOVE); } else if (action == MotionEvent.ACTION_POINTER_DOWN) { diff --git a/android/src/main/java/com/horcrux/svg/RNSVGSvgViewManager.java b/android/src/main/java/com/horcrux/svg/RNSVGSvgViewManager.java index 4f270a16..9e23a694 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGSvgViewManager.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGSvgViewManager.java @@ -9,18 +9,11 @@ package com.horcrux.svg; -import android.graphics.Bitmap; -import android.util.Log; -import android.util.SparseArray; - import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.MapBuilder; import com.facebook.react.uimanager.BaseViewManager; import com.facebook.react.uimanager.ThemedReactContext; -import com.facebook.react.uimanager.ViewGroupManager; -import com.facebook.react.uimanager.ViewManager; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/android/src/main/java/com/horcrux/svg/RNSVGSvgViewShadowNode.java b/android/src/main/java/com/horcrux/svg/RNSVGSvgViewShadowNode.java index 48dfac77..f0d2ac8e 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGSvgViewShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGSvgViewShadowNode.java @@ -16,14 +16,12 @@ import android.graphics.Point; import android.util.Base64; import android.util.SparseArray; import android.view.TextureView; -import android.view.ViewGroup; import android.graphics.Color; import android.view.Surface; import android.graphics.PorterDuff; import android.graphics.SurfaceTexture; import com.facebook.common.logging.FLog; -import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.react.common.ReactConstants; import com.facebook.react.uimanager.LayoutShadowNode; import com.facebook.react.uimanager.ReactShadowNode; @@ -100,6 +98,7 @@ public class RNSVGSvgViewShadowNode extends LayoutShadowNode implements TextureV child.setupDimensions(canvas); child.saveDefinition(); child.draw(canvas, paint, 1f); + child.markUpdateSeen(); if (child.isResponsible() && !mResponsible) { mResponsible = true; diff --git a/android/src/main/java/com/horcrux/svg/RNSVGTextShadowNode.java b/android/src/main/java/com/horcrux/svg/RNSVGTextShadowNode.java index e0d4cff6..7d8258a0 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGTextShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGTextShadowNode.java @@ -21,7 +21,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.text.TextUtils; -import android.view.View; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; diff --git a/android/src/main/java/com/horcrux/svg/RNSVGVirtualNode.java b/android/src/main/java/com/horcrux/svg/RNSVGVirtualNode.java index eb487e4f..906621b5 100644 --- a/android/src/main/java/com/horcrux/svg/RNSVGVirtualNode.java +++ b/android/src/main/java/com/horcrux/svg/RNSVGVirtualNode.java @@ -16,7 +16,6 @@ import android.graphics.Path; import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; -import android.view.View; import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReadableArray; @@ -144,6 +143,7 @@ public abstract class RNSVGVirtualNode extends LayoutShadowNode { } else { mMatrix = null; } + markUpdated(); }