react-native-scanbot-barcode-scanner-sdk 7.1.2-rc.2 → 8.0.0-rc.1

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcode_scanner_view/ScanbotBarcodeScannerViewEvents.kt

@@ -1,20 +1,28 @@
 package io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view
 
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 import io.scanbot.barcodesdk.plugin.reactnative.extensions.toWritableArray
 import io.scanbot.barcodesdk.plugin.reactnative.extensions.toWritableMap
 import io.scanbot.sdk.barcode.BarcodeItem
 import io.scanbot.sdk.barcode.BarcodeScannerResult
+import io.scanbot.sdk_wrapper.exceptions.SBWrapperError
 import org.json.JSONArray
 
 interface BaseEvent {
     val eventName: String
     fun parseData(): WritableMap
+
+    fun send(surfaceId: Int, context: ReactContext, viewId: Int) {
+        UIManagerHelper.getEventDispatcherForReactTag(context, viewId)
+            ?.dispatchEvent(ComponentEvent(this, surfaceId, viewId))
+    }
 }
 
-class ComponentEvent(private val baseEvent: BaseEvent, surfaceId: Int, viewTag: Int) :
+private class ComponentEvent(private val baseEvent: BaseEvent, surfaceId: Int, viewTag: Int) :
     Event<ComponentEvent>(surfaceId, viewTag) {
 
     override fun getEventData(): WritableMap {
@@ -63,3 +71,18 @@ class BarcodeSelectionResultEvent(private val barcodeItem: BarcodeItem) : BaseEv
         }
     }
 }
+
+class BarcodeErrorEvent(private val error: SBWrapperError) : BaseEvent {
+
+    constructor(ex: Throwable) : this(SBWrapperError(ex))
+
+    companion object {
+        const val NAME = "error"
+    }
+
+    override val eventName = NAME
+
+    override fun parseData(): WritableMap {
+        return error.toJson().toWritableMap()
+    }
+}

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcode_scanner_view/ScanbotBarcodeScannerViewManager.kt

@@ -16,12 +16,10 @@ import io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view.
 import io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view.models.FinderViewConfiguration
 import io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view.models.ZoomRangeConfig
 import io.scanbot.barcodesdk.plugin.reactnative.extensions.extractBarcodeFormatConfigurations
+import io.scanbot.barcodesdk.plugin.reactnative.extensions.getOrSendBarcodeErrorEvent
 import io.scanbot.barcodesdk.plugin.reactnative.extensions.toJSON
-import io.scanbot.barcodesdk.plugin.reactnative.extensions.toJSONArray
 import io.scanbot.barcodesdk.plugin.reactnative.extensions.toPx
-import io.scanbot.common.toList
 import io.scanbot.sdk.barcode.BarcodeAccumulationConfiguration
-import io.scanbot.sdk.barcode.BarcodeAccumulationMethod
 import io.scanbot.sdk.barcode.BarcodeDocumentFormat
 import io.scanbot.sdk.barcode.BarcodeDocumentFormats
 import io.scanbot.sdk.barcode.BarcodeFormatCommonConfiguration
@@ -29,7 +27,7 @@ import io.scanbot.sdk.barcode.BarcodeScannerEngineMode
 import io.scanbot.sdk.barcode.ui.BarcodeOverlayTextFormat
 import io.scanbot.sdk.camera.CameraModule
 import io.scanbot.sdk.camera.ZoomRange
-import io.scanbot.sdk.common.AspectRatio
+import io.scanbot.sdk.geometry.AspectRatio
 import io.scanbot.sdk_wrapper.SBWrapper
 
 @ReactModule(name = ScanbotBarcodeScannerViewManager.NAME)
