diff --git a/android/src/main/java/com/horcrux/svg/ImageShadowNode.java b/android/src/main/java/com/horcrux/svg/ImageShadowNode.java index d27bd3fa..0f3a1cb4 100644 --- a/android/src/main/java/com/horcrux/svg/ImageShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/ImageShadowNode.java @@ -14,7 +14,6 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; -import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; import android.net.Uri; diff --git a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java index f4c295d3..808ef4ab 100644 --- a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java @@ -17,7 +17,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; -import android.support.annotation.NonNull; import android.util.Base64; import com.facebook.react.uimanager.DisplayMetricsHolder; @@ -163,7 +162,6 @@ public class SvgViewShadowNode extends LayoutShadowNode { }); } - @NonNull private RectF getViewBox() { return new RectF(mMinX * mScale, mMinY * mScale, (mMinX + mVbWidth) * mScale, (mMinY + mVbHeight) * mScale); } diff --git a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java index c83bea81..03596594 100644 --- a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java @@ -20,7 +20,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.os.Build; -import android.support.v4.graphics.PaintCompat; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.ReactShadowNode; diff --git a/android/src/main/java/com/horcrux/svg/VirtualNode.java b/android/src/main/java/com/horcrux/svg/VirtualNode.java index d153fd49..4af0085d 100644 --- a/android/src/main/java/com/horcrux/svg/VirtualNode.java +++ b/android/src/main/java/com/horcrux/svg/VirtualNode.java @@ -72,7 +72,7 @@ abstract class VirtualNode extends LayoutShadowNode { return true; } - @android.support.annotation.Nullable + @Nullable GroupShadowNode getTextRoot() { VirtualNode node = this; if (mTextRoot == null) { @@ -95,7 +95,7 @@ abstract class VirtualNode extends LayoutShadowNode { return mTextRoot; } - @android.support.annotation.Nullable + @Nullable GroupShadowNode getParentTextRoot() { ReactShadowNode parent = this.getParent(); if (!(parent instanceof VirtualNode)) { @@ -301,14 +301,6 @@ abstract class VirtualNode extends LayoutShadowNode { return canvasHeight; } - float getCanvasLeft() { - return getSvgShadowNode().getCanvasBounds().left; - } - - float getCanvasTop() { - return getSvgShadowNode().getCanvasBounds().top; - } - void saveDefinition() { if (mName != null) { getSvgShadowNode().defineTemplate(this, mName);