react-native-scanbot-barcode-scanner-sdk 3.2.1 → 3.3.0-beta1

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,37 +1,37 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
 	package
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:2:11-61
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:2:11-61
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:versionName
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:versionCode
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:11-69
+		ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:11-69
 uses-sdk
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mayankpatil/Mayank/Projects/SBReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -4,7 +4,7 @@ def DEFAULT_COMPILE_SDK_VERSION = 31
 def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 31
 
-def sdkVersion = '3.2.1'
+def sdkVersion = '3.3.1'
 
 buildscript {
     if (project == rootProject) {

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

@@ -7,8 +7,8 @@ import java.util.Map;
 
 import io.scanbot.sdk.barcode.entity.BarcodeItem;
 import io.scanbot.sdk.barcode.entity.BarcodeMetadataKey;
-import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
-import io.scanbot.sdk.ui.view.barcode.configuration.IBarcodeFilter;
+import io.scanbot.sdk.barcode.BarcodeFilter;
+import io.scanbot.sdk.barcode.IBarcodeFilter;
 
 public class ReactBarcodeExtensionsFilter extends BarcodeFilter {
 

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

@@ -52,10 +52,12 @@ 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.SelectionOverlayConfiguration;
 import io.scanbot.sdk.ui.view.barcode.batch.configuration.BatchBarcodeScannerConfiguration;
-import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
+import io.scanbot.sdk.barcode.BarcodeFilter;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerAdditionalConfiguration;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerConfiguration;
+import io.scanbot.sdk.ui.view.barcode.configuration.CommonBarcodeScannerConfiguration;
 import io.scanbot.sdk.ui.view.base.configuration.CameraOrientationMode;
 import kotlin.Unit;
 
@@ -264,7 +266,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         }
     }
 
-    private void setCustomBarcodeScannerConfiguration(final ReadableMap options, BarcodeScannerConfiguration configuration) {
+    private void setCustomBarcodeScannerConfiguration(final ReadableMap options, CommonBarcodeScannerConfiguration configuration) {
         CameraOrientationMode orientationMode = JSONUtils.extractCameraOrientationMode(options);
         if (orientationMode != null) {
             configuration.setOrientationLockMode(orientationMode);
@@ -298,6 +300,13 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
                 configuration.setBarcodeFilter(barcodeFilter);
             }
         }
+
+        if (options.hasKey("overlayConfiguration")) {
+            final SelectionOverlayConfiguration overlayConfiguration = JSONUtils.extractSelectionOverlayConfiguration(options);
+            if (overlayConfiguration != null) {
+                configuration.setSelectionOverlayConfiguration(overlayConfiguration);
+            }
+        }
     }
 
     @ReactMethod

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcodecameraview/RNScanbotBarcodeCameraComponent.java

@@ -137,8 +137,13 @@ public class RNScanbotBarcodeCameraComponent extends RNScanbotNativeComponent im
             finderOverlayView.setOverlayColor(colorWithAlpha(
                     configuration.getFinderBackgroundColor(),
                     configuration.getFinderBackgroundOpacity()));
-            finderOverlayView.setMinFinderPadding(configuration.getFinderMinimumPadding());
-            finderOverlayView.setVerticalOffset(configuration.getFinderVerticalOffset());
+            if (configuration.finderInset != null) {
+                finderOverlayView.setFinderInset(configuration.finderInset.left,
+                        configuration.finderInset.top,
+                        configuration.finderInset.right,
+                        configuration.finderInset.bottom);
+            }
+
             finderOverlayView.setRequiredAspectRatios(Collections.singletonList(configuration.getFinderAspectRatio()));
             finderOverlayView.requestLayout();
 
@@ -158,8 +163,7 @@ public class RNScanbotBarcodeCameraComponent extends RNScanbotNativeComponent im
                     b.setAcceptedDocumentFormats(configuration.acceptedDocumentFormats);
                 }
                 b.setEngineMode(configuration.engineMode);
