react-native-scanbot-barcode-scanner-sdk 3.2.1-beta5 → 3.2.1-beta8

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,37 +1,37 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
 	package
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:2:11-61
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:2:11-61
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:versionName
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:versionCode
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:11-69
+		ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:11-69
 uses-sdk
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rutkaybiyik/workspace/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Jan 18 13:44:25 CET 2022
+sdk.dir=/Users/rutkaybiyik/Library/Android/sdk

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

@@ -10,6 +10,7 @@ import io.scanbot.sdk.barcode.entity.BarcodeFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeScannerAdditionalConfig;
 import io.scanbot.sdk.barcode.entity.EngineMode;
 import io.scanbot.sdk.ui.camera.FinderAspectRatio;
+import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
 
 @SuppressWarnings("unused")
 public class ScanbotBarcodeCameraViewConfiguration {
@@ -18,6 +19,7 @@ public class ScanbotBarcodeCameraViewConfiguration {
     public List<BarcodeDocumentFormat> acceptedDocumentFormats = new ArrayList<>();
     public EngineMode engineMode;
     public BarcodeScannerAdditionalConfig additionalConfiguration;
+    public BarcodeFilter barcodeFilter;
 
     // Automatically mapped properties
     private boolean shouldUseFinderView = false;

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

@@ -22,6 +22,7 @@ import com.facebook.react.bridge.WritableNativeArray;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -43,6 +44,7 @@ import io.scanbot.sdk.camera.CameraOpenCallback;
 import io.scanbot.sdk.camera.FrameHandlerResult;
 import io.scanbot.sdk.camera.ScanbotCameraView;
 import io.scanbot.sdk.ui.camera.FinderOverlayView;
+import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 
@@ -212,6 +214,7 @@ public class ScanbotBarcodeCameraViewFragment extends Fragment implements Barcod
             final WritableMap barcode = new JSONUtils.WritableMapBuilder()
                     .putString("text", item.getText())
                     .putString("type", item.getBarcodeFormat().name())
+                    .putString("textWithExtension", item.getTextWithExtension())
                     .build();
             barcodes.pushMap(barcode);
         }
@@ -241,7 +244,14 @@ public class ScanbotBarcodeCameraViewFragment extends Fragment implements Barcod
             return;
         }
 
-        sendResult(result.getValue().getBarcodeItems());
+        List<BarcodeItem> barcodeItems;
+        if (configuration.barcodeFilter != null) {
+            barcodeItems = JSONUtils.getBarcodeItemsFromItemListWithFilter(result.getValue().getBarcodeItems(), configuration.barcodeFilter);
+        } else {
+            barcodeItems = result.getValue().getBarcodeItems();
+        }
+
+        sendResult(barcodeItems);
     }
 
     private void checkPermissions() {

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

@@ -18,6 +18,7 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
+import java.util.List;
 import java.util.Map;
 
 import io.scanbot.barcodesdk.plugin.reactnative.utils.JSONUtils;
@@ -26,6 +27,8 @@ import io.scanbot.barcodesdk.plugin.reactnative.R;
 import io.scanbot.barcodesdk.plugin.reactnative.components.EventEmitter;
 import io.scanbot.barcodesdk.plugin.reactnative.components.common.ScanbotComponentFrameLayout;
 import io.scanbot.barcodesdk.plugin.reactnative.components.common.ScanbotComponentRootView;
+import io.scanbot.sdk.barcode.entity.BarcodeItem;
+import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeFilter;
 
 public class ScanbotBarcodeCameraViewManager extends ViewGroupManager<ReactRootView> {
 
@@ -75,6 +78,10 @@ public class ScanbotBarcodeCameraViewManager extends ViewGroupManager<ReactRootV
             cameraViewConfiguration.setFlashEnabled(configuration.getBoolean("flashEnabled"));
         }
 
+        if (configuration.hasKey("barcodeFilter")) {
+            cameraViewConfiguration.barcodeFilter = JSONUtils.extractBarcodeFilter(configuration);
+        }
+
         cameraViewConfiguration.additionalConfiguration = JSONUtils.extractBarcodeScannerAdditionalConfig(configuration);
         cameraViewConfiguration.engineMode = JSONUtils.extractEngineMode(configuration);
 
@@ -86,9 +93,9 @@ public class ScanbotBarcodeCameraViewManager extends ViewGroupManager<ReactRootV
     @Nullable
     @Override
     public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        return EventEmitter.getMapForNativeEvents(new EventEmitter.NativeEvent[] {
-            EventEmitter.NativeEvent.BARCODE_SCANNER_RESULT,
-            EventEmitter.NativeEvent.REQUEST_COMPONENT_RELOAD
+        return EventEmitter.getMapForNativeEvents(new EventEmitter.NativeEvent[]{
+                EventEmitter.NativeEvent.BARCODE_SCANNER_RESULT,
+                EventEmitter.NativeEvent.REQUEST_COMPONENT_RELOAD
         });
     }