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

package/ios/Components/BarcodeCameraView/{RNScanbotBarcodeCameraView.h → OldArchitecture/RNScanbotBarcodeCameraView.h}

@@ -1,21 +1,25 @@
 //
-//  RNScanbotCameraView.h
+//  RNScanbotBarcodeCameraView.h
 //  RNScanbotSDK
 //
 //  Created by Marco Saia on 18.05.21.
 //
 
+// We use this compilation pragma to expose this implementation for the OLD ARCHITECTURE only
+#ifdef RCT_NEW_ARCH_ENABLED
+#else
+
 #ifndef RNScanbotCameraView_h
 #define RNScanbotCameraView_h
 
 #import <React/RCTComponent.h>
-@import ScanbotBarcodeScannerSDK;
+#import <ScanbotBarcodeScannerSDK/ScanbotBarcodeScannerSDK.h>
 
 @interface RNScanbotBarcodeCameraView: UIView<SBSDKBarcodeScannerViewControllerDelegate>
 
 @property SBSDKBarcodeScannerViewController* _Nullable cameraViewController;
 @property NSMutableArray* _Nonnull barcodes;
-@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onBarcodeScannerResult;
+@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onNativeBarcodeScannerResult;
 @property (nonatomic, copy) RCTBubblingEventBlock _Nullable requestComponentReload;
 @property (nonatomic) BOOL shouldUseFinderView;
 @property (nonatomic, copy) NSDictionary* _Nullable configuration;
@@ -55,7 +59,8 @@
 @property (nonatomic) SBSDKUIBarcodeFilter* _Nullable barcodeFilter;
 @property (nonatomic) SBSDKBarcodeDensity codeDensity;
 @property (nonatomic) UIEdgeInsets finderInset;
-@property (nonatomic) SBSDKZoomRange* _Nullable zoomRange;
 @end
 
 #endif /* RNScanbotCameraView_h */
+
+#endif // ifdef RCT_NEW_ARCH_ENABLED

package/ios/Components/BarcodeCameraView/{RNScanbotBarcodeCameraView.m → OldArchitecture/RNScanbotBarcodeCameraView.mm}

@@ -5,12 +5,15 @@
 //  Created by Marco Saia on 18.05.21.
 //
 
+// We use this compilation pragma to expose this implementation for the OLD ARCHITECTURE only
+#ifdef RCT_NEW_ARCH_ENABLED
+#else
+
 #import "RNScanbotBarcodeCameraView.h"
 #import "ObjectMapper.h"
 #import "BarcodeMapping.h"
-
-@import ScanbotBarcodeScannerSDK;
-@import Foundation;
+#import <ScanbotBarcodeScannerSDK/ScanbotBarcodeScannerSDK.h>
+#import <Foundation/Foundation.h>
 
 @implementation RNScanbotBarcodeCameraView {
     SBSDKBarcodeScannerViewController* viewController;
@@ -33,7 +36,7 @@
         return;
     }
     
-    __weak typeof(self) weakSelf = self;
+    __weak RNScanbotBarcodeCameraView* weakSelf = self;
     
     dispatch_async(dispatch_get_main_queue(), ^{
         [weakSelf createCameraViewController];
@@ -45,21 +48,15 @@
     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 {
@@ -76,7 +73,7 @@
     }
     
     if ([config objectForKey:@"barcodeFilter"]) {
-        cameraViewConfiguration.barcodeFilter = extractBarcodeFilter(config);
+        cameraViewConfiguration.barcodeFilter = extractBarcodeFilterFromConfiguration(config);
         [config removeObjectForKey:@"barcodeFilter"];
     }
     
@@ -88,11 +85,11 @@
         }
         
         // 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.msiPlesseyChecksumAlgorithm = extractMsiPlesseyChecksumAlgorithmFromConfiguration(configuration);
+        cameraViewConfiguration.codeDensity = extractBarcodeDensityFromConfiguration(config);
         cameraViewConfiguration.finderInset = [self populateFinderInset:config];
+        
         self.shouldUseFinderView = [[config objectForKey:@"shouldUseFinderView"] boolValue];
-        cameraViewConfiguration.zoomRange = extractCameraZoomRange(config);
         
     } @catch (NSException *exception) {
         NSLog(@"%@", [exception reason]);
@@ -102,11 +99,11 @@
     _cameraViewConfiguration = cameraViewConfiguration;
     
     if(viewController) {
-        [self applyConfiguration];
+        [self updateWithConfiguration];
     }
 }
 
