react-native-scanbot-barcode-scanner-sdk 3.1.0 → 3.2.0-beta3

package/RNScanbotBarcodeSDK.podspec

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

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

@@ -1,2 +1,2 @@
-#Mon Jan 31 14:23:43 CET 2022
-gradle.version=7.1.1
+#Mon May 23 15:11:17 CEST 2022
+gradle.version=6.2

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.1.0'
+def sdkVersion = '3.2.1'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

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

@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 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.Promise;
@@ -20,8 +21,10 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,6 +32,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.sdk.barcode.ScanbotBarcodeDetector;
 import io.scanbot.sdk.barcode.entity.BarcodeDocumentFormat;
@@ -47,6 +51,7 @@ 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 android.app.Activity;
 
 
@@ -132,8 +137,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
                     } else {
                         ResponseUtils.errorMessageJson(descriptionFromLicenseStatus(licenseInfo.getStatus()), promise);
                     }
-                }
-                catch (Exception ex) {
+                } catch (Exception ex) {
                     promise.reject(ex);
                 }
             }
@@ -153,8 +157,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
             result.putString("licenseStatus", licenseInfo.getStatus().name());
             result.putString("licenseStatusMessage", descriptionFromLicenseStatus(licenseInfo.getStatus()));
             promise.resolve(result);
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
             promise.reject(ex);
         }
     }
@@ -237,35 +240,13 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
 
             safeMap(options, configuration, promise);
 
-            CameraOrientationMode orientationMode = JSONUtils.extractCameraOrientationMode(options);
-            if (orientationMode != null) {
-                configuration.setOrientationLockMode(orientationMode);
-            }
-
-            final ArrayList<BarcodeFormat> formats = JSONUtils.extractBarcodeFormats(options);
-            if (!formats.isEmpty()) {
-                configuration.setBarcodeFormatsFilter(formats);
-            }
-
-            final ArrayList<BarcodeDocumentFormat> documentFormats = JSONUtils.extractBarcodeDocumentFormats(options);
-            if (!documentFormats.isEmpty()) {
-                configuration.setAcceptedDocumentFormats(documentFormats);
-            }
-
-            final BarcodeScannerAdditionalConfiguration additionalConfiguration =
-                    JSONUtils.extractBarcodeScannerAdditionalConfiguration(options);
-            if (additionalConfiguration != null) {
-                configuration.setAdditionalDetectionParameters(additionalConfiguration);
-            }
-
-            configuration.setEngineMode(JSONUtils.extractEngineMode(options));
+            this.setCustomBarcodeScannerConfiguration(options, configuration);
 
             final Intent intent = BarcodeScannerActivity.newIntent(this.getReactApplicationContext(), configuration);
             activityCallbackPromise = promise;
             context.addActivityEventListener(this);
             context.startActivityForResult(intent, REQUEST_SB_BARCODE_SCANNER, null);
-        }
-        catch (final Exception e) {
+        } catch (final Exception e) {
             promise.reject("Error starting barcode scanner.", e);
         }
     }
@@ -286,31 +267,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
 
             ObjectMapper.map(configuration, nativeConfig);
 
-            // Additional Parameters
-            final BarcodeScannerAdditionalConfiguration additionalConfiguration =
-                    JSONUtils.extractBarcodeScannerAdditionalConfiguration(configuration);
-            if(additionalConfiguration != null) {
-                nativeConfig.setAdditionalDetectionParameters(additionalConfiguration);
-            }
-
-            CameraOrientationMode orientationMode = JSONUtils.extractCameraOrientationMode(configuration);
-            if (orientationMode != null) {
-                nativeConfig.setOrientationLockMode(orientationMode);
-            }
-
-            // Barcode Format Filters
-            ArrayList<BarcodeFormat> formats = JSONUtils.extractBarcodeFormats(configuration);
-            if (!formats.isEmpty()) {
-                nativeConfig.setBarcodeFormatsFilter(formats);
-            }
-
-            // Document Format Filters
-            ArrayList<BarcodeDocumentFormat> documentFormats = JSONUtils.extractBarcodeDocumentFormats(configuration);
-            if (!documentFormats.isEmpty()) {
-                nativeConfig.setAcceptedDocumentFormats(documentFormats);
-            }
-
-            nativeConfig.setEngineMode(JSONUtils.extractEngineMode(configuration));
+            this.setCustomBarcodeScannerConfiguration(configuration, nativeConfig);
 
             Intent startIntent = BatchBarcodeScannerActivity.newIntent(context, nativeConfig, null);
 
@@ -322,6 +279,35 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         }
     }
 
