feat: use dynamics instead of strings for props that can be either string or number (#2238)

# Summary

PR bringing proper support for react-native-reanimated in the library by using dynamics instead of strings for props that can be either string or number.

Author: WoLewicki

FabricExample/ios/Podfile.lock

@@ -1171,7 +1171,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNSVG (14.1.0):
+  - RNSVG (15.0.0):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1189,9 +1189,9 @@ PODS:
     - React-utils
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNSVG/common (= 14.1.0)
+    - RNSVG/common (= 15.0.0)
     - Yoga
-  - RNSVG/common (14.1.0):
+  - RNSVG/common (15.0.0):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1482,7 +1482,7 @@ SPEC CHECKSUMS:
   React-utils: debda2c206770ee2785bdebb7f16d8db9f18838a
   ReactCommon: ddb128564dcbfa0287d3d1a2d10f8c7457c971f6
   RNReanimated: 71030d84b41327898b22cab449eb5379baf8725e
-  RNSVG: 95341a1f9dc5b08bfbb4312cc20e321063f17883
+  RNSVG: da171fbe23686685cce6bf80f6ecca07108cbd79
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 4f53dc50008d626fa679c7a1cb4bed898f8c0bde
 

FabricExample/package.json

@@ -12,7 +12,6 @@
   "dependencies": {
     "react": "18.2.0",
     "react-native": "0.73.1",
-
     "react-native-reanimated": "^3.6.1",
     "react-native-svg": "link:../"
   },

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

@@ -31,46 +31,16 @@ public void setCx(Dynamic cx) {
     invalidate();
   }
 
-  public void setCx(String cx) {
-    mCx = SVGLength.from(cx);
-    invalidate();
-  }
-
-  public void setCx(Double cx) {
-    mCx = SVGLength.from(cx);
-    invalidate();
-  }
-
   public void setCy(Dynamic cy) {
     mCy = SVGLength.from(cy);
     invalidate();
   }
 
-  public void setCy(String cy) {
-    mCy = SVGLength.from(cy);
-    invalidate();
-  }
-
-  public void setCy(Double cy) {
-    mCy = SVGLength.from(cy);
-    invalidate();
-  }
-
   public void setR(Dynamic r) {
     mR = SVGLength.from(r);
     invalidate();
   }
 
-  public void setR(String r) {
-    mR = SVGLength.from(r);
-    invalidate();
-  }
-
-  public void setR(Double r) {
-    mR = SVGLength.from(r);
-    invalidate();
-  }
-
   @Override
   Path getPath(Canvas canvas, Paint paint) {
     Path path = new Path();

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

@@ -33,61 +33,21 @@ public void setCx(Dynamic cx) {
     invalidate();
   }
 
-  public void setCx(String cx) {
-    mCx = SVGLength.from(cx);
-    invalidate();
-  }
-
-  public void setCx(Double cx) {
-    mCx = SVGLength.from(cx);
-    invalidate();
-  }
-
   public void setCy(Dynamic cy) {
     mCy = SVGLength.from(cy);
     invalidate();
   }
 
-  public void setCy(String cy) {
-    mCy = SVGLength.from(cy);
-    invalidate();
-  }
-
-  public void setCy(Double cy) {
-    mCy = SVGLength.from(cy);
-    invalidate();
-  }
-
   public void setRx(Dynamic rx) {
     mRx = SVGLength.from(rx);
     invalidate();
   }
 
-  public void setRx(String rx) {
-    mRx = SVGLength.from(rx);
-    invalidate();
-  }
-
-  public void setRx(Double rx) {
-    mRx = SVGLength.from(rx);
-    invalidate();
-  }
-
   public void setRy(Dynamic ry) {
     mRy = SVGLength.from(ry);
     invalidate();
   }
 
-  public void setRy(String ry) {
-    mRy = SVGLength.from(ry);
-    invalidate();
-  }
-
-  public void setRy(Double ry) {
-    mRy = SVGLength.from(ry);
-    invalidate();
-  }
-
   @Override
   Path getPath(Canvas canvas, Paint paint) {
     Path path = new Path();

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

@@ -52,61 +52,21 @@ public void setX(Dynamic x) {
     invalidate();
   }
 
-  public void setX(String x) {
-    mX = SVGLength.from(x);
-    invalidate();
-  }
-
-  public void setX(Double x) {
-    mX = SVGLength.from(x);
-    invalidate();
-  }
-
   public void setY(Dynamic y) {
     mY = SVGLength.from(y);
     invalidate();
   }
 
-  public void setY(String y) {
-    mY = SVGLength.from(y);
-    invalidate();
-  }
-
-  public void setY(Double y) {
-    mY = SVGLength.from(y);
-    invalidate();
-  }
-
   public void setWidth(Dynamic width) {
     mW = SVGLength.from(width);
     invalidate();
   }
 
-  public void setWidth(String width) {
-    mW = SVGLength.from(width);
-    invalidate();
-  }
-
-  public void setWidth(Double width) {
-    mW = SVGLength.from(width);
-    invalidate();
-  }
-
   public void setHeight(Dynamic height) {
     mH = SVGLength.from(height);
     invalidate();
   }
 
-  public void setHeight(String height) {
-    mH = SVGLength.from(height);
-    invalidate();
-  }
-
-  public void setHeight(Double height) {
-    mH = SVGLength.from(height);
-    invalidate();
-  }
-
   void drawGroup(final Canvas canvas, final Paint paint, final float opacity) {
     pushGlyphContext();
     final SvgView svg = getSvgView();

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

@@ -18,8 +18,10 @@
 import android.graphics.Region;
 import android.os.Build;
 import android.view.View;
+import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
 import java.util.ArrayList;
 import javax.annotation.Nullable;
 
@@ -32,6 +34,15 @@ public GroupView(ReactContext reactContext) {
     super(reactContext);
   }
 
+  public void setFont(Dynamic dynamic) {
+    if (dynamic.getType() == ReadableType.Map) {
+      mFont = dynamic.asMap();
+    } else {
+      mFont = null;
+    }
+    invalidate();
+  }
+
   public void setFont(@Nullable ReadableMap font) {
     mFont = font;
     invalidate();

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

@@ -58,61 +58,21 @@ public void setX(Dynamic x) {
     invalidate();
   }
 
-  public void setX(String x) {
-    mX = SVGLength.from(x);
-    invalidate();
-  }
-
-  public void setX(Double x) {
-    mX = SVGLength.from(x);
-    invalidate();
-  }
-
   public void setY(Dynamic y) {
     mY = SVGLength.from(y);
     invalidate();
   }
 
-  public void setY(String y) {
-    mY = SVGLength.from(y);
-    invalidate();
-  }
-
-  public void setY(Double y) {
-    mY = SVGLength.from(y);
-    invalidate();
-  }
-
   public void setWidth(Dynamic width) {
     mW = SVGLength.from(width);
     invalidate();
   }
 
-  public void setWidth(String width) {
-    mW = SVGLength.from(width);
-    invalidate();
-  }
-
-  public void setWidth(Double width) {
-    mW = SVGLength.from(width);
-    invalidate();
-  }
-
   public void setHeight(Dynamic height) {
     mH = SVGLength.from(height);
     invalidate();
   }
 
-  public void setHeight(String height) {
-    mH = SVGLength.from(height);
-    invalidate();
-  }
-
-  public void setHeight(Double height) {
-    mH = SVGLength.from(height);
-    invalidate();
-  }
-
   public void setSrc(@Nullable ReadableMap src) {
     if (src != null) {
       uriString = src.getString("uri");

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

@@ -32,61 +32,21 @@ public void setX1(Dynamic x1) {
     invalidate();
   }
 
-  public void setX1(String x1) {
-    mX1 = SVGLength.from(x1);
-    invalidate();
-  }
-
-  public void setX1(Double x1) {
-    mX1 = SVGLength.from(x1);
-    invalidate();
-  }
-
   public void setY1(Dynamic y1) {
     mY1 = SVGLength.from(y1);
     invalidate();
   }
 
-  public void setY1(String y1) {
-    mY1 = SVGLength.from(y1);
-    invalidate();
-  }
-
-  public void setY1(Double y1) {
-    mY1 = SVGLength.from(y1);
-    invalidate();
-  }
-
   public void setX2(Dynamic x2) {
     mX2 = SVGLength.from(x2);
     invalidate();
   }
 
-  public void setX2(String x2) {
-    mX2 = SVGLength.from(x2);
-    invalidate();
-  }
-
-  public void setX2(Double x2) {
-    mX2 = SVGLength.from(x2);
-    invalidate();
-  }
-
   public void setY2(Dynamic y2) {
     mY2 = SVGLength.from(y2);
     invalidate();
   }
 
-  public void setY2(String y2) {
-    mY2 = SVGLength.from(y2);
-    invalidate();
-  }
-
-  public void setY2(Double y2) {
-    mY2 = SVGLength.from(y2);
-    invalidate();
-  }
-
   @Override
   Path getPath(Canvas canvas, Paint paint) {
     Path path = new Path();