react-native-scanbot-barcode-scanner-sdk 3.7.0-alpha.1 → 3.7.0-beta.2

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

@@ -6,6 +6,7 @@
 package io.scanbot.barcodesdk.plugin.reactnative;
 
 import android.graphics.Color;
+import android.util.Log;
 
 import com.facebook.react.bridge.ReadableMap;
 
@@ -14,6 +15,7 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.scanbot.barcodesdk.plugin.reactnative.utils.LogUtils;
 import io.scanbot.sdk.ui.camera.FinderAspectRatio;
 
 public final class ObjectMapper {
@@ -25,8 +27,9 @@ public final class ObjectMapper {
     *  Properties listed here will be skipped by the Object Mapper
     */
     private final static String[] kIgnoredProperties = new String[] {
-        "engineMode",
-        "barcodeFilter"
+            "engineMode",
+            "barcodeFilter",
+            "cameraZoomRange"
     };
 
     public static class InvalidJSONException extends RuntimeException {
@@ -67,7 +70,7 @@ public final class ObjectMapper {
         }
 
         for (HashMap.Entry<String, Object> entry : source.entrySet()) {
-            final String prop = entry.getKey();
+            String prop = entry.getKey();
             Object value = entry.getValue();
             if (value == null) {
                 continue;
@@ -82,6 +85,11 @@ public final class ObjectMapper {
                 value = "FRONT_MIRRORED";
             }
 
+            // for android this property is "initialScanDelayMs" and iOS is "initialScanDelay".
+            if (prop == "initialScanDelay") {
+                prop = "initialScanDelayMs";
+            }
+
             final String setterName = "set" + prop.substring(0, 1).toUpperCase() + prop.substring(1);
 
             if (methodMap.containsKey(setterName)) {

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

@@ -50,6 +50,7 @@ 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.camera.ZoomRange;
 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;
@@ -307,6 +308,15 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
                 configuration.setSelectionOverlayConfiguration(overlayConfiguration);
             }
         }
+
+        if (options.hasKey("cameraZoomRange")) {
+            final ZoomRange zoomRange = JSONUtils.extractCameraZoomRange(options);
+            if (zoomRange != null) {
+                configuration.setCameraZoomRange(zoomRange);
+            }
+        }
+
+        configuration.setCameraPreviewMode(JSONUtils.extractCameraPreviewMode(options));
     }
 
     @ReactMethod

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

@@ -37,6 +37,8 @@ import io.scanbot.sdk.barcode.entity.EngineMode;
 import io.scanbot.sdk.barcode.entity.MSIPlesseyChecksumAlgorithm;
 import io.scanbot.sdk.barcode.BarcodeFilter;
 import io.scanbot.sdk.barcode.ui.BarcodeOverlayTextFormat;
+import io.scanbot.sdk.camera.CameraPreviewMode;
+import io.scanbot.sdk.camera.ZoomRange;
 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;
@@ -412,12 +414,38 @@ public final class JSONUtils {
         }
 
         switch (textFormatString) {
-            case "NONE":return BarcodeOverlayTextFormat.NONE;
-            case "CODE": return BarcodeOverlayTextFormat.CODE;
-            case "CODE_AND_TYPE": return BarcodeOverlayTextFormat.CODE_AND_TYPE;
+            case "NONE":
+                return BarcodeOverlayTextFormat.NONE;
+            case "CODE":
+                return BarcodeOverlayTextFormat.CODE;
+            case "CODE_AND_TYPE":
+                return BarcodeOverlayTextFormat.CODE_AND_TYPE;
             default:
                 Log.w("ScanbotSDK", "Invalid overlay text format: " + textFormatString + ". Using default");
-            return BarcodeOverlayTextFormat.CODE_AND_TYPE; 
+                return BarcodeOverlayTextFormat.CODE_AND_TYPE;
         }
     }
-}
+
+    public static CameraPreviewMode extractCameraPreviewMode(ReadableMap configuration) {
+        CameraPreviewMode mode = CameraPreviewMode.FILL_IN;
+        if (!configuration.hasKey("cameraPreviewMode") || configuration.getString("cameraPreviewMode") == null) {
+            return mode;
+        }
+        String cameraPreviewModeString = configuration.getString("cameraPreviewMode");
+        if (cameraPreviewModeString.equals("FIT_IN")) {
+            mode = CameraPreviewMode.FIT_IN;
+        }
+        return mode;
+    }
+
+    public static ZoomRange extractCameraZoomRange(ReadableMap configuration) {
+        ZoomRange zoomRange = new ZoomRange();
+        if (configuration.hasKey("cameraZoomRange") && configuration.getMap("cameraZoomRange") != null) {
+           ReadableMap zoomRangeConfiguration = configuration.getMap("cameraZoomRange");
+            float maxZoom = (float)zoomRangeConfiguration.getDouble("maxZoom");
+            float minZoom = (float)zoomRangeConfiguration.getDouble("minZoom");
+            zoomRange = new ZoomRange(minZoom, maxZoom);
+        }
+        return zoomRange;
+    }
+}

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.h