+    private void setCustomBarcodeScannerConfiguration(final ReadableMap options, BarcodeScannerConfiguration configuration) {
+        CameraOrientationMode orientationMode = JSONUtils.extractCameraOrientationMode(options);
+        if (orientationMode != null) {
+            configuration.setOrientationLockMode(orientationMode);
+        }
+
+        final ArrayList<BarcodeFormat> formats = JSONUtils.extractBarcodeFormats(options);
+        if (!formats.isEmpty()) {
+            configuration.setBarcodeFormatsFilter(formats);
+        }
+
+        final ArrayList<BarcodeDocumentFormat> documentFormats = JSONUtils.extractBarcodeDocumentFormats(options);
+        if (!documentFormats.isEmpty()) {
+            configuration.setAcceptedDocumentFormats(documentFormats);
+        }
+
+        final BarcodeScannerAdditionalConfiguration additionalConfiguration =
+                JSONUtils.extractBarcodeScannerAdditionalConfiguration(options);
+        if (additionalConfiguration != null) {
+            configuration.setAdditionalDetectionParameters(additionalConfiguration);
+        }
+
+        configuration.setEngineMode(JSONUtils.extractEngineMode(options));
+
+        if (options.hasKey("replaceCancelButtonWithIcon") && options.getBoolean("replaceCancelButtonWithIcon")) {
+            configuration.setCancelButtonIcon(R.drawable.ic_baseline_arrow_back_24);
+        }
+    }
+
     @ReactMethod
     public void closeBatchBarcodeScanner(final Promise promise) {
         final ReactContext context = getReactApplicationContext();
@@ -345,8 +331,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
                     debugLog("Cleaning plugin storage folder ...");
                     StorageUtils.cleanupPluginStorageDirectory(getReactApplicationContext());
                     ResponseUtils.successMessageJson("Cleanup successfully done.", promise);
-                }
-                catch (final Exception e) {
+                } catch (final Exception e) {
                     ResponseUtils.errorMessageJson(e.getLocalizedMessage(), promise);
                 }
             }

package/android/src/main/res/drawable/ic_baseline_arrow_back_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>

package/ios/ScanbotBarcodeSdk.xcodeproj/xcuserdata/mayankpatil.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>ScanbotBarcodeSdk.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/Utils/BarcodeMapping.h

@@ -32,11 +32,12 @@ static inline SBSDKBarcodeDocumentType* barcodeDocumentTypeFromString(NSString*
     if ([string isEqualToString:@"AAMVA"]) return SBSDKBarcodeDocumentTypeAAMVA;
     if ([string isEqualToString:@"ID_CARD_PDF_417"]) return SBSDKBarcodeDocumentTypeIDCardPDF417;
     if ([string isEqualToString:@"SEPA"]) return SBSDKBarcodeDocumentTypeSEPA;
-    if ([string isEqualToString:@"DISABILITY_CERTIFICATE"]) return SBSDKBarcodeDocumentTypeDisabilityCertificate;
+    if ([string isEqualToString:@"MEDICAL_CERTIFICATE"]) return SBSDKBarcodeDocumentTypeMedicalCertificate;
     if ([string isEqualToString:@"BOARDING_PASS"]) return SBSDKBarcodeDocumentTypeBoardingPass;
     if ([string isEqualToString:@"DE_MEDICAL_PLAN"]) return SBSDKBarcodeDocumentTypeMedicalPlan;
     if ([string isEqualToString:@"VCARD"]) return SBSDKBarcodeDocumentTypeVCard;
     if ([string isEqualToString:@"SWISS_QR"]) return SBSDKBarcodeDocumentTypeSwissQR;
+    if ([string isEqualToString:@"GS1"]) return SBSDKBarcodeDocumentTypeGS1;
     return nil;
 }
 

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",
+  "version": "3.2.0-beta3",
   "description": "React Native plugin for the Scanbot Barcode Scanner SDK on Android and iOS",
   "main": "index.js",
   "files": [

package/src/configuration.ts

@@ -152,6 +152,12 @@ export interface BarcodeScannerConfiguration {
    * Android only.
    */
   lowPowerMode?: boolean;
+  /**
+   * If `true`, replaces the cancel button in the top bar with a back arrow icon
+   * The default is `false`.
+   * Android only.
+   */
+  replaceCancelButtonWithIcon?: boolean;
 }
 
 export interface BatchBarcodeScannerConfiguration {
@@ -325,6 +331,12 @@ export interface BatchBarcodeScannerConfiguration {
    * Android only.
    */
   lowPowerMode?: boolean;
+  /**
+   * If `true`, replaces the cancel button in the top bar with a back arrow icon
+   * The default is `false`.
+   * Android only.
+   */
+  replaceCancelButtonWithIcon?: boolean;
 }
 
 interface InternalBarcodeDetectionCommonParameters {

package/src/enum.ts

@@ -38,11 +38,12 @@ export type BarcodeDocumentFormat =
     "AAMVA" |
     "BOARDING_PASS" |
     "DE_MEDICAL_PLAN" |
-    "DISABILITY_CERTIFICATE" |
+    "MEDICAL_CERTIFICATE" |
     "ID_CARD_PDF_417" |
     "SEPA" |
     "SWISS_QR" |
-    "VCARD";
+    "VCARD" |
+    "GS1" ;
 
 export type BarcodeFormat =
     "AZTEC" |

package/android/local.properties

@@ -1,8 +0,0 @@
-## 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