react-native-scanbot-barcode-scanner-sdk 3.1.0-beta5 → 3.1.0-beta9

package/Libraries.txt

@@ -1,4 +1,8 @@
-Open Source libraries used in the Scanbot Barcode Scanner SDK for iOS version 3.0.3:
+Open Source libraries used in the Scanbot Barcode SDK for React Native version 3.1.0
+
+------------------------------------------------------------------------------------------------------------------------
+
+Open Source libraries used in the Scanbot Barcode Scanner SDK for iOS version 3.1.1:
 
 BOOST C++ Libraries
 
@@ -361,11 +365,11 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 ------------------------------------------------------------------------------------------------------------------------
 
-Open Source Libraries used in the Scanbot Barcode Scanner SDK for Android Version 3.0.6:
+Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.1.0
 
 CWAC-Camera
 
-Version 0.6.41
+Version 0.6.42
 (https://github.com/doo/cwac-camera)
 (https://github.com/commonsguy/cwac-camera/)
 

package/RNScanbotBarcodeSDK.podspec

@@ -2,7 +2,7 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-ScanbotBarcodeScannerSDKVersion = '3.0.3'
+ScanbotBarcodeScannerSDKVersion = '3.1.1'
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Jul 15 15:40:35 CEST 2021
-gradle.version=6.1.1
+#Mon Jan 31 14:23:43 CET 2022
+gradle.version=7.1.1

package/android/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1637321714029</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.1.1))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-16.0.2.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

package/android/build.gradle

@@ -15,7 +15,7 @@ def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
 def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 29
 
-def sdkVersion = '3.0.6'
+def sdkVersion = '3.1.0'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Jan 18 13:44:25 CET 2022
+sdk.dir=/Users/rutkaybiyik/Library/Android/sdk

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/JSONUtils.java

@@ -184,13 +184,20 @@ public final class JSONUtils {
             changed = true;
         }
 
+        boolean lowPowerMode = BarcodeScannerAdditionalConfig.DEFAULT_LOW_POWER_MODE;
+        if (configuration.hasKey("lowPowerMode")) {
+            lowPowerMode = configuration.getBoolean("lowPowerMode");
+            changed = true;
+        }
+
         return changed ? new BarcodeScannerAdditionalConfig(
                 minimumTextLength,
                 maximumTextLength,
                 minimum1DQuietZoneSize,
                 gs1DecodingEnabled,
                 msiPlesseyChecksumAlgorithms,
-                stripCheckDigits
+                stripCheckDigits,
+                lowPowerMode
         ) : null;
     }
 
@@ -202,7 +209,8 @@ public final class JSONUtils {
                 config.getMinimum1DQuietZoneSize(),
                 config.getGs1DecodingEnabled(),
                 config.getMsiPlesseyChecksumAlgorithms(),
-                config.getStripCheckDigits()
+                config.getStripCheckDigits(),
+                config.getLowPowerMode()
         ) : null;
     }
 

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkConfiguration.java