@@ -56,23 +54,24 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
     }
 
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {
-        @Suppress("DEPRECATION")
-        return MapBuilder.of(
+        @Suppress("DEPRECATION") return MapBuilder.of(
             BarcodeScannerResultEvent.NAME,
             MapBuilder.of("registrationName", "onBarcodeScannerResult"),
             BarcodeSelectionResultEvent.NAME,
             MapBuilder.of("registrationName", "onSelectBarcodeResult"),
+            BarcodeErrorEvent.NAME,
+            MapBuilder.of("registrationName", "onError")
         )
     }
 
     //region Commands
 
     override fun unfreezeCamera(view: ScanbotBarcodeScannerView) {
-        view.scannerView.viewController.startPreview()
+        view.scannerView?.viewController?.startPreview()
     }
 
     override fun freezeCamera(view: ScanbotBarcodeScannerView) {
-        view.scannerView.viewController.stopPreview()
+        view.scannerView?.viewController?.stopPreview()
     }
 
     override fun bindBarcodeItemOverlayView(
@@ -108,23 +107,23 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
 
     @ReactProp(name = "scanningEnabled")
     override fun setScanningEnabled(view: ScanbotBarcodeScannerView, value: Boolean) {
-        view.barcodeScanner.enableBarcodeScan(value)
+        view.scannerView?.viewController?.isFrameProcessingEnabled = value
     }
 
     @ReactProp(name = "flashEnabled")
     override fun setFlashEnabled(view: ScanbotBarcodeScannerView, value: Boolean) {
         view.flashState = value
-        view.scannerView.viewController.useFlash(value)
+        view.scannerView?.viewController?.useFlash(value)
     }
 
     //region CameraModule
 
     @ReactProp(name = "cameraModule")
     override fun setCameraModule(view: ScanbotBarcodeScannerView, value: String?) {
-        view.scannerView.cameraConfiguration.setCameraModule(
+        view.scannerView?.cameraConfiguration?.setCameraModule(
             SBWrapper.gson.fromJson(value!!, CameraModule::class.java)
         )
-        view.scannerView.viewController.restartPreview()
+        view.scannerView?.viewController?.restartPreview()
     }
 
     @ReactProp(name = "cameraZoomRange")
@@ -138,18 +137,18 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
             CameraConfiguration.DEFAULT_ZOOM_RANGE
         }
 
-        view.scannerView.cameraConfiguration.setPhysicalZoomRange(zoomRange)
+        view.scannerView?.cameraConfiguration?.setPhysicalZoomRange(zoomRange)
     }
 
     @ReactProp(name = "minFocusDistanceLock")
     override fun setMinFocusDistanceLock(view: ScanbotBarcodeScannerView, value: Boolean) {
-        view.scannerView.cameraConfiguration.lockMinFocusDistance(value)
-        view.scannerView.viewController.restartPreview()
+        view.scannerView?.cameraConfiguration?.lockMinFocusDistance(value)
+        view.scannerView?.viewController?.restartPreview()
     }
 
     @ReactProp(name = "cameraZoomFactor")
     override fun setCameraZoomFactor(view: ScanbotBarcodeScannerView, value: Float) {
-        view.scannerView.cameraConfiguration.setPhysicalZoomRatio(value)
+        view.scannerView?.cameraConfiguration?.setPhysicalZoomRatio(value)
     }
 
     //endregion
@@ -170,7 +169,7 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
             FinderViewConfiguration.DEFAULT_ASPECT_RATIO
         }
 
-        view.scannerView.finderViewController.setRequiredAspectRatios(aspectRatios)
+        view.scannerView?.finderViewController?.setRequiredAspectRatios(aspectRatios)
     }
 
     @ReactProp(name = "finderInset")
@@ -183,7 +182,7 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
             FinderViewConfiguration.DEFAULT_FINDER_INSETS
         }
 