-
-                if(configuration.additionalConfiguration != null) {
+                if (configuration.additionalConfiguration != null) {
                     b.modifyAdditionalConfig(ab -> {
                         final BarcodeScannerAdditionalConfig config = configuration.additionalConfiguration;
                         ab.setMinimumTextLength(config.getMinimumTextLength());
@@ -168,9 +172,11 @@ public class RNScanbotBarcodeCameraComponent extends RNScanbotNativeComponent im
                         ab.setStripCheckDigits(config.getStripCheckDigits());
                         ab.setGs1DecodingEnabled(config.getGs1DecodingEnabled());
                         ab.setMinimum1DQuietZoneSize(config.getMinimum1DQuietZoneSize());
+                        ab.setLowPowerMode(config.getLowPowerMode());
                         return Unit.INSTANCE;
                     });
                 }
+
                 return Unit.INSTANCE;
             });
         });

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcodecameraview/RNScanbotBarcodeCameraConfiguration.java

@@ -1,4 +1,6 @@
-package io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview;;
+package io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview;
+
+;
 
 import android.graphics.Color;
 
@@ -9,6 +11,7 @@ import com.facebook.react.bridge.ReadableMap;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.scanbot.sdk.barcode.entity.BarcodeDensity;
 import io.scanbot.sdk.barcode.entity.BarcodeDocumentFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeScannerAdditionalConfig;
@@ -16,7 +19,8 @@ import io.scanbot.sdk.barcode.entity.EngineMode;
 import io.scanbot.barcodesdk.plugin.reactnative.utils.JSONUtils;
 import io.scanbot.barcodesdk.plugin.reactnative.ObjectMapper;
 import io.scanbot.sdk.ui.camera.FinderAspectRatio;