@@ -7,10 +7,12 @@ package io.scanbot.barcodesdk.plugin.reactnative;
 
 public class ScanbotBarcodeSdkConfiguration {
     private boolean loggingEnabled = false;
+    private boolean enableNativeLogging = false;
     private String licenseKey;
     private String storageBaseDirectory = null;
-    private boolean allowGpuAcceleration = true;
     private boolean useCameraX = false;
+    private boolean allowXnnpackAcceleration = true;
+    private boolean allowGpuAcceleration = true;
 
     public boolean isLoggingEnabled() {
         return loggingEnabled;
@@ -52,4 +54,19 @@ public class ScanbotBarcodeSdkConfiguration {
         this.useCameraX = useCameraX;
     }
 
-}
+    public boolean getAllowXnnpackAcceleration() {
+        return allowXnnpackAcceleration;
+    }
+
+    public void setAllowXnnpackAcceleration(boolean allowXnnpackAcceleration) {
+        this.allowXnnpackAcceleration = allowXnnpackAcceleration;
+    }
+
+    public boolean getEnableNativeLogging() {
+        return enableNativeLogging;
+    }
+
+    public void setEnableNativeLogging(boolean enableNativeLogging) {
+        this.enableNativeLogging = enableNativeLogging;
+    }
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkModule.java

@@ -5,32 +5,23 @@
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
 
-import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.Camera;
 import android.net.Uri;
 import android.provider.MediaStore;
-
 import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,9 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import io.scanbot.sap.SdkLicenseInfo;
-import io.scanbot.sap.Status;
 import io.scanbot.sdk.barcode.ScanbotBarcodeDetector;
 import io.scanbot.sdk.barcode.entity.BarcodeDocumentFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeFormat;
@@ -48,21 +37,18 @@ import io.scanbot.sdk.barcode.entity.BarcodeItem;
 import io.scanbot.sdk.barcode.entity.BarcodeScannerAdditionalConfigBuilder;
 import io.scanbot.sdk.barcode.entity.BarcodeScannerConfigBuilder;
 import io.scanbot.sdk.barcode.entity.BarcodeScanningResult;
-import io.scanbot.sdk.barcode.entity.EngineMode;
 import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK;
 import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDKInitializer;
 import io.scanbot.sdk.ui.barcode_scanner.view.barcode.BarcodeScannerActivity;
 import io.scanbot.sdk.ui.barcode_scanner.view.barcode.batch.BatchBarcodeScannerActivity;
 import io.scanbot.sdk.ui.view.barcode.batch.configuration.BatchBarcodeScannerConfiguration;
-import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeImageGenerationType;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerAdditionalConfiguration;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerConfiguration;
 import io.scanbot.sdk.ui.view.base.configuration.CameraOrientationMode;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
-import okhttp3.Response;
+import android.app.Activity;
 
-import static io.scanbot.barcodesdk.plugin.reactnative.LogUtils.debugLog;
 
 public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implements ActivityEventListener {
 
@@ -110,10 +96,11 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
                     final String callbackMessage;
 
                     final ScanbotBarcodeScannerSDKInitializer initializer = new ScanbotBarcodeScannerSDKInitializer();
-                    initializer.withLogging(configuration.isLoggingEnabled());
+                    initializer.withLogging(configuration.isLoggingEnabled(), configuration.getEnableNativeLogging());
                     LogUtils.setLoggingEnabled(configuration.isLoggingEnabled());
 
                     initializer.allowGpuAcceleration(configuration.getAllowGpuAcceleration());
+                    initializer.allowXnnpackAcceleration(configuration.getAllowXnnpackAcceleration());
                     initializer.useCameraXRtuUi(configuration.getUseCameraX());
 
                     if (configuration.getStorageBaseDirectory() != null && !"".equals(configuration.getStorageBaseDirectory())) {
@@ -372,7 +359,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
 
         switch (requestCode) {
             case REQUEST_SB_BARCODE_SCANNER:
-                this.handleBarcodeScannerActivityCompletion(intent, (resultCode != Activity.RESULT_OK));
+                this.handleBarcodeScannerActivityCompletion(intent, resultCode);
                 return;
 
             default:
@@ -384,13 +371,14 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
     public void onNewIntent(Intent intent) {
     }
 
-    private void handleBarcodeScannerActivityCompletion(final Intent intent, boolean canceled) {
+    private void handleBarcodeScannerActivityCompletion(final Intent intent, final int resultCode) {
         Promise promise = this.activityCallbackPromise;
         this.activityCallbackPromise = null;
 
-        if (!canceled) {
-            final BarcodeScanningResult barcodeResult = intent.getParcelableExtra(BarcodeScannerActivity.SCANNED_BARCODE_EXTRA);
-            final WritableMap result = jsonResultFromBarcodeScannerResult(barcodeResult);
+        final BarcodeScannerActivity.Result barcodeResult = BarcodeScannerActivity.extractResult(resultCode, intent);
+
+        if (barcodeResult.getResultOk()) {
+            final WritableMap result = jsonResultFromBarcodeScannerResult(barcodeResult.getResult());
 
             String imagePath = intent.getStringExtra(BarcodeScannerActivity.SCANNED_BARCODE_IMAGE_PATH_EXTRA);
             if (imagePath == null) {

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.h

@@ -44,6 +44,7 @@
 @property (nonatomic, copy) NSNumber* _Nullable gs1DecodingEnabled;
 @property (nonatomic, copy) NSNumber* _Nullable minimumTextLength;
 @property (nonatomic, copy) NSNumber* _Nullable maximumTextLength;
+@property (nonatomic, copy) NSNumber* _Nullable stripCheckDigits;
 @property (nonatomic, copy) NSArray<SBSDKBarcodeType *>* _Nullable barcodeFormats;
 @property (nonatomic, copy) NSArray<SBSDKBarcodeDocumentType *>* _Nullable acceptedDocumentFormats;
 @property (nonatomic) SBSDKBarcodeMSIPlesseyChecksumAlgorithm msiPlesseyChecksumAlgorithm;

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.m

@@ -128,6 +128,9 @@
     if (_cameraViewConfiguration.msiPlesseyChecksumAlgorithm != -1) {
         additionalParameters.msiPlesseyChecksumAlgorithm = _cameraViewConfiguration.msiPlesseyChecksumAlgorithm;
     }
+    if (_cameraViewConfiguration.stripCheckDigits) {
+        additionalParameters.stripCheckDigits = [_cameraViewConfiguration.stripCheckDigits boolValue];
+    }
     
     viewController.additionalDetectionParameters = additionalParameters;
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "3.1.0-beta5",
+  "version": "3.1.0-beta9",
   "description": "React Native plugin for the Scanbot Barcode Scanner SDK on Android and iOS",
   "main": "index.js",
   "files": [
@@ -46,8 +46,8 @@
     "react-native": ">=0.60 <1.0.x"
   },
   "devDependencies": {
-    "react": "^16.8.3",
-    "react-native": "^0.60"
+    "react": "^17.0.2",
+    "react-native": "^0.65"
   },
   "contributors": [
     {

package/src/components/barcode-camera-view/scanbot-barcode-camera-view-types.tsx

@@ -1,11 +1,11 @@
-import {StyleProp, ViewStyle} from 'react-native';
+import { StyleProp, ViewStyle } from 'react-native';
 import {
   BarcodeDocumentFormat,
   BarcodeFormat,
   EngineMode,
   MSIPlesseyChecksumAlgorithm,
 } from '../../enum';
-import {FinderAspectRatio} from '../../model';
+import { FinderAspectRatio } from '../../model';
 
 export interface ScanbotBarcodeCameraViewProperties {
   onBarcodeScannerResult?: (result: ScanbotBarcodeCameraViewResult) => void;
@@ -112,4 +112,10 @@ export interface ScanbotBarcodeCameraViewConfiguration {
    * NOTE: This feature works on ITF barcodes only.
    */
   maximumTextLength?: number;
+  /**
+   * With this option enabled, the scanner removes checks digits for UPC, EAN and MSI Plessey codes.
+   * Has no effect if both single and double digit MSI Plessey checksums are enabled.
+   * The default is `false`
+   */
+  stripCheckDigits?: boolean;
 }