react-native-scanbot-barcode-scanner-sdk 3.2.0-beta7 → 3.2.1-beta2

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

@@ -0,0 +1,24 @@
+package io.scanbot.barcodesdk.plugin.reactnative;
+
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
+import io.scanbot.sdk.barcode.entity.BarcodeItem;
+import io.scanbot.sdk.barcode.entity.BarcodeMetadataKey;
+import io.scanbot.sdk.ui.view.barcode.configuration.IBarcodeFilter;
+
+public class BarcodeExtensionsFilter implements IBarcodeFilter {
+    @Override
+    public boolean acceptsBarcode(@NonNull BarcodeItem barcodeItem) {
+        return barcodeItem.getMetadata().containsKey(BarcodeMetadataKey.UpcEanExtension);
+    }
+
+    @Override
+    public boolean shouldAdd(@NonNull BarcodeItem barcodeItem, @NonNull List<BarcodeItem> list) {
+        if (this.acceptsBarcode(barcodeItem)) {
+            return !list.contains(barcodeItem);
+        }
+        return false;
+    }
+}

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

@@ -241,4 +241,11 @@ public final class JSONUtils {
         }
         return EngineMode.NextGen;
     }
+
+    public static boolean getBoolOrFalse(final ReadableMap map, final String key) {
+        if (!map.hasKey(key)) {
+            return false;
+        }
+        return map.getBoolean(key);
+    }
 }

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

@@ -63,6 +63,10 @@ public final class ObjectMapper {
                 continue;
             }
 
+            if ("onlyAcceptCodesWithExtensions".equals(prop)) {
+                continue;
+            }
+
             // The default FRONT camera module should be FRONT_MIRRORED on Android
             if ("cameraModule".equals(prop) && "FRONT".equals(value)) {
                 value = "FRONT_MIRRORED";

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

@@ -46,6 +46,7 @@ import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDKInitializer;
 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.batch.configuration.BatchBarcodeScannerConfiguration;
+import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeExtensionsFilter;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerAdditionalConfiguration;
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerConfiguration;
 import io.scanbot.sdk.ui.view.base.configuration.CameraOrientationMode;
@@ -306,6 +307,10 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         if (options.hasKey("replaceCancelButtonWithIcon") && options.getBoolean("replaceCancelButtonWithIcon")) {
             configuration.setCancelButtonIcon(R.drawable.ic_baseline_arrow_back_24);
         }
+
+        if (options.hasKey("onlyAcceptCodesWithExtensions") && options.getBoolean("onlyAcceptCodesWithExtensions")) {
+            configuration.setBarcodeFilter(new BarcodeExtensionsFilter());
+        }
     }
 
     @ReactMethod
@@ -400,6 +405,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
                 final WritableMap barcode = Arguments.createMap();
                 barcode.putString("type", barcodeItem.getBarcodeFormat().name());
                 barcode.putString("text", barcodeItem.getText());
+                barcode.putString("textWithExtension", barcodeItem.getTextWithExtension());
                 barcodes.pushMap(barcode);
             }
         }

package/ios/ScanbotBarcodeSdk.m

@@ -139,6 +139,12 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     if (gs1Decoding != nil) {
        additionalParameters.enableGS1Decoding = [gs1Decoding boolValue];
     }
+    
+    // UPC Extension filter
+    NSNumber* shouldApplyExtensionFilter = [configuration objectForKey:@"onlyAcceptCodesWithExtensions"];
+    if (shouldApplyExtensionFilter != nil && [shouldApplyExtensionFilter boolValue]) {
+        behaviorConfig.barcodeFilter = [[SBSDKUIBarcodeExtensionsFilter alloc] init];
+    }
 
     additionalParameters.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
     
@@ -203,6 +209,12 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
     if (gs1Decoding != nil) {
        additionalParameters.enableGS1Decoding = [gs1Decoding boolValue];
     }
+    
+    // UPC Extension filter
+    NSNumber* shouldApplyExtensionFilter = [configuration objectForKey:@"onlyAcceptCodesWithExtensions"];
+    if (shouldApplyExtensionFilter != nil && [shouldApplyExtensionFilter boolValue]) {
+        behavior.barcodeFilter = [[SBSDKUIBarcodeExtensionsFilter alloc] init];
+    }
 
     additionalParameters.msiPlesseyChecksumAlgorithm = extractPlesseyChecksumAlgorithmFromConfiguration(configuration);
     

package/ios/Utils/BarcodeMapping.h

@@ -63,6 +63,7 @@ static inline NSDictionary<NSString*, NSObject*>* jsonFromBarcodeResult(SBSDKBar
     NSMutableDictionary* x = @{
         @"type": stringFromBarcodeType(result.type),
         @"text": result.rawTextString,
+        @"textWithExtension": result.rawTextStringWithExtension,
     }.mutableCopy;
     return x.copy;
 }

package/package.json

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

package/src/configuration.ts

@@ -88,6 +88,10 @@ export interface BarcodeScannerConfiguration {
    * NOTE: This feature works on ITF and MSI Plessey barcodes only.
    */
   minimum1DBarcodesQuietZone?: number
+  /** 
+   * If 'true', only barcodes that have an extension will be accepted. Defaults to FALSE.
+   */
+  onlyAcceptCodesWithExtensions?: boolean;
   /**
    * Whether a sound should be played on successful barcode detection.
    */
@@ -296,12 +300,15 @@ export interface BatchBarcodeScannerConfiguration {
    * NOTE: This feature works on ITF and MSI Plessey barcodes only.
    */
   minimum1DBarcodesQuietZone?: number;
+  /** 
+   * If 'true', only barcodes that have an extension will be accepted. Defaults to FALSE.
+   */
+  onlyAcceptCodesWithExtensions?: boolean;
   /**
    * The engine mode of the barcode recognizer. Defaults to NEXT_GEN.
    * To use the legacy recognizer, please specify LEGACY.
    */
   engineMode?: EngineMode;
-
   /**
    * When set to `true`, the scanner assumes that the barcode can be a GS1 barcode.
    * Turn it off if you don't want to see decoded FNC1 characters ("]C1" and ASCII char 29).
@@ -309,7 +316,6 @@ export interface BatchBarcodeScannerConfiguration {
    * NOTE: Currently works for CODE128 barcodes only!
    */
   gs1DecodingEnabled?: boolean;
-
   /**
    * The checksum algorithm for MSI Plessey barcodes.
    * The default value is [MSIPlesseyChecksumAlgorithm.Mod10].

package/src/result.ts

@@ -10,6 +10,11 @@ export interface BarcodeResultField {
      * The raw text encoded in the barcode.
      */
     text: string;
+
+    /**
+     * The raw text encoded in the barcode that also includes the extension, if detected
+     */
+    textWithExtension: string;
 }
 
 export interface BarcodeResult {