From 0737b80d45a5f611076abb5410d09ae03e22380d Mon Sep 17 00:00:00 2001 From: kheuser Date: Tue, 21 Mar 2023 19:39:52 -0500 Subject: [PATCH 1/3] Android fixes --- android/build.gradle | 2 +- .../visioncameracodescanner/BarcodeConverter.java | 2 +- .../VisionCameraCodeScannerPlugin.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b6bd964..4829f31 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -57,5 +57,5 @@ dependencies { implementation "com.facebook.react:react-native:+" // From node_modules api project(":react-native-vision-camera") implementation "androidx.camera:camera-core:1.1.0-alpha06" - implementation 'com.google.mlkit:barcode-scanning:17.0.0' + implementation 'com.google.mlkit:barcode-scanning:17.0.2' } diff --git a/android/src/main/java/com/visioncameracodescanner/BarcodeConverter.java b/android/src/main/java/com/visioncameracodescanner/BarcodeConverter.java index 74e208b..eb4ed07 100644 --- a/android/src/main/java/com/visioncameracodescanner/BarcodeConverter.java +++ b/android/src/main/java/com/visioncameracodescanner/BarcodeConverter.java @@ -7,7 +7,7 @@ import com.facebook.react.bridge.WritableNativeArray; import com.facebook.react.bridge.WritableNativeMap; -import com.google.mlkit.vision.barcode.Barcode; +import com.google.mlkit.vision.barcode.common.Barcode; import java.util.List; diff --git a/android/src/main/java/com/visioncameracodescanner/VisionCameraCodeScannerPlugin.java b/android/src/main/java/com/visioncameracodescanner/VisionCameraCodeScannerPlugin.java index 8198564..29816f6 100644 --- a/android/src/main/java/com/visioncameracodescanner/VisionCameraCodeScannerPlugin.java +++ b/android/src/main/java/com/visioncameracodescanner/VisionCameraCodeScannerPlugin.java @@ -24,7 +24,7 @@ import com.google.android.gms.tasks.Tasks; import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin; import com.google.android.gms.tasks.Task; -import com.google.mlkit.vision.barcode.Barcode; +import com.google.mlkit.vision.barcode.common.Barcode; import com.google.mlkit.vision.barcode.BarcodeScanner; import com.google.mlkit.vision.barcode.BarcodeScanning; import com.google.mlkit.vision.barcode.BarcodeScannerOptions; @@ -219,17 +219,17 @@ private WritableNativeMap convertBarcode(@NonNull Barcode barcode) { // Bitmap Inversion https://gist.github.com/moneytoo/87e3772c821cb1e86415 private Bitmap invert(Bitmap src) - { + { int height = src.getHeight(); - int width = src.getWidth(); + int width = src.getWidth(); Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(bitmap); Paint paint = new Paint(); - + ColorMatrix matrixGrayscale = new ColorMatrix(); matrixGrayscale.setSaturation(0); - + ColorMatrix matrixInvert = new ColorMatrix(); matrixInvert.set(new float[] { @@ -239,10 +239,10 @@ private Bitmap invert(Bitmap src) 0.0f, 0.0f, 0.0f, 1.0f, 0.0f }); matrixInvert.preConcat(matrixGrayscale); - + ColorMatrixColorFilter filter = new ColorMatrixColorFilter(matrixInvert); paint.setColorFilter(filter); - + canvas.drawBitmap(src, 0, 0, paint); return bitmap; } From 2183175b73c146e961c6e541c588c7d77334c7b7 Mon Sep 17 00:00:00 2001 From: kheuser Date: Tue, 21 Mar 2023 19:41:49 -0500 Subject: [PATCH 2/3] Mentioned forked repo on readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index eafd2fc..e0a1473 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +## Forked from [https://github.com/jorgebrunetto/vision-camera-code-scanner](https://github.com/jorgebrunetto/vision-camera-code-scanner) + # vision-camera-code-scanner VisionCamera Frame Processor Plugin to read barcodes using MLKit Vision Barcode Scanning From 54c0f6bdac6104fc3db867fe79dcb99ce81bf138 Mon Sep 17 00:00:00 2001 From: kheuser Date: Wed, 22 Mar 2023 13:05:10 -0500 Subject: [PATCH 3/3] Reverted Readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e0a1473..eafd2fc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -## Forked from [https://github.com/jorgebrunetto/vision-camera-code-scanner](https://github.com/jorgebrunetto/vision-camera-code-scanner) - # vision-camera-code-scanner VisionCamera Frame Processor Plugin to read barcodes using MLKit Vision Barcode Scanning