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

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.1-beta.1",
+  "version": "3.7.1-beta.2",
   "scanbot": {
     "iosVersion": "4.0.0"
   },

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

@@ -3,7 +3,7 @@ import { EmitterSubscription, findNodeHandle, NativeMethods, Platform, UIManager
 import { Dimensions } from 'react-native';
 import { ScanbotBarcodeCameraNativeViewProperties, ScanbotBarcodeCameraViewConfiguration, ScanbotBarcodeCameraViewProperties } from './scanbot-barcode-camera-view-types';
 import ScanbotNativeBarcodeCameraView, { Commands } from './scanbot-native-barcode-camera-view';
-import { BarcodeResult } from 'react-native-scanbot-barcode-scanner-sdk/src/result';
+import { BarcodeResult } from '../../result';
 
 const Device = {
   isPortrait: () => {

package/ios/Components/BarcodeCameraView/OldArchitecture/RNScanbotBarcodeCameraView.m

@@ -1,290 +0,0 @@
-//
-//  RNScanbotCameraView.m
-//  RNScanbotSDK
-//
-//  Created by Marco Saia on 18.05.21.
-//
-
-// We use this compilation pragma to expose this implementation for the OLD ARCHITECTURE only
-#ifndef RCT_NEW_ARCH_ENABLED
-
-#import "RNScanbotBarcodeCameraView.h"
-#import "ObjectMapper.h"
-#import "BarcodeMapping.h"
-
-@import ScanbotBarcodeScannerSDK;
-@import Foundation;
-
-@implementation RNScanbotBarcodeCameraView {
-    SBSDKBarcodeScannerViewController* viewController;
-    RNScanbotCameraViewConfiguration* _cameraViewConfiguration;
-    CGFloat _userDefinedCameraZoomFactor;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    self.barcodes = [[NSMutableArray alloc] init];
-    self.shouldUseFinderView = false;
-    _cameraViewConfiguration = [[RNScanbotCameraViewConfiguration alloc] init];
-    _userDefinedCameraZoomFactor = -1;
-    return self;
-}
-
-- (void)layoutSubviews {
-    if (_cameraViewController) {
-        _cameraViewController.view.frame = [self bounds];
-        return;
-    }
-    
-    __weak typeof(self) weakSelf = self;
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [weakSelf createCameraViewController];
-    });
-}
-
-- (void)createCameraViewController {
-    UIViewController* parentViewController = [self getParentViewController];
-    if (!parentViewController) {
-        return;
-    }
-    
-    if (!_cameraViewController) {
-        viewController = [[SBSDKBarcodeScannerViewController alloc] initWithParentViewController:parentViewController
-                                                                                      parentView:self
-                                                                                        delegate:self];
-        _cameraViewController = viewController;
-    }
-    
-    [self updateWithConfiguration];
-}
-
-- (void)setConfiguration:(NSDictionary *)configuration {
-    _configuration = configuration;
-    if (configuration == NULL) {
-        return;
-    }
-    RNScanbotCameraViewConfiguration* cameraViewConfiguration = [[RNScanbotCameraViewConfiguration alloc] init];
-    
-    NSMutableDictionary* config = [configuration mutableCopy];
-    if ([config objectForKey:@"barcodeFormats"]) {
-        cameraViewConfiguration.barcodeFormats = extractBarcodeTypesFromConfiguration(config);
-        [config removeObjectForKey:@"barcodeFormats"];
-    }
-    
-    if ([config objectForKey:@"barcodeFilter"]) {
-        cameraViewConfiguration.barcodeFilter = extractBarcodeFilterFromConfiguration(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 = extractMsiPlesseyChecksumAlgorithmFromConfiguration(configuration);
-        cameraViewConfiguration.codeDensity = extractBarcodeDensityFromConfiguration(config);
-        cameraViewConfiguration.finderInset = [self populateFinderInset:config];
-        
-        self.shouldUseFinderView = [[config objectForKey:@"shouldUseFinderView"] boolValue];
-        
-    } @catch (NSException *exception) {
-        NSLog(@"%@", [exception reason]);
-        return;
-    }
-    
-    _cameraViewConfiguration = cameraViewConfiguration;
-    
-    if(viewController) {
-        [self updateWithConfiguration];
-    }
-}
-
-- (void)updateWithConfiguration {
-    
-    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;
-    }
-    if (_cameraViewConfiguration.acceptedDocumentFormats) {
-        viewController.acceptedDocumentTypes = _cameraViewConfiguration.acceptedDocumentFormats;
-    }
-    
-    // Map Additional Parameters
-    SBSDKBarcodeAdditionalParameters* additionalParameters = [[SBSDKBarcodeAdditionalParameters alloc] init];
-    
-    if (_cameraViewConfiguration.gs1DecodingEnabled) {
-        additionalParameters.enableGS1Decoding = [_cameraViewConfiguration.gs1DecodingEnabled boolValue];
-    }
-    if (_cameraViewConfiguration.maximumTextLength) {
-        additionalParameters.maximumTextLength = [_cameraViewConfiguration.maximumTextLength intValue];
-    }
-    if (_cameraViewConfiguration.minimumTextLength) {
-        additionalParameters.minimumTextLength = [_cameraViewConfiguration.minimumTextLength intValue];
-    }
-    if (_cameraViewConfiguration.msiPlesseyChecksumAlgorithm != -1) {
-        additionalParameters.msiPlesseyChecksumAlgorithm = _cameraViewConfiguration.msiPlesseyChecksumAlgorithm;
-    }
-    if (_cameraViewConfiguration.stripCheckDigits) {
-        additionalParameters.stripCheckDigits = [_cameraViewConfiguration.stripCheckDigits boolValue];
-    }
-    if (_cameraViewConfiguration.codeDensity) {
-        additionalParameters.codeDensity = _cameraViewConfiguration.codeDensity;
-    }
-    
-    viewController.additionalDetectionParameters = additionalParameters;
-    
-    if (_cameraViewConfiguration.cameraZoomFactor) {
-        CGFloat value = [_cameraViewConfiguration.cameraZoomFactor floatValue];
-        if (value != _userDefinedCameraZoomFactor || _userDefinedCameraZoomFactor == -1) {
-            viewController.cameraZoomFactor = value;
-            _userDefinedCameraZoomFactor = value;
-        }
-    }
-    if (_cameraViewConfiguration.engineMode != -1) {
-        viewController.engineMode = _cameraViewConfiguration.engineMode;
-    }
-    if (_cameraViewConfiguration.flashEnabled) {
-        viewController.flashLightEnabled = [_cameraViewConfiguration.flashEnabled boolValue];
-    }
-}
-
-
-- (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) {
-        parentResponder = parentResponder.nextResponder;
-        if (parentResponder && [parentResponder isKindOfClass:[UIViewController class]]) {
-            return (UIViewController*) parentResponder;
-        }
-    }
-    return NULL;
-}
-
-- (void)sendScanResults:(NSArray<SBSDKBarcodeScannerResult*>*) results onImage:(UIImage*)image {
-    if(!self.onNativeBarcodeScannerResult) {
-        return;
-    }
-    
-    if(!results || results.count == 0) {
-        return;
-    }
-    
-    if (_cameraViewConfiguration.barcodeFilter != nil) {
-        results = filterBarcodeResults(results, _cameraViewConfiguration.barcodeFilter);
-    }
-    
-    NSDictionary* outResult = @{
-        @"result": @{
-            @"status": @"OK",
-            @"barcodes": jsonFromBarcodeResults(results)
-        }
-    };
-    
-    self.onNativeBarcodeScannerResult(outResult);
-}
-
-// MARK: - React Native Lifecycle
-- (void)componentDidMount {}
-- (void)componentDidUpdate {}
-- (void)componentWillUnmount {}
-- (void)orientationChanged {}
-
-// MARK: - SBSDKBarcodeScannerViewControllerDelegate
-
-- (void)barcodeScannerController:(SBSDKBarcodeScannerViewController *)controller
-               didDetectBarcodes:(NSArray<SBSDKBarcodeScannerResult *> *)codes
-                         onImage:(nonnull UIImage *)image {
-    
-    [self sendScanResults:codes onImage:image];
-}
-
-- (BOOL)barcodeScannerControllerShouldDetectBarcodes:(SBSDKBarcodeScannerViewController *)controller {
-    return true;
-}
-
-- (void)barcodeScannerController:(nonnull SBSDKBarcodeScannerViewController *)controller didDetectBarcodes:(nonnull NSArray<SBSDKBarcodeScannerResult *> *)codes {
-    [self sendScanResults:codes onImage:nil];
-}
-
-
-- (NSArray*)hashedBarcodes {
-    NSMutableArray* outArray = [[NSMutableArray alloc] init];
-    for (NSDictionary* barcode in self.barcodes) {
-        NSString* hash = [RNScanbotBarcodeCameraView hashFromBarcode:barcode];
-        [outArray addObject:hash];
-    }
-    return outArray;
-}
-
-+ (NSString*)hashFromBarcode: (NSDictionary* _Nonnull)barcode {
-    NSString* text = [barcode objectForKey:@"barcode"];
-    NSString* type = [barcode objectForKey:@"type"];
-    return [[NSString stringWithFormat:@"%@_%@", text, type] lowercaseString];
-}
-
-@end
-
-@implementation RNScanbotCameraViewConfiguration
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        self.shouldUseFinderView = false;
-        self.finderLineWidth = 1.0;
-        self.finderLineColor = UIColor.whiteColor;
-        self.finderAspectRatio = [[SBSDKAspectRatio alloc] initWithWidth:1 andHeight:1];
-        self.finderBackgroundColor = UIColor.blackColor;
-        self.finderBackgroundOpacity = 0.6;
-        self.acceptedDocumentFormats = nil;
-        self.gs1DecodingEnabled = nil;
-        self.maximumTextLength = nil;
-        self.minimumTextLength = nil;
-        self.msiPlesseyChecksumAlgorithm = -1;
-        self.cameraZoomFactor = nil;
-        self.engineMode = -1;
-        self.flashEnabled = nil;
-        self.finderInset = UIEdgeInsetsMake(32, 32, 32, 32);
-    }
-    return self;
-}
-
-@end
-
-#endif // ifndef RCT_NEW_ARCH_ENABLED
-