-        view.scannerView.finderViewController.setFinderInset(
+        view.scannerView?.finderViewController?.setFinderInset(
             left = insets.left.toPx(view.resources),
             right = insets.right.toPx(view.resources),
             top = insets.top.toPx(view.resources),
@@ -193,31 +192,31 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
 
     @ReactProp(name = "finderEnabled")
     override fun setFinderEnabled(view: ScanbotBarcodeScannerView, value: Boolean) {
-        view.scannerView.finderViewController.setFinderEnabled(value)
+        view.scannerView?.finderViewController?.setFinderEnabled(value)
     }
 
     @ReactProp(name = "finderStrokeWidth")
     override fun setFinderStrokeWidth(view: ScanbotBarcodeScannerView, value: Int) {
-        view.scannerView.finderViewController.setStrokeWidth(value.toPx(view.resources))
+        view.scannerView?.finderViewController?.setStrokeWidth(value.toPx(view.resources))
     }
 
     @ReactProp(name = "finderStrokeColor", customType = "Color")
     override fun setFinderStrokeColor(view: ScanbotBarcodeScannerView, value: Int?) {
-        view.scannerView.finderViewController.setStrokeColor(
+        view.scannerView?.finderViewController?.setStrokeColor(
             value ?: FinderViewConfiguration.DEFAULT_STROKE_COLOR
         )
     }
 
     @ReactProp(name = "finderOverlayColor", customType = "Color")
     override fun setFinderOverlayColor(view: ScanbotBarcodeScannerView, value: Int?) {
-        view.scannerView.finderViewController.setOverlayColor(
+        view.scannerView?.finderViewController?.setOverlayColor(
             value ?: FinderViewConfiguration.DEFAULT_OVERLAY_COLOR
         )
     }
 
     @ReactProp(name = "finderMinPadding")
     override fun setFinderMinPadding(view: ScanbotBarcodeScannerView, value: Int) {
-        view.scannerView.finderViewController.setFinderMinPadding(value)
+        view.scannerView?.finderViewController?.setFinderMinPadding(value)
     }
 
     //endregion
@@ -257,7 +256,7 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
 
     @ReactProp(name = "overlayEnabled")
     override fun setOverlayEnabled(view: ScanbotBarcodeScannerView, value: Boolean) {
-        view.scannerView.selectionOverlayController.setEnabled(value)
+        view.scannerView?.selectionOverlayController?.setEnabled(value)
     }
 
     @ReactProp(name = "overlayLoadingTextValue")
@@ -279,65 +278,77 @@ class ScanbotBarcodeScannerViewManager : SimpleViewManager<ScanbotBarcodeScanner
     override fun setConfigFormatConfigurations(
         view: ScanbotBarcodeScannerView, value: ReadableArray?
     ) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            barcodeFormatConfigurations = value?.extractBarcodeFormatConfigurations() ?: listOf(
-                BarcodeFormatCommonConfiguration()
-            )
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                barcodeFormatConfigurations = value?.extractBarcodeFormatConfigurations() ?: listOf(
+                    BarcodeFormatCommonConfiguration()
+                )
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "configExtractedDocumentFormats")
     override fun setConfigExtractedDocumentFormats(
         view: ScanbotBarcodeScannerView, value: ReadableArray?
     ) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            extractedDocumentFormats =
-                value?.toArrayList()?.map { BarcodeDocumentFormat.fromJson(it as String) }
-                    ?: BarcodeDocumentFormats.all
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                extractedDocumentFormats =
+                    value?.toArrayList()?.map { BarcodeDocumentFormat.fromJson(it as String) }
+                        ?: BarcodeDocumentFormats.all
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "configOnlyAcceptDocuments")
     override fun setConfigOnlyAcceptDocuments(view: ScanbotBarcodeScannerView, value: Boolean) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            onlyAcceptDocuments = value
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                onlyAcceptDocuments = value
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "configReturnBarcodeImage")
     override fun setConfigReturnBarcodeImage(view: ScanbotBarcodeScannerView, value: Boolean) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            returnBarcodeImage = value
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                returnBarcodeImage = value
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "configEngineMode")
     override fun setConfigEngineMode(view: ScanbotBarcodeScannerView, value: String?) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            engineMode = value?.let { BarcodeScannerEngineMode.fromJson(it) }
