react-native-scanbot-barcode-scanner-sdk 3.3.1-beta1 → 3.3.1

package/LICENSE

@@ -1,4 +1,4 @@
-All items and source code Copyright (c) 2022 Scanbot SDK GmbH (https://scanbot.io).
+All items and source code Copyright (c) 2023 Scanbot SDK GmbH (https://scanbot.io).
 
 Scanbot Document and Barcode Scanner SDK for React Native is a commercial
 product and requires a license to be used in a production environment. It will

package/Libraries.txt

@@ -1,4 +1,4 @@
-Open Source libraries used in the Scanbot Barcode SDK for React Native version 3.3.0
+Open Source libraries used in the Scanbot Barcode SDK for React Native version 3.3.1
 
 ------------------------------------------------------------------------------------------------------------------------
 
@@ -1972,7 +1972,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ------------------------------------------------------------------------------------------------------------------------
 
-Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.3.1
+Open Source libraries used in the Scanbot Barcode Scanner SDK for Android version 3.3.1.244-SNAPSHOT
 
 CWAC-Camera
 

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.3.1'
+def sdkVersion = '3.3.1.244-SNAPSHOT'
 
 buildscript {
     if (project == rootProject) {

package/android/src/main/java/com/reactlibrary/ScanbotBarcodeSdkModule.java

@@ -23,10 +23,4 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule {
     public String getName() {
         return "ScanbotBarcodeSdk";
     }
-
-    @ReactMethod
-    public void sampleMethod(String stringArgument, int numberArgument, Callback callback) {
-        // TODO: Implement some actually useful functionality
-        callback.invoke("Received numberArgument: " + numberArgument + " stringArgument: " + stringArgument);
-    }
 }

package/android/src/main/java/com/reactlibrary/ScanbotBarcodeSdkPackage.java

@@ -8,6 +8,7 @@ package com.reactlibrary;
 import androidx.annotation.NonNull;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import com.facebook.react.ReactPackage;
@@ -15,13 +16,14 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 
-import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.RNScanbotBarcodeCameraComponent;
-import io.scanbot.barcodesdk.plugin.reactnative.components.base.RNScanbotNativeComponentManagerFactory;
+import io.scanbot.barcodesdk.plugin.reactnative.ScanbotBarcodeSdkModule;
+import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.ScanbotBarcodeCameraViewManager;
 
 public class ScanbotBarcodeSdkPackage implements ReactPackage {
+    @NonNull
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new ScanbotBarcodeSdkModule(reactContext));
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        return Collections.singletonList(new ScanbotBarcodeSdkModule(reactContext));
     }
 
     /*
@@ -31,11 +33,6 @@ public class ScanbotBarcodeSdkPackage implements ReactPackage {
     @SuppressWarnings({ "rawtypes" })
     @Override
     public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        // The ViewManager for each component is generated automatically through the
-        // RNScanbotNativeComponentManagerFactory
-        final RNScanbotNativeComponentManagerFactory factory = new RNScanbotNativeComponentManagerFactory(reactContext);
-        return Arrays.asList(new ViewManager[] {
-                factory.createManager(new RNScanbotBarcodeCameraComponent(reactContext), "ScanbotBarcodeCameraView")
-        });
+        return Collections.singletonList(new ScanbotBarcodeCameraViewManager());
     }
 }

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

@@ -8,6 +8,7 @@ package io.scanbot.barcodesdk.plugin.reactnative;
 import androidx.annotation.NonNull;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import com.facebook.react.ReactPackage;
@@ -15,13 +16,13 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 
-import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.RNScanbotBarcodeCameraComponent;
-import io.scanbot.barcodesdk.plugin.reactnative.components.base.RNScanbotNativeComponentManagerFactory;
+import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.ScanbotBarcodeCameraViewManager;
 
 public class ScanbotBarcodeSdkPackage implements ReactPackage {
+    @NonNull
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new ScanbotBarcodeSdkModule(reactContext));
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        return Collections.singletonList(new ScanbotBarcodeSdkModule(reactContext));
     }
 
     /*
@@ -31,11 +32,6 @@ public class ScanbotBarcodeSdkPackage implements ReactPackage {
     @SuppressWarnings({ "rawtypes" })
     @Override
     public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        // The ViewManager for each component is generated automatically through the
-        // RNScanbotNativeComponentManagerFactory
-        final RNScanbotNativeComponentManagerFactory factory = new RNScanbotNativeComponentManagerFactory(reactContext);
-        return Arrays.asList(new ViewManager[] {
-                factory.createManager(new RNScanbotBarcodeCameraComponent(reactContext), "ScanbotBarcodeCameraView")
-        });
+        return Collections.singletonList(new ScanbotBarcodeCameraViewManager());
     }
 }

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

@@ -0,0 +1,380 @@
+package io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static io.scanbot.barcodesdk.plugin.reactnative.utils.ScanbotViewUtils.colorWithAlpha;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.util.Size;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.views.view.ReactViewGroup;
+
+import java.util.Collections;
+import java.util.List;
+
+import io.scanbot.barcodesdk.plugin.reactnative.R;
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.ui.ScanbotViewWrapper;
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.communication.ScanbotEventEmitter;
+import io.scanbot.barcodesdk.plugin.reactnative.utils.JSONUtils;
+import io.scanbot.barcodesdk.plugin.reactnative.utils.ScanbotViewUtils;
+import io.scanbot.sdk.SdkLicenseError;
+import io.scanbot.sdk.barcode.BarcodeDetectorFrameHandler;
+import io.scanbot.sdk.barcode.DefaultScanbotBarcodeDetector;
+import io.scanbot.sdk.barcode.ScanbotBarcodeDetector;
+import io.scanbot.sdk.barcode.entity.BarcodeItem;
+import io.scanbot.sdk.barcode.entity.BarcodeScannerAdditionalConfig;
+import io.scanbot.sdk.barcode.entity.BarcodeScanningResult;
+import io.scanbot.sdk.camera.FrameHandlerResult;
+import io.scanbot.sdk.ui.camera.FinderOverlayView;
+import io.scanbot.sdk.ui.camera.ScanbotCameraXView;
+import kotlin.TypeCastException;
+import kotlin.Unit;
+
+public class ScanbotBarcodeCameraView extends FrameLayout implements BarcodeDetectorFrameHandler.ResultHandler {
+    // From Java to JavaScript
+    public enum NativeEvents implements ScanbotEventEmitter.NativeEvent {
+        BARCODE_SCANNER_RESULT("onBarcodeScannerResult");
+
+        private final String name;
+        NativeEvents(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    // Constants
+    private static final int REQUEST_PERMISSION_CODE = 200;
+
+    // Views
+    private ScanbotCameraXView cameraView;
+    private FinderOverlayView finderOverlayView;
+    private ViewGroup childrenContainerView;
+
+    // Barcode Detection
+    private BarcodeDetectorFrameHandler frameHandler;
+    private ScanbotBarcodeDetector barcodeDetector;
+
+    // Communication
+    private ScanbotEventEmitter eventEmitter;
+
+    // Configuration
+    private ScanbotBarcodeCameraViewConfiguration configuration = new ScanbotBarcodeCameraViewConfiguration();
+    private float userDefinedCameraZoomFactor = -1;
+
+    public ScanbotBarcodeCameraView(@NonNull Context context) {
+        super(context);
+        initCommunication();
+        createViews();
+        createFrameHandler();
+        refreshConfiguration();
+    }
+
+    /*---------------------------*
+     *     Barcode Detection
+     ---------------------------*/
+    private void createFrameHandler() {
+        this.barcodeDetector = new DefaultScanbotBarcodeDetector();
+        this.frameHandler = BarcodeDetectorFrameHandler.attach(cameraView, barcodeDetector);
+        this.frameHandler.setDetectionInterval(0);
+        this.frameHandler.addResultHandler(this);
+    }
+
+    // Barcode Detector Frame Handler - Result Handler
+    @Override
+    public boolean handle(@NonNull FrameHandlerResult<? extends BarcodeScanningResult, ? extends SdkLicenseError> result) {
+        if (result instanceof FrameHandlerResult.Success) {
+            //noinspection unchecked
+            handleBarcodeScanningResult((FrameHandlerResult.Success<BarcodeScanningResult>) result);
+        }
+        return false;
+    }
+
+    private void handleBarcodeScanningResult(final FrameHandlerResult.Success<BarcodeScanningResult> result) {
+        if (result.getValue() == null) {
+            return;
+        }
+
+        final List<BarcodeItem> barcodeItems = result.getValue().getBarcodeItems();
+        sendResultToJS(preprocessBarcodeItems(barcodeItems));
+    }
+
+    private List<BarcodeItem> preprocessBarcodeItems(final List<BarcodeItem> barcodeItems) {
+        if (configuration.barcodeFilter != null) {
+            return JSONUtils.getBarcodeItemsFromItemListWithFilter(barcodeItems, configuration.barcodeFilter);
+        }
+        return barcodeItems;
+    }
+
+    /*---------------------------*
+     *      Communication
+     ---------------------------*/
+    private void initCommunication() {
+        this.eventEmitter = new ScanbotEventEmitter(getReactContext(), this);
+    }
+
+    private void sendResultToJS(final List<BarcodeItem> barcodeItems) {
+        if (barcodeItems == null || barcodeItems.size() == 0) {
+            return;
+        }
+
+        final ReadableMap result = JSONUtils.jsonResultFromBarcodeItems(barcodeItems);
+        final WritableMap data = new JSONUtils.WritableMapBuilder()
+                .putMap("result", result)
+                .build();
+
+        eventEmitter.emitEvent(NativeEvents.BARCODE_SCANNER_RESULT, data);
+    }
+
+    /*---------------------------*
+     *       Configuration
+     ---------------------------*/
+    public void applyConfiguration(@NonNull final ReadableMap jsonConfig) {
+        this.configuration = ScanbotBarcodeCameraViewConfiguration.fromJsonMap(jsonConfig);
+        refreshConfiguration();
+    }
+
+    public void refreshConfiguration() {
+        getReactContext().runOnUiQueueThread(() -> {
+
+            final ScanbotBarcodeCameraViewConfiguration config = this.configuration;
+
+            // Finder Overlay View
+            finderOverlayView.setOverlayColor(colorWithAlpha(
+                config.getFinderBackgroundColor(),
+                config.getFinderBackgroundOpacity()
+            ));
+
+            finderOverlayView.setVisibility(config.shouldUseFinderView() ? View.VISIBLE : View.INVISIBLE);
+            finderOverlayView.setStrokeWidth(config.getFinderLineWidth());
+            finderOverlayView.setStrokeColor(config.getFinderLineColor());
+
+            if (config.finderInset != null) {
+                finderOverlayView.setFinderInset(
+                    config.finderInset.left,
+                    config.finderInset.top,
+                    config.finderInset.right,
+                    config.finderInset.bottom);
+            }
+
+            finderOverlayView.setFinderMinPadding(config.getFinderMinimumPadding());
+            finderOverlayView.setRequiredAspectRatios(Collections.singletonList(config.getFinderAspectRatio()));
+            finderOverlayView.requestLayout();
+
+            // Camera View
+            cameraView.useFlash(config.isFlashEnabled());
+
+            if (shouldSetCameraZoomFactor(config)) {
+                cameraView.setOpticalZoomLevel(config.getCameraZoomFactor());
+                userDefinedCameraZoomFactor = config.getCameraZoomFactor();
+            }
+
+            // TODO: Re-use ScanbotBarcodeDetectorConfigBuilder
+            barcodeDetector.modifyConfig(b -> {
+                if(!config.barcodeFormats.isEmpty()) {
+                    b.setBarcodeFormats(config.barcodeFormats);
+                }
+                if(!config.acceptedDocumentFormats.isEmpty()) {
+                    b.setAcceptedDocumentFormats(config.acceptedDocumentFormats);
+                }
+                b.setEngineMode(config.engineMode);
+                if (config.additionalConfiguration != null) {
+                    // TODO: Re-use ScanbotBarcodeDetectorAdditionalConfigBuilder
+                    b.modifyAdditionalConfig(ab -> {
+                        final BarcodeScannerAdditionalConfig cfg = config.additionalConfiguration;
+                        ab.setMinimumTextLength(cfg.getMinimumTextLength());
+                        ab.setMaximumTextLength(cfg.getMaximumTextLength());
+                        ab.setMsiPlesseyChecksumAlgorithms(cfg.getMsiPlesseyChecksumAlgorithms());
+                        ab.setStripCheckDigits(cfg.getStripCheckDigits());
+                        ab.setGs1DecodingEnabled(cfg.getGs1DecodingEnabled());
+                        ab.setMinimum1DQuietZoneSize(cfg.getMinimum1DQuietZoneSize());
+                        ab.setLowPowerMode(cfg.getLowPowerMode());
+                        return Unit.INSTANCE;
+                    });
+                }
+
+                return Unit.INSTANCE;
+            });
+        });
+    }
+
+    private boolean shouldSetCameraZoomFactor(final ScanbotBarcodeCameraViewConfiguration config) {
+        return (
+            config.getCameraZoomFactor() != -1 &&
+            (config.getCameraZoomFactor() != userDefinedCameraZoomFactor || userDefinedCameraZoomFactor == -1)
+        );
+    }
+
+    /*---------------------------*
+     *      Views Creation
+     ---------------------------*/
+    private void createViews() {
+        final Context context = getReactContext().getCurrentActivity();
+
+        cameraView = createScanbotCameraView(context);
+        finderOverlayView = createFinderOverlayView(context);
+        childrenContainerView = createChildrenContainerView(context);
+
+        addView(cameraView);
+        addView(finderOverlayView);
+        addView(childrenContainerView);
+    }
+
+    private ViewGroup createChildrenContainerView(final Context context) {
+        final ReactViewGroup containerView = new ReactViewGroup(context);
+
+        containerView.setLayoutParams(new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        containerView.setZ(2.0f);
+
+        return containerView;
+    }
+
+    private FinderOverlayView createFinderOverlayView(final Context context) {
+        final FinderOverlayView finderView = new FinderOverlayView(context, null);
+
+        finderView.setLayoutParams(new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        finderView.setId(R.id.finder_overlay);
+
+        ScanbotViewUtils.installHierarchyFitter(finderView);
+
+        return finderView;
+    }
+
+    private ScanbotCameraXView createScanbotCameraView(final Context context) {
+        final ScanbotCameraXView cameraView = new ScanbotCameraXView(context);
+
+        cameraView.setLifecycleOwner(getLifecycleOwner());
+        cameraView.setLayoutParams(new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        cameraView.setBackgroundColor(Color.BLACK);
+        cameraView.setCameraOpenCallback(cameraView::continuousFocus);
+        cameraView.post(this::checkPermissions);
+
+        applyWorkaroundForReactNativeIssue17968(cameraView);
+
+        return cameraView;
+    }
+
+    /*---------------------------*
+     *  View Lifecycle Handling
+     ---------------------------*/
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        remeasureCameraFrame();
+    }
+
+    /*---------------------------*
+     *   React Views Handling
+     ---------------------------*/
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        if (isReactChildView(child)) {
+            addReactChildView(child);
+        } else {
+            super.addView(child, index, params);
+        }
+    }
+
+    /**
+     * WORKAROUND FOR ISSUE: react child  views are not measured / positioned correctly
+     */
+    private void addReactChildView(final View child) {
+        // If the child has a parent, we take it away ¯\_(ツ)_/¯
+        if (child.getParent() instanceof ViewGroup) {
+            ((ViewGroup) child.getParent()).removeView(child);
+        }
+
+        final View view = ScanbotViewWrapper.wrap(child);
+        childrenContainerView.addView(view);
+        childrenContainerView.invalidate();
+        childrenContainerView.requestLayout();
+
+        view.invalidate();
+        view.requestLayout();
+
+        childrenContainerView.bringToFront();
+    }
+
+    private boolean isReactChildView(final View child) {
+        return child != cameraView && child != finderOverlayView && child != childrenContainerView;
+    }
+
+    /*---------------------------*
+     *      Camera Related
+     ---------------------------*/
+    /**
+     * WORKAROUND FOR ISSUE: camera frame size is not auto-calculated correctly
+     */
+    private void remeasureCameraFrame() {
+        cameraView.setCameraFrameSize(new Size(this.getWidth(), this.getHeight()));
+    }
+
+    /*---------------------------*
+     *    Utils and overrides
+     ---------------------------*/
+    /**
+     * WORKAROUND for React Native ISSUE #17968
+     * Android native UI components are not re-layout on dynamically added views
+     * https://github.com/facebook/react-native/issues/17968
+     * @param cameraView - The view that CONTAINS a PreviewView
+     */
+    private void applyWorkaroundForReactNativeIssue17968(final ViewGroup cameraView) {
+        ScanbotViewUtils.installHierarchyFitter(cameraView);
+        ScanbotViewUtils.installHierarchyFitter(cameraView.findViewById(R.id.camera_preview_view));
+    }
+
+    public static NativeEvents[] getNativeEvents() {
+        return NativeEvents.values();
+    }
+
+    private ReactContext getReactContext() {
+        final Context context = getContext();
+        if (context instanceof ReactContext) {
+            return (ReactContext) context;
+        }
+        throw new TypeCastException("Context is not of type ReactContext");
+    }
+
+    private LifecycleOwner getLifecycleOwner() {
+        final Activity activity = getReactContext().getCurrentActivity();
+        if (activity instanceof LifecycleOwner) {
+            return (LifecycleOwner) activity;
+        }
+        throw new TypeCastException("Activity is not of type LifecycleOwner");
+    }
+
+    private void checkPermissions() {
+        final Activity activity = this.getReactContext().getCurrentActivity();
+        if (activity == null) {
+            return;
+        }
+        final int cameraPermission = ContextCompat.checkSelfPermission(
+            activity,
+            Manifest.permission.CAMERA
+        );
+
+        if (cameraPermission != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(
+                    activity,
+                    new String[] { Manifest.permission.CAMERA },
+                    REQUEST_PERMISSION_CODE
+            );
+        }
+    }
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcodecameraview/{RNScanbotBarcodeCameraConfiguration.java → ScanbotBarcodeCameraViewConfiguration.java}

@@ -1,7 +1,5 @@
 package io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview;
 
-;
-
 import android.graphics.Color;
 
 import androidx.annotation.NonNull;
@@ -11,19 +9,19 @@ import com.facebook.react.bridge.ReadableMap;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.scanbot.barcodesdk.plugin.reactnative.ObjectMapper;
+import io.scanbot.barcodesdk.plugin.reactnative.components.base.models.ScanbotFinderInset;
+import io.scanbot.barcodesdk.plugin.reactnative.utils.JSONUtils;
+import io.scanbot.sdk.barcode.BarcodeFilter;
 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;
 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.barcode.BarcodeFilter;
-import io.scanbot.sdk.ui.view.barcode.SelectionOverlayConfiguration;
 
 @SuppressWarnings("unused")
-public class RNScanbotBarcodeCameraConfiguration {
+public class ScanbotBarcodeCameraViewConfiguration {
     // Manually mapped properties (must NOT have a getter and setter)
     public List<BarcodeFormat> barcodeFormats = new ArrayList<>();
     public List<BarcodeDocumentFormat> acceptedDocumentFormats = new ArrayList<>();
@@ -31,13 +29,14 @@ public class RNScanbotBarcodeCameraConfiguration {
     public BarcodeScannerAdditionalConfig additionalConfiguration;
     public BarcodeFilter barcodeFilter;
     public BarcodeDensity codeDensity;
-    public FinderInset finderInset;
+    public ScanbotFinderInset 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 = 64;
     private float finderBackgroundOpacity = 0.66f;
     private float cameraZoomFactor = -1;
     private boolean flashEnabled = false;
@@ -55,6 +54,10 @@ public class RNScanbotBarcodeCameraConfiguration {
         this.finderLineColor = viewFinderLineColor;
     }
 
+    public void setFinderMinimumPadding(int finderMinimumPadding) {
+        this.finderMinimumPadding = finderMinimumPadding;
+    }
+
     public void setFinderBackgroundColor(@androidx.annotation.ColorInt int viewFinderBackgroundColor) {
         this.finderBackgroundColor = viewFinderBackgroundColor;
     }
@@ -83,6 +86,8 @@ public class RNScanbotBarcodeCameraConfiguration {
         return finderLineWidth;
     }
 
+    public int getFinderMinimumPadding() { return finderMinimumPadding; }
+
     public int getFinderLineColor() {
         return finderLineColor;
     }
@@ -113,9 +118,10 @@ public class RNScanbotBarcodeCameraConfiguration {
      * @param jsonConfig ReadableMap
      */
     private void populateFinderInset(ReadableMap jsonConfig) {
-        this.finderInset = new FinderInset();
         if (jsonConfig.hasKey("finderInset")) {
+            this.finderInset = new ScanbotFinderInset();
             jsonConfig = jsonConfig.getMap("finderInset");
+            assert jsonConfig != null;
 
             if (jsonConfig.hasKey("left")) {
                 this.finderInset.left = jsonConfig.getInt("left");
@@ -136,8 +142,8 @@ public class RNScanbotBarcodeCameraConfiguration {
     }
 
     @NonNull
-    public static RNScanbotBarcodeCameraConfiguration fromJsonMap(ReadableMap jsonConfig) {
-        final RNScanbotBarcodeCameraConfiguration nativeConfig = new RNScanbotBarcodeCameraConfiguration();
+    public static ScanbotBarcodeCameraViewConfiguration fromJsonMap(ReadableMap jsonConfig) {
+        final ScanbotBarcodeCameraViewConfiguration nativeConfig = new ScanbotBarcodeCameraViewConfiguration();
 
         // Automatic Mapping
         try {
@@ -176,16 +182,7 @@ public class RNScanbotBarcodeCameraConfiguration {
 
         // 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;
-}