diff --git a/android/src/main/java/com/horcrux/svg/BezierTransformer.java b/android/src/main/java/com/horcrux/svg/BezierTransformer.java index a31d7352..9c27084e 100644 --- a/android/src/main/java/com/horcrux/svg/BezierTransformer.java +++ b/android/src/main/java/com/horcrux/svg/BezierTransformer.java @@ -11,7 +11,6 @@ package com.horcrux.svg; import android.graphics.Matrix; import android.graphics.PointF; -import android.util.Log; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; diff --git a/android/src/main/java/com/horcrux/svg/CircleShadowNode.java b/android/src/main/java/com/horcrux/svg/CircleShadowNode.java index 00b88517..c2915e96 100644 --- a/android/src/main/java/com/horcrux/svg/CircleShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/CircleShadowNode.java @@ -16,7 +16,7 @@ import android.graphics.Path; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Circle view */ public class CircleShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/ClipPathShadowNode.java b/android/src/main/java/com/horcrux/svg/ClipPathShadowNode.java index 45348348..b713b06b 100644 --- a/android/src/main/java/com/horcrux/svg/ClipPathShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/ClipPathShadowNode.java @@ -19,7 +19,7 @@ import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.ReactConstants; /** - * Shadow node for virtual RNSVGClipPath view + * Shadow node for virtual ClipPath view */ public class ClipPathShadowNode extends GroupShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/DefsShadowNode.java b/android/src/main/java/com/horcrux/svg/DefsShadowNode.java index 0a1fc331..88f906c7 100644 --- a/android/src/main/java/com/horcrux/svg/DefsShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/DefsShadowNode.java @@ -13,7 +13,7 @@ import android.graphics.Canvas; import android.graphics.Paint; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Defs view */ public class DefsShadowNode extends DefinitionShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/EllipseShadowNode.java b/android/src/main/java/com/horcrux/svg/EllipseShadowNode.java index c4a3532c..3c013ce6 100644 --- a/android/src/main/java/com/horcrux/svg/EllipseShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/EllipseShadowNode.java @@ -17,7 +17,7 @@ import android.graphics.RectF; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Ellipse view */ public class EllipseShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/GlyphContext.java b/android/src/main/java/com/horcrux/svg/GlyphContext.java index 8f06d6dc..4b5f4df4 100644 --- a/android/src/main/java/com/horcrux/svg/GlyphContext.java +++ b/android/src/main/java/com/horcrux/svg/GlyphContext.java @@ -10,12 +10,10 @@ package com.horcrux.svg; import android.graphics.PointF; -import android.util.Log; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; -import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; import java.util.ArrayList; @@ -79,7 +77,7 @@ public class GlyphContext { mXContext.remove(mContextLength - 1); mContextLength--; - + if (mContextLength != 0) { mXContext.set(mContextLength - 1, x); PointF lastLocation = mLocationContext.get(mContextLength - 1); diff --git a/android/src/main/java/com/horcrux/svg/GroupShadowNode.java b/android/src/main/java/com/horcrux/svg/GroupShadowNode.java index e565ecf9..5d4b50fe 100644 --- a/android/src/main/java/com/horcrux/svg/GroupShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/GroupShadowNode.java @@ -21,7 +21,7 @@ import com.facebook.react.uimanager.ReactShadowNode; import javax.annotation.Nullable; /** - * Shadow node for virtual RNSVGGroup view + * Shadow node for virtual Group view */ public class GroupShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/ImageShadowNode.java b/android/src/main/java/com/horcrux/svg/ImageShadowNode.java index 8303c3a2..35b94f74 100644 --- a/android/src/main/java/com/horcrux/svg/ImageShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/ImageShadowNode.java @@ -39,7 +39,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Image view */ public class ImageShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/LineShadowNode.java b/android/src/main/java/com/horcrux/svg/LineShadowNode.java index ce2c0e9a..7e17f22f 100644 --- a/android/src/main/java/com/horcrux/svg/LineShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/LineShadowNode.java @@ -15,7 +15,7 @@ import android.graphics.Path; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Line view */ public class LineShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/PathShadowNode.java b/android/src/main/java/com/horcrux/svg/PathShadowNode.java index 5ac1b033..f9fa6739 100644 --- a/android/src/main/java/com/horcrux/svg/PathShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/PathShadowNode.java @@ -9,35 +9,15 @@ package com.horcrux.svg; -import javax.annotation.Nullable; - -import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.DashPathEffect; -import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; -import android.graphics.Point; -import android.graphics.RectF; -import android.graphics.Color; -import android.util.Log; - -import com.facebook.common.logging.FLog; -import com.facebook.react.bridge.JSApplicationIllegalArgumentException; -import com.facebook.react.bridge.JavaOnlyArray; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.bridge.WritableArray; -import com.facebook.react.common.ReactConstants; import com.facebook.react.uimanager.annotations.ReactProp; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Path view */ public class PathShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/PropHelper.java b/android/src/main/java/com/horcrux/svg/PropHelper.java index f31531b7..0eab276e 100644 --- a/android/src/main/java/com/horcrux/svg/PropHelper.java +++ b/android/src/main/java/com/horcrux/svg/PropHelper.java @@ -11,7 +11,6 @@ package com.horcrux.svg; import android.graphics.Color; import android.graphics.Path; -import android.graphics.PointF; import android.graphics.RectF; import android.graphics.Paint; import android.graphics.RadialGradient; @@ -23,7 +22,6 @@ import javax.annotation.Nullable; import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.WritableArray; import com.facebook.react.bridge.WritableMap; diff --git a/android/src/main/java/com/horcrux/svg/RadialGradientShadowNode.java b/android/src/main/java/com/horcrux/svg/RadialGradientShadowNode.java index 966414c0..e29fdb82 100644 --- a/android/src/main/java/com/horcrux/svg/RadialGradientShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RadialGradientShadowNode.java @@ -15,7 +15,7 @@ import com.facebook.react.bridge.WritableArray; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual LinearGradient definition view + * Shadow node for virtual RadialGradient definition view */ public class RadialGradientShadowNode extends DefinitionShadowNode { private String mFx; diff --git a/android/src/main/java/com/horcrux/svg/RectShadowNode.java b/android/src/main/java/com/horcrux/svg/RectShadowNode.java index a6e8bc28..d44f9086 100644 --- a/android/src/main/java/com/horcrux/svg/RectShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RectShadowNode.java @@ -16,7 +16,7 @@ import android.graphics.RectF; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Rect view */ public class RectShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java b/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java index a12f4914..a7ba2e96 100644 --- a/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java @@ -11,7 +11,6 @@ package com.horcrux.svg; import javax.annotation.Nullable; -import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.DashPathEffect; import android.graphics.Matrix; @@ -36,7 +35,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * Shadow node for virtual RNSVGPath view + * Renderable shadow node */ abstract public class RenderableShadowNode extends VirtualNode { diff --git a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java index 2ad43b94..2b5a7e5b 100644 --- a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java @@ -14,21 +14,11 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; -import android.graphics.RectF; -import android.graphics.SurfaceTexture; -import android.support.annotation.Nullable; import android.util.Base64; -import android.util.Log; -import android.util.SparseArray; import android.graphics.Color; import android.graphics.PorterDuff; -import android.view.Surface; -import android.view.TextureView; -import com.facebook.common.logging.FLog; -import com.facebook.react.common.ReactConstants; import com.facebook.react.uimanager.LayoutShadowNode; -import com.facebook.react.uimanager.ReactShadowNode; import com.facebook.react.uimanager.UIViewOperationQueue; import java.io.ByteArrayOutputStream; diff --git a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java index 005fcfbb..9a96a675 100644 --- a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java @@ -16,20 +16,19 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.PointF; -import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.os.Build; -import android.util.Log; -import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; -import com.facebook.react.bridge.WritableMap; import com.facebook.react.uimanager.ReactShadowNode; import com.facebook.react.uimanager.annotations.ReactProp; import javax.annotation.Nullable; +/** + * Shadow node for virtual TSpan view + */ public class TSpanShadowNode extends TextShadowNode { private BezierTransformer mBezierTransformer; diff --git a/android/src/main/java/com/horcrux/svg/TextPathShadowNode.java b/android/src/main/java/com/horcrux/svg/TextPathShadowNode.java index 0da0afee..ec48c17c 100644 --- a/android/src/main/java/com/horcrux/svg/TextPathShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/TextPathShadowNode.java @@ -12,13 +12,14 @@ package com.horcrux.svg; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Path; -import android.graphics.drawable.shapes.PathShape; -import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.annotations.ReactProp; import javax.annotation.Nullable; +/** + * Shadow node for virtual TextPath view + */ public class TextPathShadowNode extends TextShadowNode { private String mHref; diff --git a/android/src/main/java/com/horcrux/svg/UseShadowNode.java b/android/src/main/java/com/horcrux/svg/UseShadowNode.java index 14a4ac70..5f3775cf 100644 --- a/android/src/main/java/com/horcrux/svg/UseShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/UseShadowNode.java @@ -18,7 +18,7 @@ import com.facebook.react.common.ReactConstants; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual Use view */ public class UseShadowNode extends RenderableShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/ViewBoxShadowNode.java b/android/src/main/java/com/horcrux/svg/ViewBoxShadowNode.java index 3dbc2230..f3cd83b4 100644 --- a/android/src/main/java/com/horcrux/svg/ViewBoxShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/ViewBoxShadowNode.java @@ -11,14 +11,13 @@ package com.horcrux.svg; import android.graphics.Canvas; import android.graphics.Matrix; -import android.graphics.Paint; import android.graphics.RectF; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.annotations.ReactProp; /** - * Shadow node for virtual RNSVGPath view + * Shadow node for virtual ViewBox */ public class ViewBoxShadowNode extends GroupShadowNode { diff --git a/android/src/main/java/com/horcrux/svg/VirtualNode.java b/android/src/main/java/com/horcrux/svg/VirtualNode.java index f8c71a3d..e10e21b6 100644 --- a/android/src/main/java/com/horcrux/svg/VirtualNode.java +++ b/android/src/main/java/com/horcrux/svg/VirtualNode.java @@ -14,11 +14,9 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; import android.graphics.Point; -import android.graphics.Rect; import android.graphics.Region; import com.facebook.common.logging.FLog; -import com.facebook.react.bridge.JSApplicationIllegalArgumentException; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.ReactConstants; import com.facebook.react.uimanager.DisplayMetricsHolder;