scandit-react-native-datacapture-id 6.17.2 → 6.18.0-beta.1

package/android/build.gradle

@@ -8,7 +8,7 @@ def safeExtGet(prop, fallback) {
 
 buildscript {
     ext {
-        kotlin_version = "1.6.21"
+        kotlin_version = "1.7.21"
         agp_version = "7.2.1"
     }
 
@@ -42,9 +42,10 @@ android {
 }
 
 dependencies {
-    def sdk_version = "6.17.2"
+    def sdk_version = "6.18.0-beta.1"
 
-    api "com.scandit.datacapture:id:$sdk_version"
+    println("Version of the native sdk used in this build: ${safeExtGet('global_sdk_version', sdk_version)}")
+    api "com.scandit.datacapture:id:${safeExtGet('global_sdk_version', sdk_version)}"
     api project(path: ':scandit-react-native-datacapture-core')
 
     //noinspection GradleDynamicVersion

package/android/src/main/kotlin/com/scandit/datacapture/reactnative/id/ScanditDataCaptureIdModule.kt

@@ -14,14 +14,14 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.scandit.datacapture.core.capture.DataCaptureContext
 import com.scandit.datacapture.core.capture.DataCaptureContextListener
 import com.scandit.datacapture.core.json.JsonValue
+import com.scandit.datacapture.frameworks.core.deserialization.DeserializationLifecycleObserver
+import com.scandit.datacapture.frameworks.core.deserialization.Deserializers
 import com.scandit.datacapture.id.capture.IdCapture
 import com.scandit.datacapture.id.capture.IdCaptureListener
 import com.scandit.datacapture.id.capture.serialization.IdCaptureDeserializer
 import com.scandit.datacapture.id.capture.serialization.IdCaptureDeserializerListener
 import com.scandit.datacapture.id.ui.overlay.IdCaptureOverlay
 import com.scandit.datacapture.reactnative.core.data.defaults.SerializableCameraSettingsDefaults
-import com.scandit.datacapture.reactnative.core.deserializers.Deserializers
-import com.scandit.datacapture.reactnative.core.deserializers.TreeLifecycleObserver
 import com.scandit.datacapture.reactnative.core.utils.LazyEventEmitter
 import com.scandit.datacapture.reactnative.id.data.defaults.IdCaptureOverlayDefaults
 import com.scandit.datacapture.reactnative.id.data.defaults.SerializableIdCaptureDefaults
@@ -38,14 +38,14 @@ class ScanditDataCaptureIdModule(
     IdCaptureDeserializerListener,
     IdCaptureListener by idCaptureListener,
     DataCaptureContextListener,
-    TreeLifecycleObserver.Callbacks {
+    DeserializationLifecycleObserver.Observer {
 
     override fun getName(): String = "ScanditDataCaptureId"
 
     init {
         idCaptureDeserializer.listener = this
         Deserializers.Factory.addModeDeserializer(idCaptureDeserializer)
-        TreeLifecycleObserver.callbacks += this
+        DeserializationLifecycleObserver.attach(this)
     }
 
     var idCapture: IdCapture? = null
@@ -61,7 +61,7 @@ class ScanditDataCaptureIdModule(
         }
 
     override fun onCatalystInstanceDestroy() {
-        TreeLifecycleObserver.callbacks -= this
+        DeserializationLifecycleObserver.detach(this)
         Deserializers.Factory.removeModeDeserializer(idCaptureDeserializer)
         idCaptureDeserializer.listener = this
     }
@@ -123,16 +123,16 @@ class ScanditDataCaptureIdModule(
         DEFAULTS_KEY to DEFAULTS.toWritableMap()
     )
 
-    override fun onTreeDestroyed() {
+    override fun onDataCaptureContextDeserialized(dataCaptureContext: DataCaptureContext) {
+        this.dataCaptureContext = dataCaptureContext
+    }
+
+    override fun onDataCaptureContextDisposed() {
         idCaptureListener.finishDidCaptureCallback(false)
         idCapture = null
         dataCaptureContext = null
     }
 
-    override fun onTreeCreated(root: DataCaptureContext) {
-        dataCaptureContext = root
-    }
-
     companion object {
         private const val DEFAULTS_KEY = "Defaults"
 

package/android/src/main/kotlin/com/scandit/datacapture/reactnative/id/listener/RCTIdCaptureListener.kt

@@ -10,13 +10,13 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.scandit.datacapture.core.capture.DataCaptureContext
 import com.scandit.datacapture.core.data.FrameData
+import com.scandit.datacapture.frameworks.core.utils.LastFrameData
 import com.scandit.datacapture.id.capture.IdCapture
 import com.scandit.datacapture.id.capture.IdCaptureListener
 import com.scandit.datacapture.id.capture.IdCaptureSession
 import com.scandit.datacapture.id.data.CapturedId
 import com.scandit.datacapture.id.verification.aamvacloud.AamvaCloudVerifier
 import com.scandit.datacapture.id.verification.aamvavizbarcode.AamvaVizBarcodeComparisonVerifier
-import com.scandit.datacapture.reactnative.core.ScanditDataCaptureCoreModule
 import com.scandit.datacapture.reactnative.core.utils.EventWithResult
 import com.scandit.datacapture.reactnative.core.utils.writableMap
 import java.util.concurrent.atomic.AtomicReference
@@ -39,35 +39,35 @@ class RCTIdCaptureListener(
 
     override fun onIdCaptured(mode: IdCapture, session: IdCaptureSession, data: FrameData) {
         latestSession.set(session)
-        ScanditDataCaptureCoreModule.lastFrame = data
+        LastFrameData.frameData.set(data)
         val params = writableMap {
             putString(FIELD_SESSION, session.toJson())
         }
         val enabled = onIdCaptured.emitForResult(params, mode.isEnabled)
         mode.isEnabled = enabled
-        ScanditDataCaptureCoreModule.lastFrame = null
+        LastFrameData.frameData.set(null)
     }
 
     override fun onIdLocalized(mode: IdCapture, session: IdCaptureSession, data: FrameData) {
         latestSession.set(session)
-        ScanditDataCaptureCoreModule.lastFrame = data
+        LastFrameData.frameData.set(data)
         val params = writableMap {
             putString(FIELD_SESSION, session.toJson())
         }
         val enabled = onIdLocalized.emitForResult(params, mode.isEnabled)
         mode.isEnabled = enabled
-        ScanditDataCaptureCoreModule.lastFrame = null
+        LastFrameData.frameData.set(null)
     }
 
     override fun onIdRejected(mode: IdCapture, session: IdCaptureSession, data: FrameData) {
         latestSession.set(session)
-        ScanditDataCaptureCoreModule.lastFrame = data
+        LastFrameData.frameData.set(data)
         val params = writableMap {
             putString(FIELD_SESSION, session.toJson())
         }
         val enabled = onIdRejected.emitForResult(params, mode.isEnabled)
         mode.isEnabled = enabled
-        ScanditDataCaptureCoreModule.lastFrame = null
+        LastFrameData.frameData.set(null)
     }
 
     override fun onErrorEncountered(
@@ -77,23 +77,23 @@ class RCTIdCaptureListener(
         data: FrameData
     ) {
         latestSession.set(session)
-        ScanditDataCaptureCoreModule.lastFrame = data
+        LastFrameData.frameData.set(data)
         val params = writableMap {
             putString(FIELD_SESSION, session.toJson())
         }
         eventEmitter.emit(ID_CAPTURE_DID_FAIL, params)
-        ScanditDataCaptureCoreModule.lastFrame = null
+        LastFrameData.frameData.set(null)
     }
 
     override fun onIdCaptureTimedOut(mode: IdCapture, session: IdCaptureSession, data: FrameData) {
         latestSession.set(session)
-        ScanditDataCaptureCoreModule.lastFrame = data
+        LastFrameData.frameData.set(data)
         val params = writableMap {
             putString(FIELD_SESSION, session.toJson())
         }
         val enabled = onIdTimedOut.emitForResult(params, mode.isEnabled)
         mode.isEnabled = enabled
-        ScanditDataCaptureCoreModule.lastFrame = null
+        LastFrameData.frameData.set(null)
     }
 
     fun finishDidCaptureCallback(enabled: Boolean) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scandit-react-native-datacapture-id",
-  "version": "6.17.2",
+  "version": "6.18.0-beta.1",
   "description": "Scandit Data Capture SDK for React Native",
   "homepage": "https://github.com/Scandit/scandit-react-native-datacapture-id",
   "main": "js/index.js",
@@ -29,6 +29,6 @@
     "typescript": "^3.8.3"
   },
   "dependencies": {
-    "scandit-react-native-datacapture-core": "6.17.2"
+    "scandit-react-native-datacapture-core": "6.18.0-beta.1"
   }
 }

package/scandit-react-native-datacapture-id.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.requires_arc            = true
   s.module_name             = "ScanditDataCaptureId"
   s.header_dir              = "ScanditDataCaptureId"
-  s.dependency 'ScanditIdCapture', '= 6.17.2'
+  s.dependency 'ScanditIdCapture', '= 6.18.0-beta.1'
 
   s.dependency "React"
   s.dependency "scandit-react-native-datacapture-core"