-- (void)applyConfiguration {
+- (void)updateWithConfiguration {
     
     SBSDKBaseScannerViewFinderConfiguration *configuration =  [[SBSDKBaseScannerViewFinderConfiguration alloc] init];
     configuration.lineWidth = _cameraViewConfiguration.finderLineWidth;
@@ -166,18 +163,8 @@
     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;
@@ -209,7 +196,7 @@
 }
 
 - (void)sendScanResults:(NSArray<SBSDKBarcodeScannerResult*>*) results onImage:(UIImage*)image {
-    if(!self.onBarcodeScannerResult) {
+    if(!self.onNativeBarcodeScannerResult) {
         return;
     }
     
@@ -228,7 +215,7 @@
         }
     };
     
-    self.onBarcodeScannerResult(outResult);
+    self.onNativeBarcodeScannerResult(outResult);
 }
 
 // MARK: - React Native Lifecycle
@@ -278,7 +265,7 @@
 {
     self = [super init];
     if (self) {
-        self.shouldUseFinderView = false;
+        self.shouldUseFinderView = [NSNumber numberWithBool:false];
         self.finderLineWidth = 1.0;
         self.finderLineColor = UIColor.whiteColor;
         self.finderAspectRatio = [[SBSDKAspectRatio alloc] initWithWidth:1 andHeight:1];
@@ -288,9 +275,9 @@
         self.gs1DecodingEnabled = nil;
         self.maximumTextLength = nil;
         self.minimumTextLength = nil;
-        self.msiPlesseyChecksumAlgorithm = -1;
+        self.msiPlesseyChecksumAlgorithm = SBSDKBarcodeMSIPlesseyChecksumAlgorithmNone;
         self.cameraZoomFactor = nil;
-        self.engineMode = -1;
+        self.engineMode = SBSDKBarcodeEngineModeNextGen;
         self.flashEnabled = nil;
         self.finderInset = UIEdgeInsetsMake(32, 32, 32, 32);
     }
@@ -298,3 +285,6 @@
 }
 
 @end
+
+#endif // ifdef RCT_NEW_ARCH_ENABLED
+

package/ios/Components/BarcodeCameraView/{RNScanbotBarcodeCameraViewManager.h → OldArchitecture/RNScanbotBarcodeCameraViewManager.h}

@@ -1,10 +1,14 @@
 //
-//  RNScanbotClassicComponents.h
+//  RNScanbotBarcodeCameraViewManager.h
 //  Pods
 //
 //  Created by Marco Saia on 17.05.21.
 //
 
+// We use this compilation pragma to expose this implementation for the OLD ARCHITECTURE only
+#if defined(RCT_NEW_ARCH_ENABLED) && RCT_NEW_ARCH_ENABLED==1
+#else
+
 #ifndef RNScanbotClassicComponents_h
 #define RNScanbotClassicComponents_h
 
@@ -20,3 +24,5 @@ typedef void (^NativeViewBlock)(RNScanbotBarcodeCameraView* _Nonnull);
 @end
 
 #endif /* RNScanbotClassicComponents_h */
+
+#endif // ifdef RCT_NEW_ARCH_ENABLED

package/ios/Components/BarcodeCameraView/{RNScanbotBarcodeCameraViewManager.m → OldArchitecture/RNScanbotBarcodeCameraViewManager.mm}

@@ -1,24 +1,32 @@
 //
-//  RNScanbotClassicComponents.m
+//  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
+#if defined(RCT_NEW_ARCH_ENABLED) && RCT_NEW_ARCH_ENABLED==1
+#else
+
 #import <Foundation/Foundation.h>
 #import "RNScanbotBarcodeCameraViewManager.h"
 #import "RNScanbotBarcodeCameraView.h"
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
 
-@import UIKit;
-@import ScanbotBarcodeScannerSDK;
+#import <React/RCTDefines.h>
+#import <React/RCTJSThread.h>
+#import <React/RCTBundleManager.h>
 