package/ios/Components/BarcodeCameraView/OldArchitecture/RNScanbotBarcodeCameraViewManager.m

@@ -1,76 +0,0 @@
-//
-//  RNScanbotBarcodeCameraViewManager.m
-//  RNScanbotSDK
-//
-//  Created by Marco Saia on 17.05.21.
-//
-
-// We use this compilation pragma to expose this implementation for the OLD ARCHITECTURE only
-#ifndef RCT_NEW_ARCH_ENABLED
-
-#import <Foundation/Foundation.h>
-#import "RNScanbotBarcodeCameraViewManager.h"
-#import "RNScanbotBarcodeCameraView.h"
-#import <React/RCTViewManager.h>
-#import <React/RCTUIManager.h>
-
-@import UIKit;
-@import ScanbotBarcodeScannerSDK;
-
-@implementation RNScanbotBarcodeCameraViewManager
-
-RCT_EXPORT_MODULE(RTNScanbotBarcodeCameraView)
-
-RCT_EXPORT_VIEW_PROPERTY(onNativeBarcodeScannerResult, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(requestComponentReload, RCTBubblingEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(shouldUseFinderView, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(configuration, NSDictionary*)
-
-- (UIView *) view
-{
-    return [[RNScanbotBarcodeCameraView alloc] init];
-}
-
-// componentDidMount
-RCT_EXPORT_METHOD(componentDidMount:(nonnull NSNumber*) reactTag) {
-    [self callNativeMethodWithReactTag: reactTag andBlock: ^void (RNScanbotBarcodeCameraView* nativeView) {
-        [nativeView componentDidMount];
-    }];
-}
-
-// componentDidUpdate
-RCT_EXPORT_METHOD(componentDidUpdate:(nonnull NSNumber*) reactTag) {
-    [self callNativeMethodWithReactTag: reactTag andBlock: ^void (RNScanbotBarcodeCameraView* nativeView) {
-        [nativeView componentDidUpdate];
-    }];
-}
-
-// componentWillUnmount
-RCT_EXPORT_METHOD(componentWillUnmount:(nonnull NSNumber*) reactTag) {
-    [self callNativeMethodWithReactTag: reactTag andBlock: ^void (RNScanbotBarcodeCameraView* nativeView) {
-        [nativeView componentWillUnmount];
-    }];
-}
-
-// orientationChanged
-RCT_EXPORT_METHOD(orientationChanged:(nonnull NSNumber*) reactTag) {
-    [self callNativeMethodWithReactTag: reactTag andBlock: ^void (RNScanbotBarcodeCameraView* nativeView) {
-        [nativeView orientationChanged];
-    }];
-}
-
-
-- (void) callNativeMethodWithReactTag:(nonnull NSNumber*) reactTag andBlock:(NativeViewBlock)block {
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
-        RNScanbotBarcodeCameraView* view = (RNScanbotBarcodeCameraView*) viewRegistry[reactTag];
-        if (!view || ![view isKindOfClass:[RNScanbotBarcodeCameraView class]]) {
-            RCTLogError(@"Cannot find native view with tag #%@", reactTag);
-            return;
-        }
-        block(view);
-    }];
-}
-
-@end
-
-#endif // ifndef RCT_NEW_ARCH_ENABLED