@shopify/react-native-skia 0.1.185 → 0.1.186

package/android/build.gradle

@@ -149,7 +149,8 @@ android {
              "**/libfbjni.so",
              "**/libjsi.so",
              "**/libreact_nativemodule_core.so",
-             "**/libturbomodulejsijni.so"
+             "**/libturbomodulejsijni.so",
+             "META-INF/**"
         ]
     }
 

package/android/cpp/jni/JniPlatformContext.cpp

@@ -8,7 +8,51 @@
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #include "SkTypes.h"
-#include <RNSkMeasureTime.h>
+
+#include <android/bitmap.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkBitmap.h"
+#include "SkPixmap.h"
+
+#pragma clang diagnostic pop
+
+static SkAlphaType alpha_type(int32_t flags) {
+  switch ((flags >> ANDROID_BITMAP_FLAGS_ALPHA_SHIFT) &
+          ANDROID_BITMAP_FLAGS_ALPHA_MASK) {
+  case ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE:
+    return kOpaque_SkAlphaType;
+  case ANDROID_BITMAP_FLAGS_ALPHA_PREMUL:
+    return kPremul_SkAlphaType;
+  case ANDROID_BITMAP_FLAGS_ALPHA_UNPREMUL:
+    return kUnpremul_SkAlphaType;
+  default:
+    break;
+  }
+
+  return kUnknown_SkAlphaType;
+}
+
+static SkColorType color_type(int32_t format) {
+  switch (format) {
+  case ANDROID_BITMAP_FORMAT_RGBA_8888:
+    return kRGBA_8888_SkColorType;
+  case ANDROID_BITMAP_FORMAT_RGB_565:
+    return kRGB_565_SkColorType;
+  case ANDROID_BITMAP_FORMAT_RGBA_4444:
+    return kARGB_4444_SkColorType;
+  case ANDROID_BITMAP_FORMAT_RGBA_F16:
+    return kRGBA_F16_SkColorType;
+  case ANDROID_BITMAP_FORMAT_A_8:
+    return kAlpha_8_SkColorType;
+  default:
+    break;
+  }
+
+  return kUnknown_SkColorType;
+}
 
 namespace RNSkia {
 
@@ -31,6 +75,41 @@ TSelf JniPlatformContext::initHybrid(jni::alias_ref<jhybridobject> jThis,
   return makeCxxInstance(jThis, pixelDensity);
 }
 
+sk_sp<SkImage> JniPlatformContext::takeScreenshotFromViewTag(size_t tag) {
+  // Call the java method for creating a view screenshot as a bitmap:
+  auto env = jni::Environment::current();
+  static auto method = javaPart_->getClass()->getMethod<jobject(int)>(
+      "takeScreenshotFromViewTag");
+
+  auto bitmap = method(javaPart_.get(), tag).release();
+
+  // Let's convert to a native bitmap and get some info about the bitmap
+  AndroidBitmapInfo bmi;
+  AndroidBitmap_getInfo(env, bitmap, &bmi);
+
+  // Convert android bitmap info to a Skia bitmap info
+  auto colorType = color_type(bmi.format);
+  auto alphaType = alpha_type(bmi.flags);
+
+  auto skInfo = SkImageInfo::Make(SkISize::Make(bmi.width, bmi.height),
+                                  colorType, alphaType);
+
+  // Lock pixels
+  void *pixels;
+  AndroidBitmap_lockPixels(env, bitmap, &pixels);
+
+  // Create pixmap from pixels and make a copy of it so that
+  // the SkImage owns its own pixels
+  SkPixmap pm(skInfo, pixels, bmi.stride);
+  auto skImage = SkImage::MakeRasterCopy(pm);
+
+  // Unlock pixels
+  AndroidBitmap_unlockPixels(env, bitmap);
+
+  // Return our newly created SkImage!
+  return skImage;
+}
+
 void JniPlatformContext::startDrawLoop() {
   jni::ThreadScope ts;
   // Start drawing loop
@@ -52,7 +131,19 @@ void JniPlatformContext::notifyDrawLoopExternal() {
   _onNotifyDrawLoop();
 }
 
+void JniPlatformContext::runTaskOnMainThread(std::function<void()> task) {
+  _taskMutex->lock();
+  _taskCallbacks.push(task);
+  _taskMutex->unlock();
+
+  // Notify Java that task is ready
+  static auto method = javaPart_->getClass()->getMethod<void(void)>(
+      "notifyTaskReadyOnMainThread");
+  method(javaPart_.get());
+}
+
 void JniPlatformContext::notifyTaskReadyExternal() {
+  jni::ThreadScope ts;
   _taskMutex->lock();
   auto task = _taskCallbacks.front();
   if (task != nullptr) {
@@ -67,8 +158,6 @@ void JniPlatformContext::notifyTaskReadyExternal() {
 void JniPlatformContext::performStreamOperation(
     const std::string &sourceUri,
     const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) {
-  auto measure = RNSkMeasureTime("JniPlatformContext::performStreamOperation");
-
   static auto method = javaPart_->getClass()->getMethod<jbyteArray(jstring)>(
       "getJniStreamFromSource");
 

package/android/cpp/jni/include/JniPlatformContext.h

@@ -44,8 +44,12 @@ public:
 
   void notifyTaskReadyExternal();
 
+  void runTaskOnMainThread(std::function<void()> task);
+
   float getPixelDensity() { return _pixelDensity; }
 
+  sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag);
+
   void setOnNotifyDrawLoop(const std::function<void(void)> &callback) {
     _onNotifyDrawLoop = callback;
   }

package/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h

@@ -41,6 +41,14 @@ public:
     return MakeOffscreenGLSurface(width, height);
   }
 
+  void runOnMainThread(std::function<void()> task) override {
+    _jniPlatformContext->runTaskOnMainThread(task);
+  }
+
+  sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag) override {
+    return _jniPlatformContext->takeScreenshotFromViewTag(tag);
+  }
+
   void startDrawLoop() override { _jniPlatformContext->startDrawLoop(); }
 
   void stopDrawLoop() override { _jniPlatformContext->stopDrawLoop(); }

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

@@ -1,6 +1,7 @@
 package com.shopify.reactnative.skia;
 
 import android.app.Application;
+import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
@@ -53,7 +54,7 @@ public class PlatformContext {
         Choreographer.FrameCallback frameCallback = new Choreographer.FrameCallback() {
             @Override
             public void doFrame(long frameTimeNanos) {
-                if(_isPaused) {
+                if (_isPaused) {
                     return;
                 }
                 notifyDrawLoop();
@@ -65,6 +66,21 @@ public class PlatformContext {
         Choreographer.getInstance().postFrameCallback(frameCallback);
     }
 
+    @DoNotStrip
+    public void notifyTaskReadyOnMainThread() {
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                notifyTaskReady();
+            }
+        });
+    }
+
+    @DoNotStrip
+    Object takeScreenshotFromViewTag(int tag) {
+        return ViewScreenshotService.makeViewScreenshotFromTag(mContext, tag);
+    }
+
     @DoNotStrip
     public void raise(final String message) {
         new Handler(Looper.getMainLooper()).post(new Runnable() {

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

@@ -0,0 +1,180 @@
+package com.shopify.reactnative.skia;
+
+import static android.view.View.VISIBLE;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.PixelCopy;
+import android.view.SurfaceView;
+import android.view.TextureView;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+
+public class ViewScreenshotService {
+    private static final long SURFACE_VIEW_READ_PIXELS_TIMEOUT = 5;
+    private static final String TAG = "SkiaScreenshot";
+
+    public static Bitmap makeViewScreenshotFromTag(ReactContext context, int tag) {
+        UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
+        View view = uiManager.resolveView(tag);
+        if (view == null) {
+            throw new RuntimeException("Could not resolve view from view tag " + tag);
+        }
+
+        // Measure and get size of view
+        int width = view.getWidth();
+        int height = view.getHeight();
+
+        if (width <= 0 || height <= 0) {
+            return null;
+        }
+
+        // The following code is taken from react-native-view-shot to be able to handle and
+        // correctly render all kinds of views, also including TextureViews and SurfaceViews
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+
+        final Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setFilterBitmap(true);
+        paint.setDither(true);
+
+        // Render the main view and its children
+        final Canvas c = new Canvas(bitmap);
+        view.draw(c);
+
+        // Enumerate children
+        final List<View> childrenList = getAllChildren(view);
+
+        for (final View child : childrenList) {
+            // skip any child that we don't know how to process
+            if (child instanceof TextureView) {
+                // skip all invisible to user child views
+                if (child.getVisibility() != VISIBLE) continue;
+
+                final TextureView tvChild = (TextureView) child;
+                tvChild.setOpaque(false); // <-- switch off background fill
+
+                // TextureView should use bitmaps with matching size,
+                // otherwise content of the TextureView will be scaled to provided bitmap dimensions
+                final Bitmap childBitmapBuffer = tvChild.getBitmap(Bitmap.createBitmap(child.getWidth(), child.getHeight(), Bitmap.Config.ARGB_8888));
+
+                final int countCanvasSave = c.save();
+                applyTransformations(c, view, child);
+
+                // due to re-use of bitmaps for screenshot, we can get bitmap that is bigger in size than requested
+                c.drawBitmap(childBitmapBuffer, 0, 0, paint);
+
+                c.restoreToCount(countCanvasSave);
+            } else if (child instanceof SurfaceView) {
+                final SurfaceView svChild = (SurfaceView)child;
+                final CountDownLatch latch = new CountDownLatch(1);
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    final Bitmap childBitmapBuffer = Bitmap.createBitmap(child.getWidth(), child.getHeight(), Bitmap.Config.ARGB_8888);
+                    try {
+                        PixelCopy.request(svChild, childBitmapBuffer, new PixelCopy.OnPixelCopyFinishedListener() {
+                            @Override
+                            public void onPixelCopyFinished(int copyResult) {
+                                final int countCanvasSave = c.save();
+                                applyTransformations(c, view, child);
+                                c.drawBitmap(childBitmapBuffer, 0, 0, paint);
+                                c.restoreToCount(countCanvasSave);
+                                latch.countDown();
+                            }
+                        }, new Handler(Looper.getMainLooper()));
+                        latch.await(SURFACE_VIEW_READ_PIXELS_TIMEOUT, TimeUnit.SECONDS);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Cannot PixelCopy for " + svChild, e);
+                    }
+                } else {
+                    Bitmap cache = svChild.getDrawingCache();
+                    if (cache != null) {
+                        c.drawBitmap(svChild.getDrawingCache(), 0, 0, paint);
+                    }
+                }
+            }
+        }
+
+        return bitmap;
+    }
+
+    private static List<View> getAllChildren(@NonNull final View v) {
+        if (!(v instanceof ViewGroup)) {
+            final ArrayList<View> viewArrayList = new ArrayList<>();
+            viewArrayList.add(v);
+
+            return viewArrayList;
+        }
+
+        final ArrayList<View> result = new ArrayList<>();
+
+        ViewGroup viewGroup = (ViewGroup) v;
+        for (int i = 0; i < viewGroup.getChildCount(); i++) {
+            View child = viewGroup.getChildAt(i);
+
+            //Do not add any parents, just add child elements
+            result.addAll(getAllChildren(child));
+        }
+
+        return result;
+    }
+
+    /**
+     * Concat all the transformation matrix's from parent to child.
+     */
+    @NonNull
+    @SuppressWarnings("UnusedReturnValue")
+    private static Matrix applyTransformations(final Canvas c, @NonNull final View root, @NonNull final View child) {
+        final Matrix transform = new Matrix();
+        final LinkedList<View> ms = new LinkedList<>();
+
+        // find all parents of the child view
+        View iterator = child;
+        do {
+            ms.add(iterator);
+
+            iterator = (View) iterator.getParent();
+        } while (iterator != root);
+
+        // apply transformations from parent --> child order
+        Collections.reverse(ms);
+
+        for (final View v : ms) {
+            c.save();
+
+            // apply each view transformations, so each child will be affected by them
+            final float dx = v.getLeft() + ((v != child) ? v.getPaddingLeft() : 0) + v.getTranslationX();
+            final float dy = v.getTop() + ((v != child) ? v.getPaddingTop() : 0) + v.getTranslationY();
+            c.translate(dx, dy);
+            c.rotate(v.getRotation(), v.getPivotX(), v.getPivotY());
+            c.scale(v.getScaleX(), v.getScaleY());
+
+            // compute the matrix just for any future use
+            transform.postTranslate(dx, dy);
+            transform.postRotate(v.getRotation(), v.getPivotX(), v.getPivotY());
+            transform.postScale(v.getScaleX(), v.getScaleY());
+        }
+
+        return transform;
+    }
+
+}

package/cpp/api/JsiSkFont.h

@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "JsiSkHostObjects.h"
-#include <RNSkLog.h>
+#include "RNSkLog.h"
 #include <jsi/jsi.h>
 
 #include "JsiSkPaint.h"

package/cpp/api/JsiSkHostObjects.h

@@ -3,8 +3,8 @@
 #include <memory>
 #include <utility>
 
+#include "JsiHostObject.h"
 #include "RNSkPlatformContext.h"
-#include <JsiHostObject.h>
 
 namespace RNSkia {
 

package/cpp/api/JsiSkImage.h

@@ -4,9 +4,9 @@
 #include <string>
 #include <utility>
 
+#include "JsiSkHostObjects.h"
 #include "JsiSkMatrix.h"
 #include "JsiSkShader.h"
-#include <JsiSkHostObjects.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/JsiSkImageFactory.h

@@ -38,7 +38,36 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
+  JSI_HOST_FUNCTION(MakeImageFromViewTag) {
+    auto viewTag = arguments[0].asNumber();
+    auto context = getContext();
+    return react::createPromiseAsJSIValue(
+        runtime,
+        [context = std::move(context),
+         viewTag](jsi::Runtime &runtime,
+                  std::shared_ptr<react::Promise> promise) -> void {
+          // Create a stream operation - this will be run on the main thread
+          context->makeViewScreenshot(
+              viewTag, [&runtime, context = std::move(context),
+                        promise = std::move(promise)](sk_sp<SkImage> image) {
+                context->runOnJavascriptThread([&runtime,
+                                                context = std::move(context),
+                                                promise = std::move(promise),
+                                                result = std::move(image)]() {
+                  if (result == nullptr) {
+                    promise->reject("Failed to create image from view tag");
+                    return;
+                  }
+                  promise->resolve(jsi::Object::createFromHostObject(
+                      runtime, std::make_shared<JsiSkImage>(
+                                   std::move(context), std::move(result))));
+                });
+              });
+        });
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImageFromEncoded),
+                       JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImageFromViewTag),
                        JSI_EXPORT_FUNC(JsiSkImageFactory, MakeImage), )
 
   explicit JsiSkImageFactory(std::shared_ptr<RNSkPlatformContext> context)

package/cpp/api/JsiSkPaint.h

@@ -5,13 +5,13 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiSkColor.h>
-#include <JsiSkColorFilter.h>
-#include <JsiSkHostObjects.h>
-#include <JsiSkImageFilter.h>
-#include <JsiSkMaskFilter.h>
-#include <JsiSkPathEffect.h>
-#include <JsiSkShader.h>
+#include "JsiSkColor.h"
+#include "JsiSkColorFilter.h"
+#include "JsiSkHostObjects.h"
+#include "JsiSkImageFilter.h"
+#include "JsiSkMaskFilter.h"
+#include "JsiSkPathEffect.h"
+#include "JsiSkShader.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/JsiSkPathFactory.h

@@ -11,9 +11,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "RNSkLog.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
-#include <RNSkLog.h>
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPicture.h

@@ -2,9 +2,9 @@
 
 #include <memory>
 
+#include "JsiSkData.h"
 #include "JsiSkHostObjects.h"
-#include <JsiSkData.h>
-#include <JsiSkShader.h>
+#include "JsiSkShader.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/JsiSkRuntimeEffect.h

@@ -5,9 +5,9 @@
 #include <utility>
 #include <vector>
 
-#include <JsiSkHostObjects.h>
-#include <JsiSkMatrix.h>
-#include <JsiSkShader.h>
+#include "JsiSkHostObjects.h"
+#include "JsiSkMatrix.h"
+#include "JsiSkShader.h"
 
 #include <jsi/jsi.h>
 

package/cpp/api/JsiSkSVG.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiSkHostObjects.h>
+#include "JsiSkHostObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -28,6 +28,14 @@ public:
     return jsi::String::createFromUtf8(runtime, "SVG");
   }
 
+  JSI_HOST_FUNCTION(width) {
+    return static_cast<double>(getObject()->containerSize().width());
+  }
+
+  JSI_HOST_FUNCTION(height) {
+    return static_cast<double>(getObject()->containerSize().height());
+  }
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkSVG, __typename__))
 
   JSI_HOST_FUNCTION(dispose) {
@@ -35,7 +43,9 @@ public:
     return jsi::Value::undefined();
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSVG, dispose))
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSVG, width),
+                       JSI_EXPORT_FUNC(JsiSkSVG, height),
+                       JSI_EXPORT_FUNC(JsiSkSVG, dispose))
 
   /**
     Returns the underlying object from a host object of this type

package/cpp/api/JsiSkShader.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiSkHostObjects.h>
+#include "JsiSkHostObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/JsiSkSurface.h

@@ -7,9 +7,9 @@
 
 #include "JsiSkHostObjects.h"
 
-#include <JsiSkCanvas.h>
-#include <JsiSkImage.h>
-#include <JsiSkSurfaceFactory.h>
+#include "JsiSkCanvas.h"
+#include "JsiSkImage.h"
+#include "JsiSkSurfaceFactory.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/JsiSkSurfaceFactory.h

@@ -7,7 +7,7 @@
 
 #include "JsiSkHostObjects.h"
 
-#include <JsiSkSurface.h>
+#include "JsiSkSurface.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/JsiSkTypeface.h

@@ -6,7 +6,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkHostObjects.h"
-#include <RNSkLog.h>
+#include "RNSkLog.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/rnskia/RNSkAnimation.h

@@ -3,9 +3,9 @@
 #include <array>
 #include <memory>
 
-#include <JsiHostObject.h>
-#include <RNSkClockValue.h>
-#include <RNSkPlatformContext.h>
+#include "JsiHostObject.h"
+#include "RNSkClockValue.h"
+#include "RNSkPlatformContext.h"
 #include <jsi/jsi.h>
 
 namespace RNSkia {

package/cpp/rnskia/RNSkDomView.h

@@ -9,21 +9,21 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiValueWrapper.h>
-#include <RNSkView.h>
+#include "JsiValueWrapper.h"
+#include "RNSkView.h"
 
 #include "JsiDomRenderNode.h"
-#include <RNSkInfoParameter.h>
-#include <RNSkLog.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkTimingInfo.h>
+#include "RNSkInfoParameter.h"
+#include "RNSkLog.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkTimingInfo.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkBBHFactory.h>
-#include <SkCanvas.h>
-#include <SkPictureRecorder.h>
+#include "SkBBHFactory.h"
+#include "SkCanvas.h"
+#include "SkPictureRecorder.h"
 
 #pragma clang diagnostic pop
 

package/cpp/rnskia/RNSkInfoParameter.h

@@ -8,8 +8,8 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiHostObject.h>
-#include <RNSkView.h>
+#include "JsiHostObject.h"
+#include "RNSkView.h"
 
 namespace RNSkia {
 

package/cpp/rnskia/RNSkJsView.h

@@ -9,14 +9,14 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiValueWrapper.h>
-#include <RNSkView.h>
-
-#include <JsiSkCanvas.h>
-#include <RNSkInfoParameter.h>
-#include <RNSkLog.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkTimingInfo.h>
+#include "JsiValueWrapper.h"
+#include "RNSkView.h"
+
+#include "JsiSkCanvas.h"
+#include "RNSkInfoParameter.h"
+#include "RNSkLog.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkTimingInfo.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"