-import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
+import io.scanbot.sdk.barcode.BarcodeFilter;
+import io.scanbot.sdk.ui.view.barcode.SelectionOverlayConfiguration;
 
 @SuppressWarnings("unused")
 public class RNScanbotBarcodeCameraConfiguration {
@@ -26,14 +30,14 @@ public class RNScanbotBarcodeCameraConfiguration {
     public EngineMode engineMode;
     public BarcodeScannerAdditionalConfig additionalConfiguration;
     public BarcodeFilter barcodeFilter;
+    public BarcodeDensity codeDensity;
+    public FinderInset finderInset;
 
     // Automatically mapped properties (must have a getter and a setter with the same name)
     private boolean shouldUseFinderView = false;
     private int finderLineWidth = 1;
     private int finderLineColor = Color.WHITE;
     private int finderBackgroundColor = Color.BLACK;
-    private int finderMinimumPadding = 32;
-    private int finderVerticalOffset = 0;
     private float finderBackgroundOpacity = 0.66f;
     private float cameraZoomFactor = -1;
     private boolean flashEnabled = false;
@@ -55,14 +59,6 @@ public class RNScanbotBarcodeCameraConfiguration {
         this.finderBackgroundColor = viewFinderBackgroundColor;
     }
 
-    public void setFinderMinimumPadding(int finderMinimumPadding) {
-        this.finderMinimumPadding = finderMinimumPadding;
-    }
-
-    public void setFinderVerticalOffset(int finderVerticalOffset) {
-        this.finderVerticalOffset = finderVerticalOffset;
-    }
-
     public void setFinderAspectRatio(FinderAspectRatio finderAspectRatio) {
         this.finderAspectRatio = finderAspectRatio;
     }
@@ -95,14 +91,6 @@ public class RNScanbotBarcodeCameraConfiguration {
         return finderBackgroundColor;
     }
 
-    public int getFinderMinimumPadding() {
-        return finderMinimumPadding;
-    }
-
-    public int getFinderVerticalOffset() {
-        return finderVerticalOffset;
-    }
-
     public float getFinderBackgroundOpacity() {
         return finderBackgroundOpacity;
     }
@@ -119,6 +107,34 @@ public class RNScanbotBarcodeCameraConfiguration {
         return finderAspectRatio;
     }
 
+    /**
+     * Checks if finder inset available, then populates the finder inset from readable map(json) object
+     *
+     * @param jsonConfig ReadableMap
+     */
+    private void populateFinderInset(ReadableMap jsonConfig) {
+        this.finderInset = new FinderInset();
+        if (jsonConfig.hasKey("finderInset")) {
+            jsonConfig = jsonConfig.getMap("finderInset");
+
+            if (jsonConfig.hasKey("left")) {
+                this.finderInset.left = jsonConfig.getInt("left");
+            }
+
+            if (jsonConfig.hasKey("top")) {
+                this.finderInset.top = jsonConfig.getInt("top");
+            }
+
+            if (jsonConfig.hasKey("right")) {
+                this.finderInset.right = jsonConfig.getInt("right");
+            }
+
+            if (jsonConfig.hasKey("bottom")) {
+                this.finderInset.bottom = jsonConfig.getInt("bottom");
+            }
+        }
+    }
+
     @NonNull
     public static RNScanbotBarcodeCameraConfiguration fromJsonMap(ReadableMap jsonConfig) {
         final RNScanbotBarcodeCameraConfiguration nativeConfig = new RNScanbotBarcodeCameraConfiguration();
@@ -158,6 +174,18 @@ public class RNScanbotBarcodeCameraConfiguration {
         nativeConfig.additionalConfiguration = JSONUtils.extractBarcodeScannerAdditionalConfig(jsonConfig);
         nativeConfig.engineMode = JSONUtils.extractEngineMode(jsonConfig);
 
+        // Finder inset
+        nativeConfig.populateFinderInset(jsonConfig);
         return nativeConfig;
     }
 }
+
+/**
+ * Finder Inset class to extract data from common React native side and carry it to the native classical component.
+ */
+class FinderInset {
+    public int left;
+    public int top;
+    public int right;
+    public int bottom;
+}

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

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import io.scanbot.sdk.barcode.entity.BarcodeItem;
 import io.scanbot.sdk.barcode.entity.BarcodeMetadataKey;
-import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
+import  io.scanbot.sdk.barcode.BarcodeFilter;
 
 public class ReactBarcodeExtensionsFilter extends BarcodeFilter {
 

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

@@ -5,6 +5,7 @@
  */
 package io.scanbot.barcodesdk.plugin.reactnative.utils;
 
+import android.graphics.Color;
 import android.graphics.PointF;
 import android.util.Log;
 
@@ -26,6 +27,7 @@ import java.util.List;
 import java.util.Objects;
 
 import io.scanbot.barcodesdk.plugin.reactnative.filters.ReactBarcodeExtensionsFilter;
+import io.scanbot.sdk.barcode.entity.BarcodeDensity;
 import io.scanbot.sdk.barcode.entity.BarcodeDocumentFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeItem;
@@ -33,7 +35,9 @@ import io.scanbot.sdk.barcode.entity.BarcodeScannerAdditionalConfig;
 import io.scanbot.sdk.barcode.entity.BarcodeScanningResult;
 import io.scanbot.sdk.barcode.entity.EngineMode;
 import io.scanbot.sdk.barcode.entity.MSIPlesseyChecksumAlgorithm;
-import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
+import io.scanbot.sdk.barcode.BarcodeFilter;
+import io.scanbot.sdk.barcode.ui.BarcodeOverlayTextFormat;
+import io.scanbot.sdk.ui.view.barcode.SelectionOverlayConfiguration;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerAdditionalConfiguration;
 import io.scanbot.sdk.ui.view.base.configuration.CameraOrientationMode;
 
@@ -134,10 +138,7 @@ public final class JSONUtils {
                 case "NONE":
                     break;
                 case "PORTRAIT":
-                case "PORTRAIT_UPSIDE_DOWN":
                     return CameraOrientationMode.PORTRAIT;
-                case "LANDSCAPE_LEFT":
-                case "LANDSCAPE_RIGHT":
                 case "LANDSCAPE":
                     return CameraOrientationMode.LANDSCAPE;
                 default:
@@ -197,6 +198,13 @@ public final class JSONUtils {
             changed = true;
         }
 
+        BarcodeDensity codeDensity = BarcodeScannerAdditionalConfig.getDEFAULT_CODE_DENSITY();
+        if (configuration.hasKey("codeDensity")) {
+            String barcodeDensity = configuration.getString("codeDensity");
+            codeDensity = BarcodeDensity.valueOf(barcodeDensity);
+            changed = true;
+        }
+
         return changed ? new BarcodeScannerAdditionalConfig(
                 minimumTextLength,
                 maximumTextLength,
@@ -204,7 +212,8 @@ public final class JSONUtils {
                 gs1DecodingEnabled,
                 msiPlesseyChecksumAlgorithms,
                 stripCheckDigits,
-                lowPowerMode
+                lowPowerMode,
+                codeDensity
         ) : null;
     }
 
@@ -218,7 +227,8 @@ public final class JSONUtils {
                 config.getGs1DecodingEnabled(),
                 config.getMsiPlesseyChecksumAlgorithms(),
                 config.getStripCheckDigits(),
-                config.getLowPowerMode()
+                config.getLowPowerMode(),
+                config.getCodeDensity()
         ) : null;
     }
 
@@ -283,7 +293,7 @@ public final class JSONUtils {
 
         String mode = configuration.getString("engineMode");
         if ("LEGACY".equals(mode)) {
-            return EngineMode.Legacy;
+            return EngineMode.LegacyFast;
         }
         return EngineMode.NextGen;
     }
@@ -323,10 +333,67 @@ public final class JSONUtils {
             return jsonArray;
         }
 
-        for (byte b: rawBytes) {
+        for (byte b : rawBytes) {
             jsonArray.pushInt(b);
         }
 
         return jsonArray;
     }
+
+    public static SelectionOverlayConfiguration extractSelectionOverlayConfiguration(ReadableMap configuration) {
+
+        if (configuration.hasKey("overlayConfiguration")) {
+            configuration = configuration.getMap("overlayConfiguration");
+        } else {
+            return null;
+        }
+
+        Boolean overlayEnabled = true;
+        if (configuration.hasKey("overlayEnabled")) {
+            overlayEnabled = configuration.getBoolean("overlayEnabled");
+        }
+
+        BarcodeOverlayTextFormat textFormat = BarcodeOverlayTextFormat.CODE_AND_TYPE;
+
+        int polygonColor = Color.BLACK;
+        if (configuration.hasKey("polygonColor")) {
+            polygonColor = Color.parseColor(configuration.getString("polygonColor"));
+        }
+
+        int textColor = Color.BLACK;
+        if (configuration.hasKey("textColor")) {
+            textColor = Color.parseColor(configuration.getString("textColor"));
+        }
+
+        int textContainerColor = Color.BLACK;
+        if (configuration.hasKey("textContainerColor")) {
+            textContainerColor = Color.parseColor(configuration.getString("textContainerColor"));
+        }
+
+        Integer highlightedPolygonColor = null;
+        if (configuration.hasKey("highlightedPolygonColor")) {
+            highlightedPolygonColor = Color.parseColor(configuration.getString("highlightedPolygonColor"));
+        }
+
+        Integer highlightedTextColor = null;
+        if (configuration.hasKey("highlightedTextColor")) {
+            highlightedTextColor = Color.parseColor(configuration.getString("highlightedTextColor"));
+        }
+
+        Integer highlightedTextContainerColor = null;
+        if (configuration.hasKey("highlightedTextContainerColor")) {
+            highlightedTextContainerColor = Color.parseColor(configuration.getString("highlightedTextContainerColor"));
+        }
+
+        SelectionOverlayConfiguration selectionOverlayConfiguration = new SelectionOverlayConfiguration(
+                overlayEnabled,
+                textFormat,
+                polygonColor,
+                textColor,
+                textContainerColor,
+                highlightedPolygonColor,
+                highlightedTextColor,
+                highlightedTextContainerColor);
+        return selectionOverlayConfiguration;
+    }
 }

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.h

@@ -19,6 +19,7 @@
 @property (nonatomic, copy) RCTBubblingEventBlock _Nullable requestComponentReload;
 @property (nonatomic) BOOL shouldUseFinderView;
 @property (nonatomic, copy) NSDictionary* _Nullable configuration;
+@property (nonatomic) BOOL finderInsetAvailable;
 
 - (void) createCameraViewController;
 - (UIViewController* _Nullable) getParentViewController;
@@ -38,9 +39,6 @@
 @property (nonatomic) UIColor* _Nonnull finderBackgroundColor;
 @property (nonatomic) CGFloat finderBackgroundOpacity;
 @property (nonatomic) SBSDKAspectRatio* _Nonnull finderAspectRatio;
-@property (nonatomic) CGFloat finderMinimumPadding;
-@property (nonatomic) CGFloat finderVerticalOffset;
-
 
 // Nullable Properties (-1 for enums)
 @property (nonatomic, copy) NSNumber* _Nullable shouldUseFinderView;
@@ -55,7 +53,8 @@
 @property (nonatomic) SBSDKBarcodeMSIPlesseyChecksumAlgorithm msiPlesseyChecksumAlgorithm;
 @property (nonatomic) SBSDKBarcodeEngineMode engineMode;
 @property (nonatomic) SBSDKUIBarcodeFilter* _Nullable barcodeFilter;
-
+@property (nonatomic) SBSDKBarcodeDensity codeDensity;
+@property (nonatomic) UIEdgeInsets finderInset;
 @end
 
 #endif /* RNScanbotCameraView_h */

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.m

@@ -48,9 +48,8 @@
     
     if (!_cameraViewController) {
         viewController = [[SBSDKBarcodeScannerViewController alloc] initWithParentViewController:parentViewController
-                                                                                      parentView:self];
-        viewController.delegate = self;
-
+                                                                                      parentView:self
+                                                                                        delegate:self];
         _cameraViewController = viewController;
     }
     
@@ -74,16 +73,26 @@
         cameraViewConfiguration.barcodeFilter = extractBarcodeFilter(config);
         [config removeObjectForKey:@"barcodeFilter"];
     }
