@shopify/react-native-skia 0.1.130 → 0.1.133

package/README.md

@@ -31,6 +31,14 @@ If the NDK is not installed, you can install it via Android Studio by going to t
 
 And then the _SDK Location_ section. It will show you the NDK path, or the option to download it if you don't have it installed.
 
+### Proguard
+
+If you're using Proguard, make sure to add the following rule:
+
+```
+-keep class com.shopify.reactnative.skia.** { *; }
+```
+
 ## Playground
 
 We have an example project you can play with [here](https://github.com/Shopify/react-native-skia/tree/main/example).

package/android/cpp/jni/JniSkiaDrawView.cpp

@@ -76,14 +76,15 @@ namespace RNSkia
         std::vector<RNSkia::RNSkTouchPoint> points;
         auto pin = touches.pin();
         auto scale = _drawView->getPixelDensity();
-        points.reserve(pin.size() / 4);
-        for (size_t i = 0; i < pin.size(); i += 4)
+        points.reserve(pin.size() / 5);
+        for (size_t i = 0; i < pin.size(); i += 5)
         {
             RNSkTouchPoint point;
             point.x = pin[i] / scale;
             point.y = pin[i + 1] / scale;
             point.force = pin[i + 2];
             point.type = (RNSkia::RNSkTouchType)pin[i + 3];
+            point.id = pin[i + 4];
             points.push_back(point);
         }
         _drawView->updateTouchState(std::move(points));

package/android/cpp/rnskia-android/RNSkDrawViewImpl.cpp

@@ -53,6 +53,11 @@ namespace RNSkia {
     }
 
     void RNSkDrawViewImpl::surfaceSizeChanged(int width, int height) {
+        if(width == 0 && height == 0) {
+            // Setting width/height to zero is nothing we need to care about when
+            // it comes to invalidating the surface.
+            return;
+        }
         _scaledWidth = width;
         _scaledHeight = height;
 

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDrawView.java

@@ -59,7 +59,7 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
         int action = ev.getAction();
         int count = ev.getPointerCount();
         MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
-        double[] points = new double[count*4];
+        double[] points = new double[count*5];
         for (int i = 0; i < count; i++) {
             ev.getPointerCoords(i, r);
             points[i] = r.x;
@@ -81,6 +81,7 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
                     points[i+3] = 3;
                     break;
             }
+            points[i+4] = ev.getPointerId(i);
         }
         updateTouchPoints(points);
         return true;

package/cpp/api/JsiSkCanvas.h

@@ -456,7 +456,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(drawColor) {
-    SkColor cl = arguments[0].asNumber();
+    SkColor cl = JsiSkColor::fromValue(runtime, arguments[0]);
     if (count == 1) {
       _canvas->drawColor(cl);
     } else {
@@ -467,7 +467,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(clear) {
-    SkColor cl = arguments[0].asNumber();
+    SkColor cl = JsiSkColor::fromValue(runtime, arguments[0]);
     _canvas->clear(cl);
     return jsi::Value::undefined();
   }

package/cpp/api/JsiSkFont.h

@@ -5,13 +5,15 @@
 #include <vector>
 
 #include <jsi/jsi.h>
-
 #include "JsiSkHostObjects.h"
+#include <RNSkLog.h>
+
 #include "JsiSkPaint.h"
 #include "JsiSkRect.h"
 #include "JsiSkTypeface.h"
 #include "JsiSkPoint.h"
 
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
@@ -37,6 +39,7 @@ namespace RNSkia
 
         JSI_HOST_FUNCTION(measureText)
         {
+            RNSkLogger::warnToJavascriptConsole(runtime, "measureText() is deprecated.  Clients should use 'Font.getGlyphWidths' instead (the latter does no shaping)");
             auto textVal = arguments[0].asString(runtime).utf8(runtime);
             auto text = textVal.c_str();
             SkRect rect;
@@ -252,6 +255,7 @@ namespace RNSkia
         }
 
         JSI_EXPORT_FUNCTIONS(
+            JSI_EXPORT_FUNC(JsiSkFont, getSize),
             JSI_EXPORT_FUNC(JsiSkFont, measureText),
             JSI_EXPORT_FUNC(JsiSkFont, getMetrics),
             JSI_EXPORT_FUNC(JsiSkFont, getGlyphIDs),
@@ -323,4 +327,4 @@ namespace RNSkia
         }
     };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkImage.h

@@ -65,9 +65,7 @@ namespace RNSkia
     JSI_HOST_FUNCTION(encodeToBytes)
     {
       // Get optional parameters
-      auto format = count >= 1 ? getFormatFromNumber(
-        static_cast<int>(arguments[0].asNumber())) : SkEncodedImageFormat::kPNG;
-      
+      auto format = count >= 1 ? static_cast<SkEncodedImageFormat>(arguments[0].asNumber()) : SkEncodedImageFormat::kPNG;
       auto quality = count == 2 ? arguments[1].asNumber() : 100.0;
       
       // Get data
@@ -89,8 +87,7 @@ namespace RNSkia
     JSI_HOST_FUNCTION(encodeToBase64)
     {
       // Get optional parameters
-      auto format = count >= 1 ? getFormatFromNumber(
-        static_cast<int>(arguments[0].asNumber())) : SkEncodedImageFormat::kPNG;
+      auto format = count >= 1 ? static_cast<SkEncodedImageFormat>(arguments[0].asNumber()) : SkEncodedImageFormat::kPNG;
       
       auto quality = count == 2 ? arguments[1].asNumber() : 100.0;
       
@@ -122,20 +119,6 @@ namespace RNSkia
           .asHostObject<JsiSkImage>(runtime)
           ->getObject();
     }
-  private:
-    
-    SkEncodedImageFormat getFormatFromNumber(int value) {
-      switch(value) {
-        case 0: // PNG
-          return SkEncodedImageFormat::kPNG;
-        case 1: // JPEG
-          return SkEncodedImageFormat::kJPEG;
-        case 2: // WEBP
-          return SkEncodedImageFormat::kWEBP;
-        default:
-          return SkEncodedImageFormat::kPNG;
-      }
-    }
   };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMatrix.h

@@ -18,6 +18,7 @@ namespace RNSkia {
 
 using namespace facebook;
 
+
 class JsiSkMatrix : public JsiSkWrappingSharedPtrHostObject<SkMatrix> {
 public:
 
@@ -26,45 +27,64 @@ public:
             context, std::make_shared<SkMatrix>(std::move(m))) {}
 
 
-  JSI_HOST_FUNCTION(preConcat) {
+    static SkMatrix getMatrix(jsi::Runtime &runtime, const jsi::Value& value) {
+        const auto& object = value.asObject(runtime);
+        const auto& array = object.asArray(runtime);
+        auto scaleX = array.getValueAtIndex(runtime, 0).asNumber();
+        auto skewX = array.getValueAtIndex(runtime, 1).asNumber();
+        auto transX = array.getValueAtIndex(runtime, 2).asNumber();
+        auto skewY = array.getValueAtIndex(runtime, 3).asNumber();
+        auto scaleY = array.getValueAtIndex(runtime, 4).asNumber();
+        auto transY = array.getValueAtIndex(runtime, 5).asNumber();
+        auto pers0 = array.getValueAtIndex(runtime, 6).asNumber();
+        auto pers1 = array.getValueAtIndex(runtime, 7).asNumber();
+        auto pers2 = array.getValueAtIndex(runtime, 8).asNumber();
+        return SkMatrix::MakeAll(
+                scaleX, skewX, transX,
+                skewY,  scaleY, transY,
+                pers0,  pers1,  pers2
+        );
+    }
+
+  JSI_HOST_FUNCTION(concat) {
     auto m3 = JsiSkMatrix::fromValue(runtime, arguments[0]);
     getObject()->preConcat(*m3);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preTranslate) {
+  JSI_HOST_FUNCTION(translate) {
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     getObject()->preTranslate(x, y);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preScale) {
+  JSI_HOST_FUNCTION(scale) {
     auto x = arguments[0].asNumber();
-    auto y = arguments[1].asNumber();
+    auto y = count > 1 ? arguments[1].asNumber() : 1;
     getObject()->preScale(x, y);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preSkew) {
+  JSI_HOST_FUNCTION(skew) {
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     getObject()->preSkew(x, y);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preRotate) {
+  JSI_HOST_FUNCTION(rotate) {
     auto a = arguments[0].asNumber();
-    getObject()->preRotate(a);
+    getObject()->preRotate(SkRadiansToDegrees(a));
     return jsi::Value::undefined();
   }
 
   JSI_EXPORT_FUNCTIONS(
-    JSI_EXPORT_FUNC(JsiSkMatrix, preConcat),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preTranslate),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preScale),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preSkew),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preRotate),
+    JSI_EXPORT_FUNC(JsiSkMatrix, concat),
+    JSI_EXPORT_FUNC(JsiSkMatrix, translate),
+    JSI_EXPORT_FUNC(JsiSkMatrix, scale),
+    JSI_EXPORT_FUNC(JsiSkMatrix, skew),
+    JSI_EXPORT_FUNC(JsiSkMatrix, rotate),
   )
 
   /**
@@ -78,28 +98,21 @@ public:
               .asHostObject<JsiSkMatrix>(runtime)
               ->getObject();
     } else {
-      const auto& array = object.asArray(runtime);
-      auto scaleX = array.getValueAtIndex(runtime, 0).asNumber();
-      auto skewX = array.getValueAtIndex(runtime, 1).asNumber();
-      auto transX = array.getValueAtIndex(runtime, 2).asNumber();
-      auto skewY = array.getValueAtIndex(runtime, 3).asNumber();
-      auto scaleY = array.getValueAtIndex(runtime, 4).asNumber();
-      auto transY = array.getValueAtIndex(runtime, 5).asNumber();
-      auto pers0 = array.getValueAtIndex(runtime, 6).asNumber();
-      auto pers1 = array.getValueAtIndex(runtime, 7).asNumber();
-      auto pers2 = array.getValueAtIndex(runtime, 8).asNumber();
-      return std::make_shared<SkMatrix>(SkMatrix::MakeAll(
-        scaleX, skewX, transX,
-        skewY,  scaleY, transY,
-        pers0,  pers1,  pers2));
+      return std::make_shared<SkMatrix>(JsiSkMatrix::getMatrix(runtime, obj));
     }
   }
 
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
+      SkMatrix matrix;
+      if (count == 1) {
+        matrix = JsiSkMatrix::getMatrix(runtime, arguments[0]);
+      } else {
+        matrix = SkMatrix::I();
+      }
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkMatrix>(std::move(context), SkMatrix::I()));
+          runtime, std::make_shared<JsiSkMatrix>(std::move(context), matrix));
     };
   }
 };

package/cpp/api/JsiSkPaint.h

@@ -84,47 +84,20 @@ public:
   }
 
   JSI_HOST_FUNCTION(setStyle) {
-    int styleInt = arguments[0].asNumber();
-    switch (styleInt) {
-    case 0:
-      getObject()->setStyle(SkPaint::kFill_Style);
-      break;
-    case 1:
-      getObject()->setStyle(SkPaint::kStroke_Style);
-      break;
-    }
+    auto style = arguments[0].asNumber();
+    getObject()->setStyle(static_cast<SkPaint::Style>(style));
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(setStrokeCap) {
-    int cap = arguments[0].asNumber();
-    switch (cap) {
-    case 0:
-      getObject()->setStrokeCap(SkPaint::kButt_Cap);
-      break;
-    case 1:
-      getObject()->setStrokeCap(SkPaint::kRound_Cap);
-      break;
-    case 2:
-      getObject()->setStrokeCap(SkPaint::kSquare_Cap);
-      break;
-    }
+    auto cap = arguments[0].asNumber();
+    getObject()->setStrokeCap(static_cast<SkPaint::Cap>(cap));
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(setStrokeJoin) {
     int join = arguments[0].asNumber();
-    switch (join) {
-    case 0:
-      getObject()->setStrokeJoin(SkPaint::kBevel_Join);
-      break;
-    case 1:
-      getObject()->setStrokeJoin(SkPaint::kMiter_Join);
-      break;
-    case 2:
-      getObject()->setStrokeJoin(SkPaint::kRound_Join);
-      break;
-    }
+    getObject()->setStrokeJoin(static_cast<SkPaint::Join>(join));
     return jsi::Value::undefined();
   }
 
@@ -215,9 +188,11 @@ Returns the underlying object from a host object of this type
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
+      auto paint = SkPaint();
+      paint.setAntiAlias(true);
       // Return the newly constructed object
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkPaint>(std::move(context), SkPaint()));
+          runtime, std::make_shared<JsiSkPaint>(std::move(context), paint));
     };
   }
 };