@shopify/react-native-skia 2.12.0-next.1 → 2.13.0

package/android/build.gradle

@@ -2,39 +2,23 @@ import java.nio.file.Paths
 
 // android/build.gradle
 
-// based on:
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
-//   previous location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
-//   previous location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
-
 // FBJNI build is based on:
 // https://github.com/facebookincubator/fbjni/blob/main/docs/android_setup.md
 
 // These defaults should reflect the SDK versions used by
-// the minimum React Native version supported.
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 28
+// the minimum React Native version supported (0.78).
+def DEFAULT_COMPILE_SDK_VERSION = 35
+def DEFAULT_BUILD_TOOLS_VERSION = '35.0.0'
+def DEFAULT_MIN_SDK_VERSION = 24
+def DEFAULT_TARGET_SDK_VERSION = 34
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
-
 apply plugin: 'com.android.library'
+// Runs codegen for the TurboModule spec and the Fabric component (src/specs).
+apply plugin: 'com.facebook.react'
 
 def reactNativeArchitectures() {
   def value = project.getProperties().get("reactNativeArchitectures")
@@ -128,10 +112,6 @@ logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
 def sourceBuild = false
 def defaultDir
 
-if (isNewArchitectureEnabled()) {
-    apply plugin: "com.facebook.react"
-}
-
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
 } else if (findProject(':ReactAndroid') != null) {
@@ -147,54 +127,18 @@ if (!defaultDir.exists()) {
     )
 }
 