-
+    
     @try {
         [ObjectMapper populateInstance:cameraViewConfiguration fromDictionary:config];
+        NSNumber *gs1Decoding = [config objectForKey:@"gs1DecodingEnabled"];
+        if (gs1Decoding != nil) {
+            cameraViewConfiguration.gs1DecodingEnabled = gs1Decoding;
+        }
+        
+        // We also need to manually extract the MSI-Plessey Checksum Algorithm since it can't be mapped automatically
+        cameraViewConfiguration.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
+        cameraViewConfiguration.codeDensity = extractBarcodeDensity(config);
+        cameraViewConfiguration.finderInset = [self populateFinderInset:config];
+        
+        self.shouldUseFinderView = [config objectForKey:@"shouldUseFinderView"];
+        
     } @catch (NSException *exception) {
         NSLog(@"%@", [exception reason]);
         return;
     }
     
-    cameraViewConfiguration.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
-    
     _cameraViewConfiguration = cameraViewConfiguration;
     
     if(viewController) {
@@ -92,25 +101,21 @@
 }
 
 - (void)updateWithConfiguration {
-
-    // Non-Nullable Properties
-    viewController.viewFinderLineWidth = _cameraViewConfiguration.finderLineWidth;
-    viewController.viewFinderLineColor = _cameraViewConfiguration.finderLineColor;
-    viewController.viewFinderBackgroundColor = _cameraViewConfiguration.finderBackgroundColor;
-    viewController.viewFinderBackgroundColor = [viewController.viewFinderBackgroundColor colorWithAlphaComponent:_cameraViewConfiguration.finderBackgroundOpacity];
-    viewController.finderAspectRatio = _cameraViewConfiguration.finderAspectRatio;
     
-    CGFloat offset = _cameraViewConfiguration.finderVerticalOffset;
-    CGFloat padding = _cameraViewConfiguration.finderMinimumPadding;
-    viewController.finderMinimumInset = UIEdgeInsetsMake(padding + offset > 0 ? offset : 0,
-                                                         padding,
-                                                         padding + offset < 0 ? -1*offset : 0,
-                                                         padding);
-    
-    // Nullable Properties
-    if (_cameraViewConfiguration.shouldUseFinderView) {
-        viewController.shouldUseFinderFrame = [_cameraViewConfiguration.shouldUseFinderView boolValue];
+    SBSDKBaseScannerViewFinderConfiguration *configuration =  [[SBSDKBaseScannerViewFinderConfiguration alloc] init];
+    configuration.lineWidth = _cameraViewConfiguration.finderLineWidth;
+    configuration.lineColor = _cameraViewConfiguration.finderLineColor;
+    configuration.backgroundColor = _cameraViewConfiguration.finderBackgroundColor;
+    configuration.backgroundColor = [configuration.backgroundColor colorWithAlphaComponent:_cameraViewConfiguration.finderBackgroundOpacity];
+    configuration.aspectRatio = _cameraViewConfiguration.finderAspectRatio;
+    if (self.finderInsetAvailable) {
+        configuration.minimumInset = UIEdgeInsetsMake(_cameraViewConfiguration.finderInset.top,
+                                                      _cameraViewConfiguration.finderInset.left,
+                                                      _cameraViewConfiguration.finderInset.bottom,
+                                                      _cameraViewConfiguration.finderInset.right);
     }
+    configuration.viewFinderEnabled = self.shouldUseFinderView;
+    viewController.viewFinderConfiguration = configuration;
     if (_cameraViewConfiguration.barcodeFormats) {
         viewController.acceptedBarcodeTypes = _cameraViewConfiguration.barcodeFormats;
     }
@@ -136,6 +141,9 @@
     if (_cameraViewConfiguration.stripCheckDigits) {
         additionalParameters.stripCheckDigits = [_cameraViewConfiguration.stripCheckDigits boolValue];
     }
+    if (_cameraViewConfiguration.codeDensity) {
+        additionalParameters.codeDensity = _cameraViewConfiguration.codeDensity;
+    }
     
     viewController.additionalDetectionParameters = additionalParameters;
     
@@ -154,6 +162,25 @@
     }
 }
 