-@implementation RNScanbotBarcodeCameraViewManager
+#import <UIKit/UIKit.h>
+#import <ScanbotBarcodeScannerSDK/ScanbotBarcodeScannerSDK.h>
 
-RCT_EXPORT_MODULE(ScanbotBarcodeCameraView)
+RCT_EXTERN void RCTRegisterModule(Class);
 
-RCT_EXPORT_VIEW_PROPERTY(onBarcodeScannerResult, RCTBubblingEventBlock)
+@implementation RNScanbotBarcodeCameraViewManager
+
+RCT_EXPORT_VIEW_PROPERTY(onNativeBarcodeScannerResult, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(requestComponentReload, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(shouldUseFinderView, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(configuration, NSDictionary*)
@@ -28,6 +36,15 @@ RCT_EXPORT_VIEW_PROPERTY(configuration, NSDictionary*)
     return [[RNScanbotBarcodeCameraView alloc] init];
 }
 
++ (NSString *)moduleName {
+    return @"RTNScanbotBarcodeCameraView";
+}
+
++ (void)load {
+    RCTRegisterModule(self);
+}
+
+
 // componentDidMount
 RCT_EXPORT_METHOD(componentDidMount:(nonnull NSNumber*) reactTag) {
     [self callNativeMethodWithReactTag: reactTag andBlock: ^void (RNScanbotBarcodeCameraView* nativeView) {
@@ -69,3 +86,5 @@ RCT_EXPORT_METHOD(orientationChanged:(nonnull NSNumber*) reactTag) {
 }
 
 @end
+
+#endif // ifdef RCT_NEW_ARCH_ENABLED

package/ios/ScanbotBarcodeSDKConfiguration.h

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #import <Foundation/Foundation.h>

package/ios/ScanbotBarcodeSDKConfiguration.m

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #import "ScanbotBarcodeSDKConfiguration.h"

package/ios/ScanbotBarcodeSdk.h

@@ -1,11 +1,11 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #import <React/RCTBridgeModule.h>
-@import ScanbotBarcodeScannerSDK;
+#import <ScanbotBarcodeScannerSDK/ScanbotBarcodeScannerSDK.h>
 
 @interface ScanbotBarcodeSdk : NSObject <RCTBridgeModule>
 

package/ios/ScanbotBarcodeSdk.m

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #import "ScanbotBarcodeSdk.h"
@@ -66,16 +66,16 @@ RCT_EXPORT_METHOD(initializeSdk:(NSDictionary *)configuration
     config.licenseKey = [ObjectMapper normalizeJsonString:config.licenseKey];
     config.storageBaseDirectory = [ObjectMapper normalizeJsonFileURLAsString:config.storageBaseDirectory];
     [SharedConfiguration defaultConfiguration].loggingEnabled = config.loggingEnabled;
-    [ScanbotSDK setLoggingEnabled:config.loggingEnabled];
+    [Scanbot setLoggingEnabled:config.loggingEnabled];
 
     BOOL hasLicense = NO;
 
     NSString *callbackMessage = @"Scanbot SDK initialized. Trial mode activated. You can now test all features for 60 seconds.";
     NSString *errorMessage = nil;
     if (config.licenseKey) {
-        hasLicense = [ScanbotSDK setLicense: config.licenseKey];
+        hasLicense = [Scanbot setLicense: config.licenseKey];
         if (!hasLicense) {
-            errorMessage = [ScanbotBarcodeSdk descriptionFromLicenseStatus:ScanbotSDK.licenseStatus];
+            errorMessage = [ScanbotBarcodeSdk descriptionFromLicenseStatus:Scanbot.licenseStatus];
         } else {
             callbackMessage = @"Scanbot SDK initialized.";
         }
@@ -89,7 +89,7 @@ RCT_EXPORT_METHOD(initializeSdk:(NSDictionary *)configuration
         [SBSDKUIBarcodeImageStorage setDefaultStorage:barcodeImageStorageLocation];
     }
 
-    [ScanbotSDK setSharedApplication:[UIApplication sharedApplication]];
+    [Scanbot setSharedApplication:[UIApplication sharedApplication]];
     [SharedConfiguration defaultConfiguration].configuration = config;
 
     [SharedConfiguration defaultConfiguration].isSDKInitialized = YES;
@@ -109,9 +109,9 @@ RCT_EXPORT_METHOD(getLicenseInfo:(RCTPromiseResolveBlock)resolve
     }
 
     resolve(@{
-        @"isLicenseValid": @(ScanbotSDK.isLicenseValid),
-        @"licenseStatus": [ScanbotBarcodeSdk stringFromLicenseStatus:ScanbotSDK.licenseStatus],
-        @"licenseStatusMessage": [ScanbotBarcodeSdk descriptionFromLicenseStatus:ScanbotSDK.licenseStatus]
+        @"isLicenseValid": @(Scanbot.isLicenseValid),
+        @"licenseStatus": [ScanbotBarcodeSdk stringFromLicenseStatus:Scanbot.licenseStatus],
+        @"licenseStatusMessage": [ScanbotBarcodeSdk descriptionFromLicenseStatus:Scanbot.licenseStatus]
     });
 }
 
@@ -123,7 +123,7 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     SBSDKUIBarcodeScannerBehaviorConfiguration* behaviorConfig = [[SBSDKUIBarcodeScannerBehaviorConfiguration alloc] init];
     SBSDKUIBarcodeScannerTextConfiguration* textConfig = [[SBSDKUIBarcodeScannerTextConfiguration alloc] init];
     SBSDKUICameraConfiguration* cameraConfig = [[SBSDKUICameraConfiguration alloc] init];
-    SBSDKUIBarcodeSelectionOverlayConfiguration* selectionOverlayConfig = nil;
+    SBSDKUIBarcodeTrackingOverlayConfiguration* selectionOverlayConfig = nil;
     @try {
         [ObjectMapper populateInstance:uiConfig fromDictionary:configuration];
         [ObjectMapper populateInstance:behaviorConfig fromDictionary:configuration];
@@ -136,7 +136,7 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     }
     
     // Barcode Filter (at the moment used for UPC Extension filters)
-    SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilter(configuration);
+    SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilterFromConfiguration(configuration);
     if (barcodeFilter != nil) {
         behaviorConfig.barcodeFilter = barcodeFilter;
     }
@@ -144,7 +144,7 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     behaviorConfig.additionalParameters = extractAdditionalParameters(configuration);
     behaviorConfig.acceptedDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);
     behaviorConfig.acceptedBarcodeTypes = extractBarcodeTypesFromConfiguration(configuration);
-    behaviorConfig.engineMode = extractEngineMode(configuration);
+    behaviorConfig.engineMode = extractEngineModeFromConfiguration(configuration);
     
     SBSDKZoomRange* cameraZoomRange = extractCameraZoomRange(configuration);
     if (cameraZoomRange) {
@@ -153,11 +153,12 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     
     uiConfig.orientationLockMode = [ObjectMapper extractOrientationLockMode:configuration];
     
-    SBSDKUIBarcodeScannerConfiguration* barcodeScannerConfiguration = [[SBSDKUIBarcodeScannerConfiguration alloc] initWithUIConfiguration:uiConfig
-                                                                                                                textConfiguration:textConfig
-                                                                                                                behaviorConfiguration:behaviorConfig
-                                                                                                                cameraConfiguration:cameraConfig
-                                                                                                                selectionOverlayConfiguration: selectionOverlayConfig];
+    SBSDKUIBarcodeScannerConfiguration* barcodeScannerConfiguration =
+        [[SBSDKUIBarcodeScannerConfiguration alloc] initWithUIConfiguration:uiConfig
+                                                          textConfiguration:textConfig
+                                                      behaviorConfiguration:behaviorConfig
+                                                        cameraConfiguration:cameraConfig
+                                               trackingOverlayConfiguration:selectionOverlayConfig];
 
     SBSDKUICameraConfiguration* cameraConfiguration = extractCameraConfiguration(configuration);
     if (cameraConfiguration) {
@@ -166,7 +167,7 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
 
     bool shouldWaitForGeneratedImage = behaviorConfig.barcodeImageGenerationType != SBSDKBarcodeImageGenerationTypeNone;
     BarcodeScannerPromiseProxy* delegate = [[BarcodeScannerPromiseProxy alloc] initWithResolver: resolve
-                                                                    shouldIncludeBarcodeImage: shouldWaitForGeneratedImage];
+                                                                      shouldIncludeBarcodeImage: shouldWaitForGeneratedImage];
     
     SBSDKUIBarcodeScannerViewController* viewController = [SBSDKUIBarcodeScannerViewController createNewWithConfiguration:barcodeScannerConfiguration andDelegate:delegate];
     [self presentActiveViewController:viewController];
@@ -186,7 +187,7 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
     SBSDKUIBarcodesBatchScannerTextConfiguration *textConfig = [[SBSDKUIBarcodesBatchScannerTextConfiguration alloc] init];
     SBSDKUIBarcodesBatchScannerBehaviorConfiguration *behaviorConfig = [[SBSDKUIBarcodesBatchScannerBehaviorConfiguration alloc] init];
     SBSDKUICameraConfiguration* cameraConfig = [[SBSDKUICameraConfiguration alloc] init];
-    SBSDKUIBarcodeSelectionOverlayConfiguration* selectionOverlayConfig = nil;
+    SBSDKUIBarcodeTrackingOverlayConfiguration* selectionOverlayConfig = nil;
     @try {
         [ObjectMapper populateInstance:uiConfig fromDictionary:configuration];
         [ObjectMapper populateInstance:behaviorConfig fromDictionary:configuration];
@@ -199,7 +200,7 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
     }
         
     // Barcode Filter (at the moment used for UPC Extension filters)
-    SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilter(configuration);
+    SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilterFromConfiguration(configuration);
     if (barcodeFilter != nil) {
         behaviorConfig.barcodeFilter = barcodeFilter;
     }
@@ -207,7 +208,7 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
     behaviorConfig.additionalDetectionParameters = extractAdditionalParameters(configuration);
     behaviorConfig.acceptedDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);
     behaviorConfig.acceptedBarcodeTypes = extractBarcodeTypesFromConfiguration(configuration);
-    behaviorConfig.engineMode = extractEngineMode(configuration);
+    behaviorConfig.engineMode = extractEngineModeFromConfiguration(configuration);
     
     SBSDKZoomRange* cameraZoomRange = extractCameraZoomRange(configuration);
     if (cameraZoomRange) {
@@ -221,7 +222,7 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
                                                         textConfiguration:textConfig
                                                         behaviorConfiguration:behaviorConfig
                                                         cameraConfiguration:cameraConfig
-                                                        selectionOverlayConfiguration:selectionOverlayConfig];
+                                                        trackingOverlayConfiguration:selectionOverlayConfig];
     
     SBSDKUICameraConfiguration* cameraConfiguration = extractCameraConfiguration(configuration);
     if (cameraConfiguration) {
@@ -263,7 +264,7 @@ RCT_EXPORT_METHOD(detectBarcodesOnImage:(NSDictionary *)configuration
         NSArray* barcodeDocumentTypes = extractBarcodeDocumentTypesFromConfiguration(configuration);
         [barcodeScanner setAcceptedDocumentTypes: barcodeDocumentTypes];
         
-        SBSDKBarcodeEngineMode engineMode = extractEngineMode(configuration);
+        SBSDKBarcodeEngineMode engineMode = extractEngineModeFromConfiguration(configuration);
         [barcodeScanner setEngineMode:engineMode];
         
         SBSDKBarcodeAdditionalParameters* additionalParameters = extractAdditionalParameters(configuration);
@@ -277,7 +278,7 @@ RCT_EXPORT_METHOD(detectBarcodesOnImage:(NSDictionary *)configuration
         NSArray<SBSDKBarcodeScannerResult *> *barcodeResults = [barcodeScanner detectBarCodesOnImage:image];
         
         if (barcodeResults) {
-            SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilter(configuration);
+            SBSDKUIBarcodeFilter* barcodeFilter = extractBarcodeFilterFromConfiguration(configuration);
             if (barcodeFilter != nil) {
                 barcodeResults = filterBarcodeResults(barcodeResults, barcodeFilter);
             }

package/ios/SharedConfiguration.h

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #import <Foundation/Foundation.h>

package/ios/SharedConfiguration.m

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #import "SharedConfiguration.h"

package/ios/Utils/BarcodeMapping.h

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 #ifndef BarcodeMapping_h
@@ -9,7 +9,7 @@
 #import "UIColor+JSON.h"
 #include "ScanbotStorageUtils.h"
 #include "ReactBarcodeExtensionsFilter.h"
-@import ScanbotBarcodeScannerSDK;
+#import <ScanbotBarcodeScannerSDK/ScanbotBarcodeScannerSDK.h>
 
 static inline SBSDKBarcodeType* barcodeTypeFromString(NSString* string) {
     if ([string isEqualToString:@"AZTEC"]) return SBSDKBarcodeTypeAztec;
@@ -102,9 +102,7 @@ static inline NSArray<NSDictionary<NSString*, NSObject*>*>* jsonFromMappedBarcod
     return [jsonResults copy];
 }
 
-static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractPlesseyChecksumAlgorithmFromConfiguration(NSDictionary* configuration) {
-    NSString* algorithm = [configuration objectForKey:@"msiPlesseyChecksumAlgorithm"];
-    
+static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractMsiPlesseyChecksumAlgorithm(NSString* algorithm) {
     if (algorithm != nil) {
         if ([algorithm isEqualToString:@"None"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmNone;
         if ([algorithm isEqualToString:@"Mod10"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod10;
@@ -114,27 +112,35 @@ static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractPlesseyChecksumAlgo
         if ([algorithm isEqualToString:@"Mod1110IBM"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1110IBM;
         if ([algorithm isEqualToString:@"Mod1110NCR"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1110NCR;
     }
-    
+
     return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod10;
 }
 
-static inline SBSDKUIBarcodeFilter* extractBarcodeFilter(NSDictionary* configuration) {
-    NSString* jsonFilterType = [configuration objectForKey:@"barcodeFilter"];
-    if (jsonFilterType == nil) {
-        return nil;
-    }
-    
-    if ([jsonFilterType isEqualToString:@"WithExtension"]) {
+static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractMsiPlesseyChecksumAlgorithmFromConfiguration(NSDictionary* configuration) {
+    return extractMsiPlesseyChecksumAlgorithm((NSString*)[configuration objectForKey:@"msiPlesseyChecksumAlgorithm"]);
+}
+
+static inline SBSDKUIBarcodeFilter* extractBarcodeFilter(NSString* barcodeFilter) {
+    if ([barcodeFilter isEqualToString:@"WithExtension"]) {
         return [[ReactBarcodeExtensionsFilter alloc] init:ReactBarcodeExtensionsFilterWithExtension];
-    } else if ([jsonFilterType isEqualToString:@"WithEAN2Extension"]) {
+    } else if ([barcodeFilter isEqualToString:@"WithEAN2Extension"]) {
         return [[ReactBarcodeExtensionsFilter alloc] init:ReactBarcodeExtensionsFilterWithEAN2Extension];
-    } else if ([jsonFilterType isEqualToString:@"WithEAN5Extension"]) {
+    } else if ([barcodeFilter isEqualToString:@"WithEAN5Extension"]) {
         return [[ReactBarcodeExtensionsFilter alloc] init:ReactBarcodeExtensionsFilterWithEAN5Extension];
     }
     
     return nil;
 }
 
+static inline SBSDKUIBarcodeFilter* extractBarcodeFilterFromConfiguration(NSDictionary* configuration) {
+    NSString* jsonFilterType = [configuration objectForKey:@"barcodeFilter"];
+    if (jsonFilterType == nil) {
+        return nil;
+    }
+    
+    return extractBarcodeFilter(jsonFilterType);
+}
+
 static inline NSArray* filterBarcodeResults(NSArray<SBSDKBarcodeScannerResult *>* barcodeResults, SBSDKUIBarcodeFilter* filter) {
     NSMutableArray<SBSDKBarcodeScannerResult *>* outResults = [[NSMutableArray alloc] init];
     
@@ -182,29 +188,30 @@ static inline NSArray* extractBarcodeDocumentTypesFromConfiguration(NSDictionary
     return nil;
 }
 
-static inline SBSDKBarcodeDensity extractBarcodeDensity(NSDictionary* configuration) {
-    SBSDKBarcodeDensity barcodeDensity = SBSDKBarcodeDensityLow;
-    
-    NSString* codeDensity = [configuration objectForKey:@"codeDensity"];
-    if (codeDensity != nil) {
-        if([codeDensity isEqualToString:@"HIGH"]) {
-            barcodeDensity = SBSDKBarcodeDensityHigh;
-        }
+static inline SBSDKBarcodeDensity extractBarcodeDensity(NSString* value) {
+    if (value != nil && [value isEqualToString:@"HIGH"]) {
+        return SBSDKBarcodeDensityHigh;
     }
-    
-    return barcodeDensity;
+
+    return SBSDKBarcodeDensityLow;
 }
 
-static inline SBSDKBarcodeEngineMode extractEngineMode(NSDictionary* configuration) {
-    NSString* mode = [configuration objectForKey:@"engineMode"];
-    
-    if (mode && [@"LEGACY" isEqualToString:mode]) {
+static inline SBSDKBarcodeDensity extractBarcodeDensityFromConfiguration(NSDictionary* configuration) {
+    return extractBarcodeDensity((NSString*)[configuration objectForKey:@"codeDensity"]);
+}
+
+static inline SBSDKBarcodeEngineMode extractEngineMode(NSString* value) {
+    if (value && [@"LEGACY" isEqualToString:value]) {
         return SBSDKBarcodeEngineModeLegacy;
     }
     
     return SBSDKBarcodeEngineModeNextGen;
 }
 
+static inline SBSDKBarcodeEngineMode extractEngineModeFromConfiguration(NSDictionary* configuration) {
+    return extractEngineMode((NSString*)[configuration objectForKey:@"engineMode"]);
+}
+
 static inline SBSDKBarcodeAdditionalParameters* extractAdditionalParameters(NSDictionary* configuration) {
     SBSDKBarcodeAdditionalParameters* additionalParameters = [[SBSDKBarcodeAdditionalParameters alloc] init];
     @try {
@@ -222,9 +229,9 @@ static inline SBSDKBarcodeAdditionalParameters* extractAdditionalParameters(NSDi
     }
     
     // We also need to manually extract the MSI-Plessey Checksum Algorithm since it can't be mapped automatically
-    additionalParameters.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
+    additionalParameters.msiPlesseyChecksumAlgorithm = extractMsiPlesseyChecksumAlgorithmFromConfiguration(configuration);
     
-    additionalParameters.codeDensity = extractBarcodeDensity(configuration);
+    additionalParameters.codeDensity = extractBarcodeDensityFromConfiguration(configuration);
     
     return additionalParameters;
 }
@@ -266,8 +273,8 @@ static inline SBSDKBarcodeOverlayFormat extractTextOverlayFormat(NSDictionary* c
 /**
  Extracts the selection overlay configuration values from the JSON dictionary.
  */
-static inline SBSDKUIBarcodeSelectionOverlayConfiguration* extractSelectionOverlayConfig(NSDictionary *dictionary) {
-    SBSDKUIBarcodeSelectionOverlayConfiguration *overlayConfig = [[SBSDKUIBarcodeSelectionOverlayConfiguration alloc] init];
+static inline SBSDKUIBarcodeTrackingOverlayConfiguration* extractSelectionOverlayConfig(NSDictionary *dictionary) {
+    SBSDKUIBarcodeTrackingOverlayConfiguration *overlayConfig = [[SBSDKUIBarcodeTrackingOverlayConfiguration alloc] init];
     NSDictionary *selectionOverlayDictionary = [dictionary objectForKey:@"overlayConfiguration"];
     if (selectionOverlayDictionary != nil) {
         NSNumber *overlayEnabled = [selectionOverlayDictionary objectForKey:@"overlayEnabled"];

package/ios/Utils/HashUtils.h

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 

package/ios/Utils/JSONMappings.h

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //
 

package/ios/Utils/LoggingUtils.h

@@ -1,7 +1,7 @@
 //
 //  Scanbot Barcode Scanner SDK React Native Plugin
 //
-//  Copyright (c) 2020 doo GmbH. All rights reserved.
+//  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
 //  https://scanbot.io/sdk
 //