react-native-scanbot-barcode-scanner-sdk 3.3.0-alpha1 → 3.3.0-beta2

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

@@ -57,6 +57,7 @@ import io.scanbot.sdk.ui.view.barcode.batch.configuration.BatchBarcodeScannerCon
 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;
 
@@ -265,7 +266,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         }
     }
 
-    private void setCustomBarcodeScannerConfiguration(final ReadableMap options, io.scanbot.sdk.ui.view.barcode.configuration.CommonBarcodeScannerConfiguration configuration) {
+    private void setCustomBarcodeScannerConfiguration(final ReadableMap options, CommonBarcodeScannerConfiguration configuration) {
         CameraOrientationMode orientationMode = JSONUtils.extractCameraOrientationMode(options);
         if (orientationMode != null) {
             configuration.setOrientationLockMode(orientationMode);

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

@@ -131,7 +131,6 @@ public class RNScanbotBarcodeCameraComponent extends RNScanbotNativeComponent im
             final FinderOverlayView finderOverlayView = barcodeCameraUi.getFinderOverlayView();
             final ScanbotCameraXView cameraView = barcodeCameraUi.getCameraView();
 
-            finderOverlayView.setVisibility(configuration.shouldUseFinderView() ? View.VISIBLE : View.INVISIBLE);
             finderOverlayView.setVisibility(configuration.shouldUseFinderView() ? View.VISIBLE : View.INVISIBLE);
             finderOverlayView.setStrokeWidth(configuration.getFinderLineWidth());
             finderOverlayView.setStrokeColor(configuration.getFinderLineColor());

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

@@ -333,7 +333,7 @@ public final class JSONUtils {
             return jsonArray;
         }
 
-        for (byte b: rawBytes) {
+        for (byte b : rawBytes) {
             jsonArray.pushInt(b);
         }
 
@@ -354,33 +354,29 @@ public final class JSONUtils {
         }
 
         BarcodeOverlayTextFormat textFormat = BarcodeOverlayTextFormat.CODE_AND_TYPE;
-        // TODO
-        //        if (configuration.hasKey("textFormat")){
-        //            overlayEnabled = configuration.getBoolean("textFormat");
-        //        }
 
         int polygonColor = Color.BLACK;
-        if (configuration.hasKey("polygonColor")){
+        if (configuration.hasKey("polygonColor")) {
             polygonColor = Color.parseColor(configuration.getString("polygonColor"));
         }
 
         int textColor = Color.BLACK;
-        if (configuration.hasKey("textColor")){
+        if (configuration.hasKey("textColor")) {
             textColor = Color.parseColor(configuration.getString("textColor"));
         }
 
         int textContainerColor = Color.BLACK;
-        if (configuration.hasKey("textContainerColor")){
+        if (configuration.hasKey("textContainerColor")) {
             textContainerColor = Color.parseColor(configuration.getString("textContainerColor"));
         }
 
         Integer highlightedPolygonColor = null;
-        if (configuration.hasKey("highlightedPolygonColor")){
+        if (configuration.hasKey("highlightedPolygonColor")) {
             highlightedPolygonColor = Color.parseColor(configuration.getString("highlightedPolygonColor"));
         }
 
         Integer highlightedTextColor = null;
-        if (configuration.hasKey("highlightedTextColor")){
+        if (configuration.hasKey("highlightedTextColor")) {
             highlightedTextColor = Color.parseColor(configuration.getString("highlightedTextColor"));
         }
 

package/ios/Components/BarcodeCameraView/RNScanbotBarcodeCameraView.m

@@ -116,7 +116,7 @@
     }
     configuration.viewFinderEnabled = self.shouldUseFinderView;
     viewController.viewFinderConfiguration = configuration;
-        if (_cameraViewConfiguration.barcodeFormats) {
+    if (_cameraViewConfiguration.barcodeFormats) {
         viewController.acceptedBarcodeTypes = _cameraViewConfiguration.barcodeFormats;
     }
     if (_cameraViewConfiguration.acceptedDocumentFormats) {
@@ -194,7 +194,6 @@
 
 - (void)sendScanResults:(NSArray<SBSDKBarcodeScannerResult*>*) results onImage:(UIImage*)image {
     if(!self.onBarcodeScannerResult) {
-        // hello
         return;
     }
     

package/ios/ScanbotBarcodeSdk.m

@@ -128,7 +128,7 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
         [ObjectMapper populateInstance:uiConfig fromDictionary:configuration];
         [ObjectMapper populateInstance:behaviorConfig fromDictionary:configuration];
         [ObjectMapper populateInstance:textConfig fromDictionary:configuration];
-        selectionOverlayConfig = [ObjectMapper extractSelectionOverlayConfig:configuration];
+        selectionOverlayConfig = extractSelectionOverlayConfig(configuration);
     }
     @catch (NSException* ex) {
         reject(@"Property error", [ex reason], nil);
@@ -186,7 +186,7 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
         [ObjectMapper populateInstance:uiConfig fromDictionary:configuration];
         [ObjectMapper populateInstance:behaviorConfig fromDictionary:configuration];
         [ObjectMapper populateInstance:textConfig fromDictionary:configuration];
-        selectionOverlayConfig = [ObjectMapper extractSelectionOverlayConfig:configuration];
+        selectionOverlayConfig = extractSelectionOverlayConfig(configuration);
     }
     @catch (NSException* ex) {
         reject(@"Property error", [ex reason], nil);

package/ios/Utils/BarcodeMapping.h

@@ -28,6 +28,8 @@ static inline SBSDKBarcodeType* barcodeTypeFromString(NSString* string) {
     if ([string isEqualToString:@"MSI_PLESSEY"]) return SBSDKBarcodeTypeMSIPlessey;
     if ([string isEqualToString:@"RSS_14"]) return SBSDKBarcodeTypeRSS14;
     if ([string isEqualToString:@"RSS_EXPANDED"]) return SBSDKBarcodeTypeRSSExpanded;
+    if ([string isEqualToString:@"IATA_2_OF_5"]) return SBSDKBarcodeTypeIATA2Of5;
+    if ([string isEqualToString:@"INDUSTRIAL_2_OF_5"]) return SBSDKBarcodeTypeIndustrial2Of5;
     return nil;
 }
 
@@ -63,7 +65,7 @@ static inline NSString* stringFromBarcodeType(SBSDKBarcodeType* type) {
     if ([type.name isEqualToString:@"RSSExpanded"]) {
         return @"RSS_EXPANDED";
     }
-
+    
     NSString* result = [type.name uppercaseString];
     result = [result stringByReplacingOccurrencesOfString:@"-" withString:@"_"];
     result = [result stringByReplacingOccurrencesOfString:@" " withString:@"_"];
@@ -85,7 +87,7 @@ static inline NSArray<NSDictionary<NSString*, NSObject*>*>* jsonFromBarcodeResul
     for (int i = 0; i < results.count; ++i) {
         [jsonResults addObject:jsonFromBarcodeResult([results objectAtIndex:i])];
     }
-
+    
     return [jsonResults copy];
 }
 
@@ -94,13 +96,13 @@ static inline NSArray<NSDictionary<NSString*, NSObject*>*>* jsonFromMappedBarcod
     for (int i = 0; i < results.count; ++i) {
         [jsonResults addObject:jsonFromBarcodeResult([results objectAtIndex:i].barcode)];
     }
-
+    
     return [jsonResults copy];
 }
 
 static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractPlesseyChecksumAlgorithmFromConfiguration(NSDictionary* configuration) {
     NSString* algorithm = [configuration objectForKey:@"msiPlesseyChecksumAlgorithm"];
-
+    
     if (algorithm != nil) {
         if ([algorithm isEqualToString:@"None"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmNone;
         if ([algorithm isEqualToString:@"Mod10"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod10;
@@ -110,7 +112,7 @@ static inline SBSDKBarcodeMSIPlesseyChecksumAlgorithm extractPlesseyChecksumAlgo
         if ([algorithm isEqualToString:@"Mod1110IBM"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1110IBM;
         if ([algorithm isEqualToString:@"Mod1110NCR"]) return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod1110NCR;
     }
-
+    
     return SBSDKBarcodeMSIPlesseyChecksumAlgorithmMod10;
 }
 
@@ -133,18 +135,18 @@ static inline SBSDKUIBarcodeFilter* extractBarcodeFilter(NSDictionary* configura
 
 static inline NSArray* filterBarcodeResults(NSArray<SBSDKBarcodeScannerResult *>* barcodeResults, SBSDKUIBarcodeFilter* filter) {
     NSMutableArray<SBSDKBarcodeScannerResult *>* outResults = [[NSMutableArray alloc] init];
-
+    
     if (barcodeResults == nil) {
         return outResults;
     }
-
+    
     for (SBSDKBarcodeScannerResult* result in barcodeResults) {
         if (![filter acceptsBarcode:result]) {
             continue;
         }
         [outResults addObject:result];
     }
-
+    
     return outResults;
 }
 
@@ -221,7 +223,7 @@ static inline SBSDKBarcodeAdditionalParameters* extractAdditionalParameters(NSDi
     additionalParameters.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
     
     additionalParameters.codeDensity = extractBarcodeDensity(configuration);
-
+    
     return additionalParameters;
 }
 
@@ -243,4 +245,49 @@ static inline SBSDKUICameraConfiguration* extractCameraConfiguration(NSDictionar
 }
 
 
+/**
+ Extracts the selection overlay configuration values from the JSON dictionary.
+ */
+static inline SBSDKUIBarcodeSelectionOverlayConfiguration* extractSelectionOverlayConfig(NSDictionary *dictionary) {
+    SBSDKUIBarcodeSelectionOverlayConfiguration *overlayConfig = [[SBSDKUIBarcodeSelectionOverlayConfiguration alloc] init];
+    NSDictionary *selectionOverlayDictionary = [dictionary objectForKey:@"overlayConfiguration"];
+    if (selectionOverlayDictionary != nil) {
+        NSNumber *overlayEnabled = [selectionOverlayDictionary objectForKey:@"overlayEnabled"];
+        if (overlayEnabled != nil) {
+            overlayConfig.overlayEnabled = overlayEnabled.boolValue;
+        }
+        
+        NSString *polygonColor = [selectionOverlayDictionary objectForKey:@"polygonColor"];
+        if (polygonColor != nil) {
+            overlayConfig.polygonColor = [UIColor colorFromHexString:polygonColor];
+        }
+        
+        NSString *textColor = [selectionOverlayDictionary objectForKey:@"textColor"];
+        if (textColor != nil) {
+            overlayConfig.textColor = [UIColor colorFromHexString:textColor];
+        }
+        
+        NSString *textContainerColor = [selectionOverlayDictionary objectForKey:@"textContainerColor"];
+        if (textContainerColor != nil) {
+            overlayConfig.textContainerColor = [UIColor colorFromHexString:textContainerColor];
+        }
+        
+        NSString *highlightedPolygonColor = [selectionOverlayDictionary objectForKey:@"highlightedPolygonColor"];
+        if (highlightedPolygonColor != nil) {
+            overlayConfig.highlightedPolygonColor = [UIColor colorFromHexString:highlightedPolygonColor];
+        }
+        
+        NSString *highlightedTextColor = [selectionOverlayDictionary objectForKey:@"highlightedTextColor"];
+        if (highlightedTextColor != nil) {
+            overlayConfig.highlightedTextColor = [UIColor colorFromHexString:highlightedTextColor];
+        }
+        
+        NSString *highlightedTextContainerColor = [selectionOverlayDictionary objectForKey:@"highlightedTextContainerColor"];
+        if (highlightedTextContainerColor != nil) {
+            overlayConfig.highlightedTextContainerColor = [UIColor colorFromHexString:highlightedTextContainerColor];
+        }
+    }
+    return overlayConfig;
+}
+
 #endif /* BarcodeMapping_h */

package/ios/Utils/ObjectMapper.h

@@ -22,6 +22,5 @@
 + (NSString *) normalizeJsonString:(NSString *)strValue;
 + (NSURL *) normalizeJsonFileURL:(NSString *)fileUrl;
 + (NSString *)normalizeJsonFileURLAsString:(NSString *)fileUrl;
-+ (SBSDKUIBarcodeSelectionOverlayConfiguration *)extractSelectionOverlayConfig:(NSDictionary*)dictionary;
 
 @end

package/ios/Utils/ObjectMapper.m

@@ -140,56 +140,4 @@ static NSDictionary<NSString*, NSDictionary<NSString*, NSNumber*>*>* _enumeratio
     return url.absoluteString;
 }
 
-/**
- Extracts the selection overlay configuration values from the JSON dictionary.
- */
-+ (SBSDKUIBarcodeSelectionOverlayConfiguration *) extractSelectionOverlayConfig:(NSDictionary*) dictionary {
-    SBSDKUIBarcodeSelectionOverlayConfiguration* overlayConfig = [[SBSDKUIBarcodeSelectionOverlayConfiguration alloc] init];
-    NSDictionary *selectionOverlayDictionary = [dictionary objectForKey: @"selectionOverlay"];
-    if (selectionOverlayDictionary != nil) {
-        
-        NSNumber *overlayEnabled = [selectionOverlayDictionary objectForKey:@"overlayEnabled"];
-        if (overlayEnabled != nil) {
-            overlayConfig.overlayEnabled = overlayEnabled.boolValue;
-        }
-        
-        // TODO: currently not available
-        //        NSNumber *overlayTextFormat = [selectionOverlayDictionary objectForKey:@"overlayTextFormat"];
-        //        if (overlayTextFormat != nil) {
-        //            overlayConfig.overlayEnabled = overlayTextFormat;
-        //        }
-        
-        NSString *polygonColor = [selectionOverlayDictionary objectForKey:@"polygonColor"];
-        if (polygonColor != nil) {
-            overlayConfig.polygonColor =  [UIColor colorFromHexString: polygonColor];
-        }
-        
-        NSString *textColor = [selectionOverlayDictionary objectForKey:@"textColor"];
-        if (textColor != nil) {
-            overlayConfig.textColor =  [UIColor colorFromHexString: textColor];
-        }
-        
-        NSString *textContainerColor = [selectionOverlayDictionary objectForKey:@"textContainerColor"];
-        if (textContainerColor != nil) {
-            overlayConfig.textContainerColor =  [UIColor colorFromHexString: textContainerColor];
-        }
-        
-        NSString *highlightedPolygonColor = [selectionOverlayDictionary objectForKey:@"highlightedPolygonColor"];
-        if (highlightedPolygonColor != nil) {
-            overlayConfig.highlightedPolygonColor =  [UIColor colorFromHexString: highlightedPolygonColor];
-        }
-        
-        NSString *highlightedTextColor = [selectionOverlayDictionary objectForKey:@"highlightedTextColor"];
-        if (highlightedTextColor != nil) {
-            overlayConfig.highlightedTextColor =  [UIColor colorFromHexString: highlightedTextColor];
-        }
-        
-        NSString *highlightedTextContainerColor = [selectionOverlayDictionary objectForKey:@"highlightedTextContainerColor"];
-        if (highlightedTextContainerColor != nil) {
-            overlayConfig.highlightedTextContainerColor =  [UIColor colorFromHexString: highlightedTextContainerColor];
-        }
-    }
-    return overlayConfig;
-}
-
 @end

package/package.json

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

package/src/enum.ts

@@ -58,6 +58,8 @@ export type BarcodeFormat =
     "UPC_A" |
     "UPC_E" |
     "UNKNOWN" |
+    "IATA_2_OF_5" |
+    "INDUSTRIAL_2_OF_5" |
     "MSI_PLESSEY";
 
 export type EngineMode = "LEGACY" | "NEXT_GEN";