@@ -55,6 +55,7 @@
 @property (nonatomic) SBSDKUIBarcodeFilter* _Nullable barcodeFilter;
 @property (nonatomic) SBSDKBarcodeDensity codeDensity;
 @property (nonatomic) UIEdgeInsets finderInset;
+@property (nonatomic) SBSDKZoomRange* _Nullable zoomRange;
 @end
 
 #endif /* RNScanbotCameraView_h */

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.m

@@ -45,15 +45,21 @@
     if (!parentViewController) {
         return;
     }
-    
+    BOOL isInit = false;
     if (!_cameraViewController) {
         viewController = [[SBSDKBarcodeScannerViewController alloc] initWithParentViewController:parentViewController
                                                                                       parentView:self
                                                                                         delegate:self];
         _cameraViewController = viewController;
+        isInit = true;
+    }
+
+    // Temporary workaround for flashEnabled property.
+    if (isInit && _cameraViewConfiguration.flashEnabled) {
+        [self applyConfigurationWithDelay:0.5];
+    } else {
+        [self applyConfiguration];
     }
-    
-    [self updateWithConfiguration];
 }
 
 - (void)setConfiguration:(NSDictionary *)configuration {
@@ -85,8 +91,8 @@
         cameraViewConfiguration.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
         cameraViewConfiguration.codeDensity = extractBarcodeDensity(config);
         cameraViewConfiguration.finderInset = [self populateFinderInset:config];
-        
         self.shouldUseFinderView = [[config objectForKey:@"shouldUseFinderView"] boolValue];
+        cameraViewConfiguration.zoomRange = extractCameraZoomRange(config);
         
     } @catch (NSException *exception) {
         NSLog(@"%@", [exception reason]);
@@ -96,11 +102,11 @@
     _cameraViewConfiguration = cameraViewConfiguration;
     
     if(viewController) {
-        [self updateWithConfiguration];
+        [self applyConfiguration];
     }
 }
 
-- (void)updateWithConfiguration {
+- (void)applyConfiguration {
     
     SBSDKBaseScannerViewFinderConfiguration *configuration =  [[SBSDKBaseScannerViewFinderConfiguration alloc] init];
     configuration.lineWidth = _cameraViewConfiguration.finderLineWidth;
@@ -160,8 +166,18 @@
     if (_cameraViewConfiguration.flashEnabled) {
         viewController.flashLightEnabled = [_cameraViewConfiguration.flashEnabled boolValue];
     }
+    
+    if (viewController.zoomConfiguration != nil) {
+        viewController.zoomConfiguration.zoomRange = _cameraViewConfiguration.zoomRange;
+    }
 }
 
+- (void)applyConfigurationWithDelay:(NSTimeInterval)delayInSeconds {
+    dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
+    dispatch_after(delayTime, dispatch_get_main_queue(), ^(void){
+        [self applyConfiguration];
+    });
+}
 
 - (UIEdgeInsets)populateFinderInset: (NSMutableDictionary*)config {
     UIEdgeInsets finderInset = UIEdgeInsetsZero;

package/ios/ScanbotBarcodeSdk.m

@@ -145,14 +145,15 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     behaviorConfig.acceptedDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);
     behaviorConfig.acceptedBarcodeTypes = extractBarcodeTypesFromConfiguration(configuration);
     behaviorConfig.engineMode = extractEngineMode(configuration);
+    behaviorConfig.cameraZoomRange = extractCameraZoomRange(configuration);
     
     uiConfig.orientationLockMode = [ObjectMapper extractOrientationLockMode:configuration];
     
     SBSDKUIBarcodeScannerConfiguration* barcodeScannerConfiguration = [[SBSDKUIBarcodeScannerConfiguration alloc] initWithUIConfiguration:uiConfig
-                                                                                                      textConfiguration:textConfig
-                                                                                                  behaviorConfiguration:behaviorConfig
-                                                                                                    cameraConfiguration:cameraConfig
-                                                                                                        selectionOverlayConfiguration: selectionOverlayConfig];
+                                                                                                                textConfiguration:textConfig
+                                                                                                                behaviorConfiguration:behaviorConfig
+                                                                                                                cameraConfiguration:cameraConfig
+                                                                                                                selectionOverlayConfiguration: selectionOverlayConfig];
 
     SBSDKUICameraConfiguration* cameraConfiguration = extractCameraConfiguration(configuration);
     if (cameraConfiguration) {
@@ -200,9 +201,10 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
     }
 
     behaviorConfig.additionalDetectionParameters = extractAdditionalParameters(configuration);
