[android] Simplify SvgPackage

android/src/main/java/com/horcrux/svg/RenderableView.java

@@ -70,7 +70,6 @@ abstract public class RenderableView extends VirtualView {
     private Paint.Cap mStrokeLinecap = Paint.Cap.ROUND;
     private Paint.Join mStrokeLinejoin = Paint.Join.ROUND;
 
-
     private @Nullable ReadableArray mFill;
     private float mFillOpacity = 1;
     private Path.FillType mFillRule = Path.FillType.WINDING;
@@ -300,7 +299,7 @@ abstract public class RenderableView extends VirtualView {
             resultCanvas.drawBitmap(original, 0, 0, null);
             resultCanvas.drawBitmap(maskBitmap, 0, 0, maskPaint);
 
-            // Render blended result into current render context
+            // Render composited result into current render context
             canvas.drawBitmap(result, 0, 0, paint);
         } else {
             draw(canvas, paint, opacity);

android/src/main/java/com/horcrux/svg/SvgPackage.java

@@ -19,30 +19,31 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static com.horcrux.svg.RenderableViewManager.*;
 
 public class SvgPackage implements ReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Arrays.<ViewManager>asList(
-                RenderableViewManager.createGroupViewManager(),
+                new GroupViewManager(),
-                RenderableViewManager.createPathViewManager(),
+                new PathViewManager(),
-                RenderableViewManager.createCircleViewManager(),
+                new CircleViewManager(),
-                RenderableViewManager.createEllipseViewManager(),
+                new EllipseViewManager(),
-                RenderableViewManager.createLineViewManager(),
+                new LineViewManager(),
-                RenderableViewManager.createRectViewManager(),
+                new RectViewManager(),
-                RenderableViewManager.createTextViewManager(),
+                new TextViewManager(),
-                RenderableViewManager.createTSpanViewManager(),
+                new TSpanViewManager(),
-                RenderableViewManager.createTextPathViewManager(),
+                new TextPathViewManager(),
-                RenderableViewManager.createImageViewManager(),
+                new ImageViewManager(),
-                RenderableViewManager.createClipPathViewManager(),
+                new ClipPathViewManager(),
-                RenderableViewManager.createDefsViewManager(),
+                new DefsViewManager(),
-                RenderableViewManager.createUseViewManager(),
+                new UseViewManager(),
-                RenderableViewManager.createSymbolManager(),
+                new SymbolManager(),
-                RenderableViewManager.createLinearGradientManager(),
+                new LinearGradientManager(),
-                RenderableViewManager.createRadialGradientManager(),
+                new RadialGradientManager(),
-                RenderableViewManager.createPatternManager(),
+                new PatternManager(),
-                RenderableViewManager.createMaskManager(),
+                new MaskManager(),
                 new SvgViewManager());
     }
 

android/src/main/java/com/horcrux/svg/SvgView.java

@@ -70,7 +70,7 @@ public class SvgView extends ReactViewGroup implements ReactCompoundView, ReactC
     @Override
     public void setId(int id) {
         super.setId(id);
-        SvgViewManager.setSvgView(this);
+        SvgViewManager.setSvgView(id, this);
     }
 
     @Override

android/src/main/java/com/horcrux/svg/SvgViewManager.java

@@ -28,8 +28,8 @@ class SvgViewManager extends ReactViewManager {
 
     private static final SparseArray<SvgView> mTagToSvgView = new SparseArray<>();
 
-    static void setSvgView(SvgView svg) {
+    static void setSvgView(int tag, SvgView svg) {
-        mTagToSvgView.put(svg.getId(), svg);
+        mTagToSvgView.put(tag, svg);
     }
 
     static @Nullable SvgView getSvgViewByTag(int tag) {