react-native-scanbot-barcode-scanner-sdk 3.2.1-beta1 → 3.2.1-beta4

package/ios/Utils/ReactBarcodeExtensionsFilter.m

@@ -0,0 +1,55 @@
+//
+//  ReactBarcodeExtensionsFilter.m
+//  RNScanbotBarcodeSDK
+//
+//  Created by Marco Saia on 13.07.22.
+//
+
+#import "ReactBarcodeExtensionsFilter.h"
+
+@implementation ReactBarcodeExtensionsFilter {
+    BarcodeFilterType mFilterType;
+}
+
+-(id)init:(BarcodeFilterType)filterType
+{
+    if(self = [super init]) {
+        mFilterType = filterType;
+    }
+
+    return self;
+}
+
+- (BOOL)acceptsBarcode:(nonnull SBSDKBarcodeScannerResult *)barcode {
+    if (![super acceptsBarcode: barcode]) {
+        return false;
+    }
+    
+    NSString* extension = barcode.metadata[SBSDKBarcodeMetadataEANUPCExtensionKey];
+    if (extension == nil || [extension length] == 0) {
+        return false;
+    }
+    
+    switch (mFilterType) {
+        case ReactBarcodeExtensionsFilterWithExtension:
+            return true;
+        case ReactBarcodeExtensionsFilterWithEAN2Extension:
+            return trim(extension).length == 2;
+        case ReactBarcodeExtensionsFilterWithEAN5Extension:
+            return trim(extension).length == 5;
+        default:
+            return false;
+    }
+}
+
+- (BOOL)shouldAdd:(nonnull SBSDKBarcodeScannerResult *)barcode
+       toBarcodes:(nonnull NSArray<SBSDKBarcodeScannerResult *>*)codes
+{
+    return [super shouldAdd:barcode toBarcodes:codes];
+}
+
+static inline NSString* trim(NSString* text) {
+    return [text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+}
+
+@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.2.1-beta1",
+  "version": "3.2.1-beta4",
   "description": "Scanbot Barcode Scanner SDK React Native Plugin for Android and iOS",
   "main": "index.js",
   "files": [

package/src/configuration.ts

@@ -10,7 +10,8 @@ import {
   BarcodeImageGenerationType,
   UIInterfaceOrientationMask,
   EngineMode,
-  CameraModule
+  CameraModule,
+  BarcodeFilter
 } from "./enum";
 import { MSIPlesseyChecksumAlgorithm } from "./enum";
 
@@ -89,9 +90,9 @@ export interface BarcodeScannerConfiguration {
    */
   minimum1DBarcodesQuietZone?: number
   /** 
-   * If 'true', only barcodes that have an extension will be accepted. Defaults to FALSE.
+   * Use a filter to determine which type of barcode can be detected; see `BarcodeFilter`
    */
-  onlyAcceptCodesWithExtensions?: boolean;
+  barcodeFilter?: BarcodeFilter;
   /**
    * Whether a sound should be played on successful barcode detection.
    */
@@ -301,9 +302,9 @@ export interface BatchBarcodeScannerConfiguration {
    */
   minimum1DBarcodesQuietZone?: number;
   /** 
-   * If 'true', only barcodes that have an extension will be accepted. Defaults to FALSE.
+   * Use a filter to determine which type of barcode can be detected; see `BarcodeFilter`
    */
-  onlyAcceptCodesWithExtensions?: boolean;
+  barcodeFilter?: BarcodeFilter;
   /**
    * The engine mode of the barcode recognizer. Defaults to NEXT_GEN.
    * To use the legacy recognizer, please specify LEGACY.

package/src/enum.ts

@@ -77,3 +77,8 @@ export type MSIPlesseyChecksumAlgorithm =
     ;
 
 export type CameraModule = 'FRONT' | 'BACK';
+
+export type BarcodeFilter = 
+    'WithExtension' |
+    'WithEAN2Extension' |
+    'WithEAN5Extension';

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 {

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

@@ -1,24 +0,0 @@
-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/ios/Utils/UpcExtensionBarcodeFilter.h

@@ -1,17 +0,0 @@
-//
-//  UpcExtensionBarcodeFilter.h
-//  RNScanbotBarcodeSDK
-//
-//  Created by Marco Saia on 08.07.22.
-//
-
-#import <Foundation/Foundation.h>
-@import ScanbotBarcodeScannerSDK;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UpcExtensionBarcodeFilter : SBSDKUIBarcodeExtensionsFilter
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/Utils/UpcExtensionBarcodeFilter.m

@@ -1,12 +0,0 @@
-//
-//  UpcExtensionBarcodeFilter.m
-//  RNScanbotBarcodeSDK
-//
-//  Created by Marco Saia on 08.07.22.
-//
-
-#import "UpcExtensionBarcodeFilter.h"
-
-@implementation UpcExtensionBarcodeFilter
-
-@end