-    behaviorConfig.acceptedDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);;
+    behaviorConfig.acceptedDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);
     behaviorConfig.acceptedBarcodeTypes = extractBarcodeTypesFromConfiguration(configuration);
     behaviorConfig.engineMode = extractEngineMode(configuration);
+    behaviorConfig.cameraZoomRange = extractCameraZoomRange(configuration);
     
     uiConfig.orientationLockMode = [ObjectMapper extractOrientationLockMode:configuration];
 

package/ios/Utils/BarcodeMapping.h

@@ -31,6 +31,7 @@ static inline SBSDKBarcodeType* barcodeTypeFromString(NSString* string) {
     if ([string isEqualToString:@"IATA_2_OF_5"]) return SBSDKBarcodeTypeIATA2Of5;
     if ([string isEqualToString:@"INDUSTRIAL_2_OF_5"]) return SBSDKBarcodeTypeIndustrial2Of5;
     if ([string isEqualToString:@"CODE_25"]) return SBSDKBarcodeTypeCode25;
+    if ([string isEqualToString:@"MICRO_QR_CODE"]) return SBSDKBarcodeTypeMicroQRCode;
     return nil;
 }
 
@@ -314,4 +315,15 @@ static inline SBSDKUIBarcodeSelectionOverlayConfiguration* extractSelectionOverl
     return overlayConfig;
 }
 
+static inline SBSDKZoomRange* extractCameraZoomRange(NSDictionary* configuration) {
+    SBSDKZoomRange* zoomRange = nil;
+    NSDictionary* zoomRangeDictionary = [configuration objectForKey:@"cameraZoomRange"];
+    if (zoomRangeDictionary != nil) {
+        CGFloat minZoom = [[zoomRangeDictionary objectForKey:@"minZoom"] doubleValue];
+        CGFloat maxZoom = [[zoomRangeDictionary objectForKey:@"maxZoom"] doubleValue];
+        zoomRange = [[SBSDKZoomRange alloc] initWithMinZoom:minZoom andMaxZoom:maxZoom];
+    }
+    return zoomRange;
+}
+
 #endif /* BarcodeMapping_h */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "3.7.0-alpha.1",
