@capacitor-mlkit/selfie-segmentation 7.0.0-next.2 → 7.0.0-next.4

package/CapacitorMlkitSelfieSegmentation.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target  = '13.0'
+  s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
   s.dependency 'GoogleMLKit/SegmentationSelfie', '7.0.0'
   s.swift_version = '5.1'

package/README.md

@@ -5,19 +5,17 @@ Unofficial Capacitor plugin for [ML Kit Selfie Segmentation](https://developers.
 ## Installation
 
 ```bash
-npm install @capacitor-mlkit/selfie-segmentation@next
+npm install @capacitor-mlkit/selfie-segmentation
 npx cap sync
 ```
 
-**Attention**: Please use the `next` tag to install the latest version of the plugin due to issue [#179](https://github.com/capawesome-team/capacitor-mlkit/pull/179).
-
 ### Android
 
 #### Variables
 
 This plugin will use the following project variables (defined in your app’s `variables.gradle` file):
 
-- `$mlkitSelfieSegmentationVersion` version of `com.google.mlkit:segmentation-selfie` (default: `16.0.0-beta4`)
+- `$mlkitSelfieSegmentationVersion` version of `com.google.mlkit:segmentation-selfie` (default: `16.0.0-beta6`)
 
 ### iOS
 

package/android/build.gradle

@@ -1,9 +1,9 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
-    mlkitSelfieSegmentationVersion = project.hasProperty('mlkitSelfieSegmentationVersion') ? rootProject.ext.mlkitSelfieSegmentationVersion : '16.0.0-beta5'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
+    mlkitSelfieSegmentationVersion = project.hasProperty('mlkitSelfieSegmentationVersion') ? rootProject.ext.mlkitSelfieSegmentationVersion : '16.0.0-beta6'
 }
 
 buildscript {
@@ -12,7 +12,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
@@ -20,10 +20,10 @@ apply plugin: 'com.android.library'
 
 android {
     namespace "io.capawesome.capacitorjs.plugins.mlkit.selfiesegmentation"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,8 +38,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 

package/android/src/main/java/io/capawesome/capacitorjs/plugins/mlkit/selfiesegmentation/SelfieSegmentation.java

@@ -50,83 +50,76 @@ public class SelfieSegmentation {
 
         plugin
             .getActivity()
-            .runOnUiThread(
-                () ->
-                    segmenter
-                        .process(inputImage)
-                        .addOnSuccessListener(
-                            segmentationMask -> {
-                                segmenter.close();
-
-                                ByteBuffer mask = segmentationMask.getBuffer();
-
-                                Bitmap bitmap = inputImage.getBitmapInternal();
-                                Objects.requireNonNull(bitmap).setHasAlpha(true);
-
-                                ByteBuffer pixels = ByteBuffer.allocateDirect(bitmap.getAllocationByteCount());
-                                bitmap.copyPixelsToBuffer(pixels);
-
-                                final boolean bigEndian = pixels.order() == ByteOrder.BIG_ENDIAN;
-                                final int ALPHA = bigEndian ? 3 : 0;
-                                final int RED = bigEndian ? 2 : 1;
-                                final int GREEN = bigEndian ? 1 : 2;
-                                final int BLUE = bigEndian ? 0 : 3;
-
-                                for (int i = 0; i < pixels.capacity() >> 2; i++) {
-                                    float confidence = mask.getFloat();
-
-                                    if (confidence >= threshold) {
-                                        byte red = pixels.get((i << 2) + RED);
-                                        byte green = pixels.get((i << 2) + GREEN);
-                                        byte blue = pixels.get((i << 2) + BLUE);
-
-                                        pixels.put((i << 2) + ALPHA, (byte) (0xff));
-                                        pixels.put((i << 2) + RED, (byte) (red * confidence));
-                                        pixels.put((i << 2) + GREEN, (byte) (green * confidence));
-                                        pixels.put((i << 2) + BLUE, (byte) (blue * confidence));
-                                    } else {
-                                        pixels.putInt(i << 2, 0x00000000); // transparent
-                                    }
-                                }
-
-                                bitmap.copyPixelsFromBuffer(pixels.rewind());
-
-                                // Create an image file name
-                                @SuppressLint("SimpleDateFormat")
-                                String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
-                                String imageFileName = "PNG_" + timeStamp + "_";
-
-                                try {
-                                    File image = File.createTempFile(imageFileName, ".png");
-
-                                    OutputStream stream = new FileOutputStream(image);
-                                    bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
-                                    stream.close();
-
-                                    ProcessImageResult result = new ProcessImageResult(
-                                        image.getAbsolutePath(),
-                                        bitmap.getWidth(),
-                                        bitmap.getHeight()
-                                    );
-
-                                    callback.success(result);
-                                } catch (Exception exception) {
-                                    callback.error(exception);
-                                }
+            .runOnUiThread(() ->
+                segmenter
+                    .process(inputImage)
+                    .addOnSuccessListener(segmentationMask -> {
+                        segmenter.close();
+
+                        ByteBuffer mask = segmentationMask.getBuffer();
+
+                        Bitmap bitmap = inputImage.getBitmapInternal();
+                        Objects.requireNonNull(bitmap).setHasAlpha(true);
+
+                        ByteBuffer pixels = ByteBuffer.allocateDirect(bitmap.getAllocationByteCount());
+                        bitmap.copyPixelsToBuffer(pixels);
+
+                        final boolean bigEndian = pixels.order() == ByteOrder.BIG_ENDIAN;
+                        final int ALPHA = bigEndian ? 3 : 0;
+                        final int RED = bigEndian ? 2 : 1;
+                        final int GREEN = bigEndian ? 1 : 2;
+                        final int BLUE = bigEndian ? 0 : 3;
+
+                        for (int i = 0; i < pixels.capacity() >> 2; i++) {
+                            float confidence = mask.getFloat();
+
+                            if (confidence >= threshold) {
+                                byte red = pixels.get((i << 2) + RED);
+                                byte green = pixels.get((i << 2) + GREEN);
+                                byte blue = pixels.get((i << 2) + BLUE);
+
+                                pixels.put((i << 2) + ALPHA, (byte) (0xff));
+                                pixels.put((i << 2) + RED, (byte) (red * confidence));
+                                pixels.put((i << 2) + GREEN, (byte) (green * confidence));
+                                pixels.put((i << 2) + BLUE, (byte) (blue * confidence));
+                            } else {
+                                pixels.putInt(i << 2, 0x00000000); // transparent
                             }
-                        )
-                        .addOnCanceledListener(
-                            () -> {
-                                segmenter.close();
-                                callback.cancel();
-                            }
-                        )
-                        .addOnFailureListener(
-                            exception -> {
-                                segmenter.close();
-                                callback.error(exception);
-                            }
-                        )
+                        }
+
+                        bitmap.copyPixelsFromBuffer(pixels.rewind());
+
+                        // Create an image file name
+                        @SuppressLint("SimpleDateFormat")
+                        String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+                        String imageFileName = "PNG_" + timeStamp + "_";
+
+                        try {
+                            File image = File.createTempFile(imageFileName, ".png");
+
+                            OutputStream stream = new FileOutputStream(image);
+                            bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
+                            stream.close();
+
+                            ProcessImageResult result = new ProcessImageResult(
+                                image.getAbsolutePath(),
+                                bitmap.getWidth(),
+                                bitmap.getHeight()
+                            );
+
+                            callback.success(result);
+                        } catch (Exception exception) {
+                            callback.error(exception);
+                        }
+                    })
+                    .addOnCanceledListener(() -> {
+                        segmenter.close();
+                        callback.cancel();
+                    })
+                    .addOnFailureListener(exception -> {
+                        segmenter.close();
+                        callback.error(exception);
+                    })
             );
     }
 }

package/android/src/main/java/io/capawesome/capacitorjs/plugins/mlkit/selfiesegmentation/classes/ProcessImageOptions.java

@@ -25,11 +25,12 @@ public class ProcessImageOptions {
     }
 
     private InputImage scaledImage(InputImage inputImage, Integer width, Integer height) {
-        float scaleX = (width != null) ? width * 1f / inputImage.getWidth() : 0f;
-        float scaleY = (height != null) ? height * 1f / inputImage.getHeight() : 0f;
+        float scaleX = (width != null) ? (width * 1f) / inputImage.getWidth() : 0f;
+        float scaleY = (height != null) ? (height * 1f) / inputImage.getHeight() : 0f;
 
         if (scaleX > 0f || scaleY > 0f) {
-            if (scaleX > 0f && scaleY == 0f) scaleY = scaleX; else if (scaleY > 0f && scaleX == 0f) scaleX = scaleY;
+            if (scaleX > 0f && scaleY == 0f) scaleY = scaleX;
+            else if (scaleY > 0f && scaleX == 0f) scaleX = scaleY;
 
             return InputImage.fromBitmap(
                 Bitmap.createScaledBitmap(

package/dist/plugin.cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var core = require('@capacitor/core');
 
 const SelfieSegmentation = core.registerPlugin('SelfieSegmentation', {

package/dist/plugin.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SelfieSegmentation = registerPlugin('SelfieSegmentation', {\n    web: () => import('./web').then(m => new m.SelfieSegmentationWeb()),\n});\nexport * from './definitions';\nexport { SelfieSegmentation };\n//# sourceMappingURL=index.js.map","import { CapacitorException, ExceptionCode, WebPlugin } from '@capacitor/core';\nexport class SelfieSegmentationWeb extends WebPlugin {\n    async processImage(_options) {\n        throw this.createUnavailableException();\n    }\n    createUnavailableException() {\n        return new CapacitorException('This Selfie Segmentation plugin method is not available on this platform.', ExceptionCode.Unavailable);\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin","CapacitorException","ExceptionCode"],"mappings":";;;;;;AACK,MAAC,kBAAkB,GAAGA,mBAAc,CAAC,oBAAoB,EAAE;AAChE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,qBAAqB,EAAE,CAAC;AACvE,CAAC;;ACFM,MAAM,qBAAqB,SAASC,cAAS,CAAC;AACrD,IAAI,MAAM,YAAY,CAAC,QAAQ,EAAE;AACjC,QAAQ,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;AAChD,KAAK;AACL,IAAI,0BAA0B,GAAG;AACjC,QAAQ,OAAO,IAAIC,uBAAkB,CAAC,2EAA2E,EAAEC,kBAAa,CAAC,WAAW,CAAC,CAAC;AAC9I,KAAK;AACL;;;;;;;;;"}
+{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SelfieSegmentation = registerPlugin('SelfieSegmentation', {\n    web: () => import('./web').then(m => new m.SelfieSegmentationWeb()),\n});\nexport * from './definitions';\nexport { SelfieSegmentation };\n//# sourceMappingURL=index.js.map","import { CapacitorException, ExceptionCode, WebPlugin } from '@capacitor/core';\nexport class SelfieSegmentationWeb extends WebPlugin {\n    async processImage(_options) {\n        throw this.createUnavailableException();\n    }\n    createUnavailableException() {\n        return new CapacitorException('This Selfie Segmentation plugin method is not available on this platform.', ExceptionCode.Unavailable);\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin","CapacitorException","ExceptionCode"],"mappings":";;;;AACK,MAAC,kBAAkB,GAAGA,mBAAc,CAAC,oBAAoB,EAAE;AAChE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,qBAAqB,EAAE,CAAC;AACvE,CAAC;;ACFM,MAAM,qBAAqB,SAASC,cAAS,CAAC;AACrD,IAAI,MAAM,YAAY,CAAC,QAAQ,EAAE;AACjC,QAAQ,MAAM,IAAI,CAAC,0BAA0B,EAAE;AAC/C;AACA,IAAI,0BAA0B,GAAG;AACjC,QAAQ,OAAO,IAAIC,uBAAkB,CAAC,2EAA2E,EAAEC,kBAAa,CAAC,WAAW,CAAC;AAC7I;AACA;;;;;;;;;"}

package/dist/plugin.js

@@ -21,8 +21,6 @@ var capacitorSelfieSegmentation = (function (exports, core) {
 
     exports.SelfieSegmentation = SelfieSegmentation;
 
-    Object.defineProperty(exports, '__esModule', { value: true });
-
     return exports;
 
 })({}, capacitorExports);

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SelfieSegmentation = registerPlugin('SelfieSegmentation', {\n    web: () => import('./web').then(m => new m.SelfieSegmentationWeb()),\n});\nexport * from './definitions';\nexport { SelfieSegmentation };\n//# sourceMappingURL=index.js.map","import { CapacitorException, ExceptionCode, WebPlugin } from '@capacitor/core';\nexport class SelfieSegmentationWeb extends WebPlugin {\n    async processImage(_options) {\n        throw this.createUnavailableException();\n    }\n    createUnavailableException() {\n        return new CapacitorException('This Selfie Segmentation plugin method is not available on this platform.', ExceptionCode.Unavailable);\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin","CapacitorException","ExceptionCode"],"mappings":";;;AACK,UAAC,kBAAkB,GAAGA,mBAAc,CAAC,oBAAoB,EAAE;IAChE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,qBAAqB,EAAE,CAAC;IACvE,CAAC;;ICFM,MAAM,qBAAqB,SAASC,cAAS,CAAC;IACrD,IAAI,MAAM,YAAY,CAAC,QAAQ,EAAE;IACjC,QAAQ,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAChD,KAAK;IACL,IAAI,0BAA0B,GAAG;IACjC,QAAQ,OAAO,IAAIC,uBAAkB,CAAC,2EAA2E,EAAEC,kBAAa,CAAC,WAAW,CAAC,CAAC;IAC9I,KAAK;IACL;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst SelfieSegmentation = registerPlugin('SelfieSegmentation', {\n    web: () => import('./web').then(m => new m.SelfieSegmentationWeb()),\n});\nexport * from './definitions';\nexport { SelfieSegmentation };\n//# sourceMappingURL=index.js.map","import { CapacitorException, ExceptionCode, WebPlugin } from '@capacitor/core';\nexport class SelfieSegmentationWeb extends WebPlugin {\n    async processImage(_options) {\n        throw this.createUnavailableException();\n    }\n    createUnavailableException() {\n        return new CapacitorException('This Selfie Segmentation plugin method is not available on this platform.', ExceptionCode.Unavailable);\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin","CapacitorException","ExceptionCode"],"mappings":";;;AACK,UAAC,kBAAkB,GAAGA,mBAAc,CAAC,oBAAoB,EAAE;IAChE,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,qBAAqB,EAAE,CAAC;IACvE,CAAC;;ICFM,MAAM,qBAAqB,SAASC,cAAS,CAAC;IACrD,IAAI,MAAM,YAAY,CAAC,QAAQ,EAAE;IACjC,QAAQ,MAAM,IAAI,CAAC,0BAA0B,EAAE;IAC/C;IACA,IAAI,0BAA0B,GAAG;IACjC,QAAQ,OAAO,IAAIC,uBAAkB,CAAC,2EAA2E,EAAEC,kBAAa,CAAC,WAAW,CAAC;IAC7I;IACA;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-mlkit/selfie-segmentation",
-  "version": "7.0.0-next.2",
+  "version": "7.0.0-next.4",
   "description": "Capacitor plugin for ML Kit Selfie Segmentation.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -49,30 +49,30 @@
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api SelfieSegmentationPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
     "ios:pod:install": "cd ios && pod install --repo-update && cd ..",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "6.0.0",
-    "@capacitor/cli": "6.0.0",
-    "@capacitor/core": "6.0.0",
-    "@capacitor/docgen": "0.2.1",
-    "@capacitor/ios": "6.0.0",
-    "@ionic/eslint-config": "0.3.0",
-    "@ionic/swiftlint-config": "1.1.2",
-    "eslint": "7.32.0",
-    "prettier": "2.3.2",
-    "prettier-plugin-java": "1.0.2",
-    "rimraf": "3.0.2",
-    "rollup": "2.77.2",
-    "swiftlint": "1.0.1",
+    "@capacitor/android": "7.0.0",
+    "@capacitor/cli": "7.0.0",
+    "@capacitor/core": "7.0.0",
+    "@capacitor/docgen": "0.3.0",
+    "@capacitor/ios": "7.0.0",
+    "@ionic/eslint-config": "0.4.0",
+    "@ionic/swiftlint-config": "2.0.0",
+    "eslint": "8.57.0",
+    "prettier": "3.4.2",
+    "prettier-plugin-java": "2.6.7",
+    "rimraf": "6.0.1",
+    "rollup": "4.30.1",
+    "swiftlint": "2.0.0",
     "typescript": "4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^6.0.0"
+    "@capacitor/core": ">=7.0.0"
   },
   "swiftlint": "@ionic/swiftlint-config",
   "eslintConfig": {