+
+- (UIEdgeInsets)populateFinderInset: (NSMutableDictionary*)config {
+    UIEdgeInsets finderInset = UIEdgeInsetsZero;
+    NSMutableDictionary* jsonConfig = [config objectForKey:@"finderInset"];
+    if (jsonConfig) {
+        double left = [[jsonConfig objectForKey:@"left"] doubleValue];
+        double top = [[jsonConfig objectForKey:@"top"] doubleValue];
+        double right = [[jsonConfig objectForKey:@"right"] doubleValue];
+        double bottom = [[jsonConfig objectForKey:@"bottom"] doubleValue];
+        
+        finderInset = UIEdgeInsetsMake(top, left, bottom, right);
+        self.finderInsetAvailable = true;
+    } else {
+        self.finderInsetAvailable = false;
+    }
+    return finderInset;
+}
+
+
 - (UIViewController* _Nullable)getParentViewController {
     UIResponder* parentResponder = self;
     while (parentResponder) {
@@ -165,11 +192,11 @@
     return NULL;
 }
 
-- (void)sendScanResults:(NSArray<SBSDKBarcodeScannerResult*>*) results {
+- (void)sendScanResults:(NSArray<SBSDKBarcodeScannerResult*>*) results onImage:(UIImage*)image {
     if(!self.onBarcodeScannerResult) {
         return;
     }
-
+    
     if(!results || results.count == 0) {
         return;
     }
@@ -197,8 +224,10 @@
 // MARK: - SBSDKBarcodeScannerViewControllerDelegate
 
 - (void)barcodeScannerController:(SBSDKBarcodeScannerViewController *)controller
-               didDetectBarcodes:(NSArray<SBSDKBarcodeScannerResult *> *)codes {
-    [self sendScanResults:codes];
+               didDetectBarcodes:(NSArray<SBSDKBarcodeScannerResult *> *)codes
+                         onImage:(nonnull UIImage *)image {
+    
+    [self sendScanResults:codes onImage:image];
 }
 
 - (BOOL)barcodeScannerControllerShouldDetectBarcodes:(SBSDKBarcodeScannerViewController *)controller {
@@ -234,8 +263,6 @@
         self.finderAspectRatio = [[SBSDKAspectRatio alloc] initWithWidth:1 andHeight:1];
         self.finderBackgroundColor = UIColor.blackColor;
         self.finderBackgroundOpacity = 0.6;
-        self.finderMinimumPadding = 32.0;
-        self.finderVerticalOffset = 0.0;
         self.acceptedDocumentFormats = nil;
         self.gs1DecodingEnabled = nil;
         self.maximumTextLength = nil;
@@ -244,6 +271,7 @@
         self.cameraZoomFactor = nil;
         self.engineMode = -1;
         self.flashEnabled = nil;
+        self.finderInset = UIEdgeInsetsMake(32, 32, 32, 32);
     }
     return self;
 }