-def prebuiltDir = sourceBuild
-    ? "$nodeModules/react-native/ReactAndroid/src/main/jni/prebuilt/lib"
-    : "$buildDir/react-native-0*/jni"
-
-
-def buildType = "debug"
-if (gradle.startParameter.taskRequests.args[0].toString().contains("Release")) {
-    buildType = "release"
-} else if (gradle.startParameter.taskRequests.args[0].toString().contains("Debug")) {
-    buildType = "debug"
-}
-
 def reactProperties = new Properties()
 file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 def FULL_RN_VERSION =  (System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME"))
 def REACT_NATIVE_VERSION = FULL_RN_VERSION.split("\\.")[1].toInteger()
-def ENABLE_PREFAB = REACT_NATIVE_VERSION > 68
 
 logger.warn("react-native-skia: RN Version: ${REACT_NATIVE_VERSION} / ${FULL_RN_VERSION}")
 logger.warn("react-native-skia: isSourceBuild: ${sourceBuild}")
-logger.warn("react-native-skia: PrebuiltDir: ${prebuiltDir}")
-logger.warn("react-native-skia: buildType: ${buildType}")
 logger.warn("react-native-skia: buildDir: ${buildDir}")
 logger.warn("react-native-skia: node_modules: ${nodeModules}")
-logger.warn("react-native-skia: Enable Prefab: ${ENABLE_PREFAB}")
-
-buildscript {
-    // The Android Gradle plugin is only required when opening the android folder stand-alone.
-    // This avoids unnecessary downloads and potential conflicts when the library is included as a
-    // module dependency in an application project.
-    // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
-    if (project == rootProject) {
-        repositories {
-            google()
-        }
-        dependencies {
-            // This should reflect the Gradle plugin version used by
-            // the minimum React Native version supported.
-            classpath 'com.android.tools.build:gradle:3.4.1'
-        }
-    }
-}
 
 android {
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-      namespace "com.shopify.reactnative.skia"
-    }
+    namespace "com.reactnative.skia"
 
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
@@ -213,17 +157,15 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         externalNativeBuild {
             cmake {
-                cppFlags "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
+                cppFlags "-fexceptions", "-frtti"
                 abiFilters (*reactNativeArchitectures())
                 arguments '-DANDROID_STL=c++_shared',
                           "-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION}",
                           "-DREACT_NATIVE_DIR=${defaultDir}",
                           "-DNODE_MODULES_DIR=${nodeModules}",
-                          "-DPREBUILT_DIR=${prebuiltDir}",
                           "-DSKIA_LIBS_PATH=${skiaLibsPath}",
                           "-DSK_GRAPHITE=${useGraphite ? 'ON' : 'OFF'}",
                           "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
@@ -245,25 +187,6 @@ android {
         jniLibs {
             srcDirs += [skiaLibsPath]
         }
-        java {
-            if (!isNewArchitectureEnabled()) {
-                srcDirs += [
-                    "src/paper/java",
-                ]
-            }
-
-            if (REACT_NATIVE_VERSION == 74) {
-                srcDirs += [
-                    "src/reactnative74/java"
-                ]
-            } else {
-                // the name latest here might be confusing as it applies for versions
-                // below 74 as well
-                srcDirs += [
-                    "src/latest/java"
-                ]
-            }
-        }
     }
 
     externalNativeBuild {
@@ -277,45 +200,23 @@ android {
              "**/libc++_shared.so",
              "**/libfbjni.so",
              "**/libjsi.so",
-             "**/libreact_nativemodule_core.so",
-             "**/libreactnativejni.so",
-             "**/libruntimeexecutor.so",
-             "**/libturbomodulejsijni.so",
              "**/libreactnative.so",
              "META-INF/**"
         ]
     }
 
-    if (ENABLE_PREFAB) {
-        buildFeatures {
-                prefab true
-                prefabPublishing true
-        }
-        prefab {
-            rnskia {
-                headers "${project.buildDir}/headers/rnskia/"
-            }
-        }
+    buildFeatures {
+        prefab true
+        prefabPublishing true
     }
-
-    // Create new configurations that can be referred to in dependencies.
-    // The Android Gradle Plugin 3.* does not allow hooking into existing
-    // configurations like `implementation`.
-    configurations {
-        extractHeaders
-        extractJNI
+    prefab {
+        rnskia {
+            headers "${project.buildDir}/headers/rnskia/"
+        }
     }
 }
 
 repositories {
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    maven {
-        // Android JSC is installed from npm
-        url("$rootDir/../node_modules/jsc-android/dist")
-    }
     mavenCentral {
         // We don't want to fetch react-native from Maven Central as there are
         // older versions over there.
@@ -329,102 +230,32 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-
-    if (REACT_NATIVE_VERSION < 71) {
-        logger.warn("react-native-skia: Extracting files from AAR (pre RN 0.71)")
-        //noinspection GradleDynamicVersion
-        extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
-        //noinspection GradleDynamicVersion
-        extractJNI("com.facebook.fbjni:fbjni:0.2.2")
-    }
-
-    if (!sourceBuild) {
-        def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
-        if (REACT_NATIVE_VERSION < 69) {
-            logger.warn("react-native-skia: aar state pre 69. match **/**/*.aar")
-            rnAarMatcher = "**/**/*.aar"
-        } else if (REACT_NATIVE_VERSION >= 71) {
-            logger.warn("react-native-skia: aar state post 70, do nothing")
-            return
-        }
-        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile
-        logger.warn("react-native-skia: Extracting JNI files (pre RN 0.71) ${rnAAR}")
-        extractJNI(files(rnAAR))
-    }
 }
 
-def localBuildDir = buildDir
-def headersConfiguration = configurations.extractHeaders
-def jniConfiguration = configurations.extractJNI
-
-task extractAARHeaders {
-    doLast {
-        headersConfiguration.files.each { file ->
-            def absFile = file.absoluteFile
-            project.copy {
-                from project.zipTree(absFile)
-                into "${localBuildDir}/${absFile.name}"
-                include "**/*.h"
-            }
+// Package all the cpp code in a flattened directory structure
+task prepareHeaders(type: Copy) {
+    from("../cpp")
+    from("./cpp")
+    into "${project.buildDir}/headers/rnskia/react-native-skia"
+    includeEmptyDirs = false
+    include "**/*.h"
+    eachFile {
+        String path = it.path
+
+        if (path.contains("api/third_party")) {
+            // Skip flattening third_party dir
+            path = path.substring("api/".length())
+        } else if (path.contains("skia/include") || path.contains("skia/modules") || path.contains("skia/src")) {
+            // Skip flattening Skia dir
+            path = path.substring("skia/".length())
+        } else if (path.startsWith("dawn/include/")) {
+            // Flatten dawn/include/dawn and dawn/include/webgpu
+            path = path.substring("dawn/include/".length())
+        } else {
+            // flatten anything else
+            path = path.substring(path.lastIndexOf("/") + 1)
         }
+        it.path = path
     }
 }
-
-task extractJNIFiles {
-    doLast {
-        jniConfiguration.files.each { file ->
-            def absFile = file.absoluteFile
-            project.copy {
-                from project.zipTree(absFile)
-                into "${localBuildDir}/${absFile.name}"
-                include "jni/**/*"
-            }
-        }
-    }
-}
-
-extractJNIFiles.mustRunAfter extractAARHeaders
-
-if (ENABLE_PREFAB) {
-    // Package all the cpp code in a flattened directory structure
-    task prepareHeaders(type: Copy) {
-        from("../cpp")
-        from("./cpp")
-        into "${project.buildDir}/headers/rnskia/react-native-skia"
-        includeEmptyDirs = false
-        include "**/*.h"
-        eachFile {
-            String path = it.path
-
-            if (path.contains("api/third_party")) {
-                // Skip flattening third_party dir
-                path = path.substring("api/".length())
-            } else if (path.contains("skia/include") || path.contains("skia/modules") || path.contains("skia/src")) {
-                // Skip flattening Skia dir
-                path = path.substring("skia/".length())
-            } else if (path.startsWith("dawn/include/")) {
-                // Flatten dawn/include/dawn and dawn/include/webgpu
-                path = path.substring("dawn/include/".length())
-            } else {
-                // flatten anything else
-                path = path.substring(path.lastIndexOf("/") + 1)
-            }
-            it.path = path
-        }
-    }
-    preBuild.dependsOn(prepareHeaders)
-}
-
-def nativeBuildDependsOn(dependsOnTask, variant) {
-  def buildTasks = tasks.findAll({ task ->
-      !task.name.contains("Clean") && (task.name.contains("externalNative") || task.name.contains("CMake")) })
-  if (variant != null) {
-    buildTasks = buildTasks.findAll({ task -> task.name.contains(variant) })
-  }
-  buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
-}
-
-afterEvaluate {
-  nativeBuildDependsOn(extractAARHeaders, null)
-  nativeBuildDependsOn(extractJNIFiles, null)
-}
+preBuild.dependsOn(prepareHeaders)

package/android/cpp/jni/JniSkiaManager.cpp

@@ -7,47 +7,6 @@
 
 #include "RNSkManager.h"
 
-namespace {
-
-#if REACT_NATIVE_VERSION >= 75
-using CallFuncType = facebook::react::CallFunc;
-#else
-using CallFuncType = std::function<void()>;
-#endif
-
-// For bridgeless mode, currently we don't have a way to get the JSCallInvoker
-// from Java. Workaround to use RuntimeExecutor to simulate the behavior of
-// JSCallInvoker. In the future when bridgeless mode is a standard and no more
-// backward compatible to be considered, we could just use RuntimeExecutor to
-// run task on JS thread.
-class BridgelessJSCallInvoker : public facebook::react::CallInvoker {
-public:
-  explicit BridgelessJSCallInvoker(
-      facebook::react::RuntimeExecutor runtimeExecutor)
-      : runtimeExecutor_(std::move(runtimeExecutor)) {}
-
-  void invokeAsync(CallFuncType &&func) noexcept override {
-    runtimeExecutor_([func = std::move(func)](facebook::jsi::Runtime &runtime) {
-#if REACT_NATIVE_VERSION >= 75
-      func(runtime);
-#else
-      func();
-#endif
-    });
-  }
-
-  void invokeSync(CallFuncType &&func) override {
-    throw std::runtime_error(
-        "Synchronous native -> JS calls are currently not supported.");
-  }
-
-private:
-  facebook::react::RuntimeExecutor runtimeExecutor_;
-
-}; // class BridgelessJSCallInvoker
-
-} // namespace
-
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
@@ -65,12 +24,11 @@ void JniSkiaManager::registerNatives() {
 jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
 JniSkiaManager::initHybrid(
     jni::alias_ref<jhybridobject> jThis, jlong jsContext,
-    jni::alias_ref<facebook::react::JRuntimeExecutor::javaobject>
-        jRuntimeExecutor,
+    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
+        jsCallInvokerHolder,
     JavaPlatformContext skiaContext) {
 
-  auto jsCallInvoker = std::make_shared<BridgelessJSCallInvoker>(
-      jRuntimeExecutor->cthis()->get());
+  auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
   // cast from JNI hybrid objects to C++ instances
   return makeCxxInstance(jThis, reinterpret_cast<jsi::Runtime *>(jsContext),
                          jsCallInvoker, skiaContext->cthis());

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

@@ -21,7 +21,7 @@ namespace jni = facebook::jni;
 class JniPlatformContext : public jni::HybridClass<JniPlatformContext> {
 public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/shopify/reactnative/skia/PlatformContext;";
+      "Lcom/reactnative/skia/PlatformContext;";
 
   static jni::local_ref<jhybriddata>
   initHybrid(jni::alias_ref<jhybridobject> jThis, const float);

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

@@ -21,24 +21,28 @@ class JniSkiaBaseView {
 public:
   JniSkiaBaseView(jni::alias_ref<JniSkiaManager::javaobject> skiaManager,
                   std::shared_ptr<RNSkBaseAndroidView> skiaView)
-      : _skiaAndroidView(std::move(skiaView)), _manager(skiaManager->cthis()) {}
+      : _skiaAndroidView(std::move(skiaView)),
+        _manager(skiaManager->cthis()->getSkiaManager()) {}
 
   ~JniSkiaBaseView() = default;
 
-  std::shared_ptr<RNSkManager> getSkiaManager() {
-    return _manager->getSkiaManager();
-  }
+  // The manager is owned by the RNSkiaModule and is destroyed when the module
+  // is invalidated (reload). Fabric drops views on the UI thread while the
+  // module is invalidated on a background thread, so a view can outlive its
+  // manager: holding a weak reference makes a late unregister a no-op and a
+  // concurrent one keep the manager alive for the duration of the call.
+  std::shared_ptr<RNSkManager> getSkiaManager() { return _manager.lock(); }
 
 protected:
   virtual void surfaceAvailable(jobject surface, int width, int height,
-                                bool opaque, bool highBitDepth) {
-    _skiaAndroidView->surfaceAvailable(surface, width, height, opaque,
+                                bool isSurface, bool highBitDepth) {
+    _skiaAndroidView->surfaceAvailable(surface, width, height, isSurface,
                                        highBitDepth);
   }
 
   virtual void surfaceSizeChanged(jobject surface, int width, int height,
-                                  bool opaque, bool highBitDepth) {
-    _skiaAndroidView->surfaceSizeChanged(surface, width, height, opaque,
+                                  bool isSurface, bool highBitDepth) {
+    _skiaAndroidView->surfaceSizeChanged(surface, width, height, isSurface,
                                          highBitDepth);
   }
 
@@ -49,8 +53,11 @@ protected:
   }
 
   virtual void registerView(int nativeId) {
-    getSkiaManager()->registerSkiaView(nativeId,
-                                       _skiaAndroidView->getSkiaView());
+    auto manager = getSkiaManager();
+    if (manager == nullptr) {
+      return;
+    }
+    manager->registerSkiaView(nativeId, _skiaAndroidView->getSkiaView());
   }
 
   virtual void unregisterView() {
@@ -74,7 +81,7 @@ protected:
   std::shared_ptr<RNSkBaseAndroidView> _skiaAndroidView;
 
 private:
-  JniSkiaManager *_manager;
+  std::weak_ptr<RNSkManager> _manager;
 };
 
 } // namespace RNSkia

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

@@ -5,7 +5,6 @@
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
 #include <memory>
-#include <react/jni/JRuntimeExecutor.h>
 
 #include "JniPlatformContext.h"
 #include "RNSkAndroidPlatformContext.h"
@@ -23,13 +22,13 @@ using JavaPlatformContext = jni::alias_ref<JniPlatformContext::javaobject>;
 class JniSkiaManager : public jni::HybridClass<JniSkiaManager> {
 public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/shopify/reactnative/skia/SkiaManager;";
+      "Lcom/reactnative/skia/SkiaManager;";
   static auto constexpr TAG = "ReactNativeSkia";
 
   static jni::local_ref<jni::HybridClass<JniSkiaManager>::jhybriddata>
   initHybrid(jni::alias_ref<jhybridobject> jThis, jlong jsContext,
-             jni::alias_ref<facebook::react::JRuntimeExecutor::javaobject>
-                 jRuntimeExecutor,
+             jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
+                 jsCallInvokerHolder,
              JavaPlatformContext platformContext);
 
   static void registerNatives();

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

@@ -39,7 +39,7 @@ class JniSkiaPictureView : public jni::HybridClass<JniSkiaPictureView>,
                            public JniSkiaBaseView {
 public:
   static auto constexpr kJavaDescriptor =
-      "Lcom/shopify/reactnative/skia/SkiaPictureView;";
+      "Lcom/reactnative/skia/SkiaPictureView;";
 
   static jni::local_ref<jhybriddata>
   initHybrid(jni::alias_ref<jhybridobject> jThis,
@@ -63,15 +63,15 @@ public:
   }
 
 protected:
-  void surfaceAvailable(jobject surface, int width, int height, bool opaque,
+  void surfaceAvailable(jobject surface, int width, int height, bool isSurface,
                         bool highBitDepth) override {
-    JniSkiaBaseView::surfaceAvailable(surface, width, height, opaque,
+    JniSkiaBaseView::surfaceAvailable(surface, width, height, isSurface,
                                       highBitDepth);
   }
 
-  void surfaceSizeChanged(jobject surface, int width, int height, bool opaque,
+  void surfaceSizeChanged(jobject surface, int width, int height, bool isSurface,
                           bool highBitDepth) override {
-    JniSkiaBaseView::surfaceSizeChanged(surface, width, height, opaque,
+    JniSkiaBaseView::surfaceSizeChanged(surface, width, height, isSurface,
                                         highBitDepth);
   }
 

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

@@ -63,16 +63,6 @@ public:
 #endif
   }
 
-  std::shared_ptr<WindowContext>
-  makeContextFromNativeSurface(void *surface, int width, int height) override {
-#if defined(SK_GRAPHITE)
-    return DawnContext::getInstance().MakeWindow(surface, width, height);
-#else
-    auto aWindow = reinterpret_cast<ANativeWindow *>(surface);
-    return OpenGLContext::getInstance().MakeWindow(aWindow);
-#endif
-  }
-
   sk_sp<SkImage> makeImageFromNativeBuffer(void *buffer) override {
 #if defined(SK_GRAPHITE)
     return DawnContext::getInstance().MakeImageFromBuffer(buffer);

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

@@ -12,12 +12,12 @@ namespace RNSkia {
 class RNSkBaseAndroidView {
 public:
   virtual void surfaceAvailable(jobject surface, int width, int height,
-                                bool opaque, bool highBitDepth) = 0;
+                                bool isSurface, bool highBitDepth) = 0;
 
   virtual void surfaceDestroyed() = 0;
 
   virtual void surfaceSizeChanged(jobject surface, int width, int height,
-                                  bool opaque, bool highBitDepth) = 0;
+                                  bool isSurface, bool highBitDepth) = 0;
 
   virtual float getPixelDensity() = 0;
 
@@ -34,10 +34,10 @@ public:
           std::make_shared<RNSkOpenGLCanvasProvider>(
               std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}
 
-  void surfaceAvailable(jobject surface, int width, int height, bool opaque,
+  void surfaceAvailable(jobject surface, int width, int height, bool isSurface,
                         bool highBitDepth) override {
     std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
-        ->surfaceAvailable(surface, width, height, opaque, highBitDepth);
+        ->surfaceAvailable(surface, width, height, isSurface, highBitDepth);
     RNSkView::redraw();
   }
 
@@ -46,10 +46,10 @@ public:
         ->surfaceDestroyed();
   }
 
-  void surfaceSizeChanged(jobject surface, int width, int height, bool opaque,
+  void surfaceSizeChanged(jobject surface, int width, int height, bool isSurface,
                           bool highBitDepth) override {
     std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
-        ->surfaceSizeChanged(surface, width, height, opaque, highBitDepth);
+        ->surfaceSizeChanged(surface, width, height, isSurface, highBitDepth);
     // This is only need for the first time to frame, this renderImmediate call
     // will invoke updateTexImage for the previous frame
     RNSkView::redraw();

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp

@@ -78,7 +78,7 @@ bool RNSkOpenGLCanvasProvider::renderToCanvas(
 
 void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
                                                 int width, int height,
-                                                bool opaque,
+                                                bool isSurface,
                                                 bool highBitDepth) {
   // Release the old surface
   _surfaceHolder = nullptr;
@@ -86,7 +86,7 @@ void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
   // Create renderer!
   ANativeWindow *window = nullptr;
   JNIEnv *env = facebook::jni::Environment::current();
-  if (!opaque) {
+  if (!isSurface) {
     _jSurfaceTexture = env->NewGlobalRef(jSurfaceTexture);
     jclass surfaceClass = env->FindClass("android/view/Surface");
     jmethodID surfaceConstructor = env->GetMethodID(
@@ -131,7 +131,7 @@ void RNSkOpenGLCanvasProvider::surfaceDestroyed() {
 }
 
 void RNSkOpenGLCanvasProvider::surfaceSizeChanged(jobject jSurface, int width,
-                                                  int height, bool opaque,
+                                                  int height, bool isSurface,
                                                   bool highBitDepth) {
   if (width == 0 && height == 0) {
     // Setting width/height to zero is nothing we need to care about when
@@ -141,7 +141,7 @@ void RNSkOpenGLCanvasProvider::surfaceSizeChanged(jobject jSurface, int width,
 
   if (_surfaceHolder == nullptr) {
     _surfaceHolder = nullptr;
-    surfaceAvailable(jSurface, width, height, opaque, highBitDepth);
+    surfaceAvailable(jSurface, width, height, isSurface, highBitDepth);
   } else {
     _surfaceHolder->resize(width, height);
   }

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

@@ -27,12 +27,12 @@ public:
 
   bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
 
-  void surfaceAvailable(jobject surface, int width, int height, bool opaque,
+  void surfaceAvailable(jobject surface, int width, int height, bool isSurface,
                         bool highBitDepth);
 
   void surfaceDestroyed();
 
-  void surfaceSizeChanged(jobject jSurface, int width, int height, bool opaque,
+  void surfaceSizeChanged(jobject jSurface, int width, int height, bool isSurface,
                           bool highBitDepth);
 
 private:

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <!-- AndroidManifest.xml -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.shopify.reactnative.skia">
+          package="com.reactnative.skia">
 
 </manifest>

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

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.os.Handler;
 import android.os.Looper;

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/RNSkVideo.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.content.Context;
 import android.graphics.ImageFormat;