-                ?: BarcodeScannerEngineMode.NEXT_GEN
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                engineMode = value?.let { BarcodeScannerEngineMode.fromJson(it) }
+                    ?: BarcodeScannerEngineMode.NEXT_GEN
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "configAccumulation")
     override fun setConfigAccumulation(
-        view: ScanbotBarcodeScannerView,
-        value: ReadableMap?
+        view: ScanbotBarcodeScannerView, value: ReadableMap?
     ) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            accumulationConfig = value?.let { BarcodeAccumulationConfiguration(it.toHashMap()) }
-                ?: BarcodeAccumulationConfiguration.default()
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                accumulationConfig = value?.let { BarcodeAccumulationConfiguration(it.toHashMap()) }
+                    ?: BarcodeAccumulationConfiguration.default()
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "configOptimizedForOverlays")
     override fun setConfigOptimizedForOverlays(
-        view: ScanbotBarcodeScannerView,
-        value: Boolean
+        view: ScanbotBarcodeScannerView, value: Boolean
     ) {
-        view.barcodeScanner.setConfiguration(view.barcodeScanner.copyCurrentConfiguration().apply {
-            optimizedForOverlays = value
-        })
+        view.barcodeScanner?.let {
+            it.setConfiguration(it.copyCurrentConfiguration().apply {
+                optimizedForOverlays = value
+            }).getOrSendBarcodeErrorEvent(view)
+        }
     }
 
     @ReactProp(name = "hardwareButtonsEnabled")

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/components/barcode_scanner_view/models/ScanbotBarcodeScannerModels.kt

@@ -5,7 +5,7 @@ import androidx.annotation.Keep
 import io.scanbot.barcodesdk.plugin.reactnative.extensions.Utils
 import io.scanbot.sdk.barcode.ui.BarcodeOverlayTextFormat
 import io.scanbot.sdk.camera.ZoomRange
-import io.scanbot.sdk.common.AspectRatio
+import io.scanbot.sdk.geometry.AspectRatio
 
 class PolygonStyleConfig(
     strokeColor: Int? = null,

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/extensions/Extensions.kt

@@ -0,0 +1,19 @@
+package io.scanbot.barcodesdk.plugin.reactnative.extensions
+
+import android.content.res.Resources
+import io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view.BarcodeErrorEvent
+import io.scanbot.barcodesdk.plugin.reactnative.components.barcode_scanner_view.ScanbotBarcodeScannerView
+
+fun Int.toPx(resources: Resources): Int {
+    return (this * resources.displayMetrics.density).toInt()
+}
+
+fun <T> io.scanbot.common.Result<T>.getOrSendBarcodeErrorEvent(view: ScanbotBarcodeScannerView): T? {
+    return try {
+        this.getOrThrow()
+    } catch (ex: Throwable) {
+        view.sendEvent(BarcodeErrorEvent(ex))
+
+        null
+    }
+}

package/ios/Components/BarcodeScannerView/RNScanbotBarcodeScannerLegacyView.h

@@ -5,15 +5,16 @@
 #define RNScanbotBarcodeScannerLegacyView_h
 
 #import <React/UIView+React.h>
-#import "RNScanbotBarcodeScannerViewControllerWrapper.h"
 #import <React/RCTComponent.h>
 
-@interface RNScanbotBarcodeScannerLegacyView: UIView<    
-    SBSDKBarcodeScannerViewControllerDelegate,
-    SBSDKBarcodeTrackingOverlayControllerDelegate
->
-@property (nonatomic, copy) RCTDirectEventBlock onBarcodeScannerResult;
-@property (nonatomic, copy) RCTDirectEventBlock onSelectBarcodeResult;
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVFoundation.h>
+
+@interface RNScanbotBarcodeScannerLegacyView: UIView
+@property (nonatomic, copy) RCTDirectEventBlock _Nonnull onBarcodeScannerResult;
+@property (nonatomic, copy) RCTDirectEventBlock _Nonnull onSelectBarcodeResult;
+@property (nonatomic, copy) RCTDirectEventBlock _Nonnull onError;
 
 - (void) freezeCamera;
 - (void) unfreezeCamera;