+  "version": "3.7.0-beta.2",
   "description": "Scanbot Barcode Scanner SDK React Native Plugin for Android and iOS",
   "main": "index.js",
   "files": [

package/src/configuration.ts

@@ -13,6 +13,7 @@ import {
   CameraModule,
   BarcodeFilter,
   CodeDensity,
+  CameraPreviewMode,
 } from "./enum";
 import { MSIPlesseyChecksumAlgorithm } from "./enum";
 
@@ -147,6 +148,10 @@ interface InternalBarcodeDetectionCommonParameters {
   * Whether the flash is toggled on or off.
   */
   flashEnabled?: boolean;
+  /** 
+   * Disables auto-focus and locks the lens at the specified focus lock lens position. Default value is false. iOS only. For Android, minFocusDistanceLock can be used. 
+  */
+  focusLockEnabled?: boolean;
   /**
    * iOS Only: Whether the flash button should be visible or not in the UI.
    */
@@ -204,6 +209,54 @@ interface InternalBarcodeDetectionCommonParameters {
    * Set `true` to enable showing the area of interest on camera preview. Enabled by default.
    */
   viewFinderEnabled?: boolean
+
+  /** 
+   * Title of the button that opens the screen where the user can allow the usage of the camera by the app. 
+   * */
+  enableCameraButtonTitle?: string;
+
+  /** 
+   * Text that will be displayed when the app is not allowed to use the camera, prompting the user to enable the usage of the camera. 
+   * */
+  enableCameraExplanationText?: string;
+
+  /**
+   *  The position of the lens. Values can be between 0.0f (minimum focusing distance) and 1.0f (maximum focusing distance). The value will be clamped to(0.0f, 1.0f). The default value is 0.0. iOS only. For Android, minFocusDistanceLock can be used.  iOS only. For Android, minFocusDistanceLock can be used. 
+   * */
+  focusLockPosition?: number;
+  /*
+  * Lock focus distance withing minimum possible range 
+  */
+  minFocusDistanceLock?: boolean;
+  /*
+  * Preview mode of the camera. FILL_IN or FIT_IN. Default is FILL_IN. Android only 
+  */
+  cameraPreviewMode?: CameraPreviewMode;
+  /*
+  * The range of valid camera zoom factors. 
+    For iOS it ranges between 1.0 to 12.0. Default value is (1.0; 12.0).
+    For Android it ranges between 0.0 to 1.0.
+  */
+  cameraZoomRange?: ZoomRange;
+  /*
+  * Sets auto close timer in seconds. 0 = disabled and it is the default value. Android only 
+  */
+  autoCancelTimeout?: number;
+
+  /** Scanning delay after scanner appearance in seconds. Defaults to 0 secs. */
+  initialScanDelay?: number;
+
+  /** Freezes a preview after a scan for a given amount of seconds. Defaults to 0 secs. Android only. */
+  delayAfterScan?: number;
+
+  /** When this property is set to true, the zoom can be activated by double tapping somewhere in the receivers view. iOS only. */
+  doubleTapToZoomEnabled?: boolean;
+
+  /** When this property is set to true, the zoom can be activated by a pinch gesture somewhere in the receivers view. iOS only. */
+  pinchToZoomEnabled?: boolean;
+
+  /** Defines, if zooming in or out should be animated. iOS only. */
+  shouldAnimateZooming?: boolean;
 }
 
 /**
@@ -259,3 +312,12 @@ export interface BarcodeAdditionalParameters {
    */
   codeDensity?: CodeDensity;
 }
+
+/** Defines a range for zooming */
+export interface ZoomRange {
+  /** The minimum zoom scale. Defaults to 1.0. */
+  minZoom: number;
+
+  /** The maximum zoom scale. Defaults to 3.0. */
+  maxZoom: number;
+}

package/src/enum.ts

@@ -61,7 +61,8 @@ export type BarcodeFormat =
     "IATA_2_OF_5" |
     "INDUSTRIAL_2_OF_5" |
     "MSI_PLESSEY" |
-    "CODE_25";
+    "CODE_25" |
+    "MICRO_QR_CODE";
 
 export type EngineMode = "LEGACY" | "NEXT_GEN";
 
@@ -72,8 +73,7 @@ export type MSIPlesseyChecksumAlgorithm =
     "Mod11NCR" |
     "Mod1010" |
     "Mod1110IBM" |
-    "Mod1110NCR"
-    ;
+    "Mod1110NCR";
 
 export type CameraModule = 'FRONT' | 'BACK';
 
@@ -87,3 +87,11 @@ export type CodeDensity = 'LOW' | 'HIGH';
 export type BarcodeOverlayFormat =  'NONE' |
                                     'CODE' |
                                     'CODE_AND_TYPE';
+
+/** Represents camera preview modes */
+export type CameraPreviewMode =
+/** In this mode camera preview frames will be downscaled to the layout view size - full preview frame content will be visible, but unused edges could be appeared in the preview layout. */
+| 'FIT_IN'
+/** In this mode camera preview frames fill the layout view - the preview frames may contain additional content on the edges that was not visible in the preview layout. */
+| 'FILL_IN';
+