Merge pull request #14 from tillhub/develop

v1.4.4

Author: djordjeh

sample/src/main/java/de/tillhub/scanengine/sample/MainActivity.kt

@@ -30,7 +30,7 @@ class MainActivity : ComponentActivity() {
     private var scanCode = mutableStateOf("")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        scanner = scanEngine.newCameraScanner(this).build(this.lifecycle)
+        scanner = scanEngine.newCameraScanner(this).build(this.lifecycle, this.savedStateRegistry)
         setContent {
             TillhubScanEngineTheme {
                 Surface(

scan-engine/build.gradle.kts

@@ -80,7 +80,7 @@ afterEvaluate {
             create<MavenPublication>("scan-engine") {
                 groupId = "de.tillhub.scanengine"
                 artifactId = "scan-engine"
-                version = "1.4.3"
+                version = "1.4.4"
 
                 from(components.getByName("release"))
             }

scan-engine/src/main/java/de/tillhub/scanengine/ScanEngine.kt

@@ -4,6 +4,7 @@ import SingletonHolder
 import android.content.Context
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.Lifecycle
+import androidx.savedstate.SavedStateRegistry
 import de.tillhub.scanengine.barcode.BarcodeScanner
 import de.tillhub.scanengine.barcode.DefaultBarcodeScanner
 import de.tillhub.scanengine.barcode.SunmiBarcodeScanner
@@ -16,21 +17,22 @@ import kotlinx.coroutines.flow.SharedFlow
 class ScanEngine private constructor(context: Context) {
 
     private val mutableScanEvents = MutableSharedFlow<ScanEvent>(extraBufferCapacity = 1)
+
     fun observeScannerResults(): SharedFlow<ScanEvent> = mutableScanEvents
 
     fun newCameraScanner(activity: ComponentActivity): ManagerBuilder<Scanner> {
         return object : ManagerBuilder<Scanner> {
-            override fun build(lifecycle: Lifecycle): Scanner {
+            override fun build(lifecycle: Lifecycle, savedStateRegistry: SavedStateRegistry): Scanner {
                 return when (ScannerManufacturer.get()) {
                     ScannerManufacturer.SUNMI -> SunmiScanner(
                         activity.activityResultRegistry,
-                        activity.savedStateRegistry,
+                        savedStateRegistry,
                         mutableScanEvents
                     )
 
                     ScannerManufacturer.OTHER -> DefaultScanner(
                         activity.activityResultRegistry,
-                        activity.savedStateRegistry,
+                        savedStateRegistry,
                         mutableScanEvents
                     )
                 }.also {

scan-engine/src/main/java/de/tillhub/scanengine/ScanEvent.kt

@@ -6,5 +6,7 @@ sealed class ScanEvent {
         val scanKey: String? = null
     ) : ScanEvent()
 
+    data object InProgress : ScanEvent()
+
     data object Canceled : ScanEvent()
 }

scan-engine/src/main/java/de/tillhub/scanengine/Scanner.kt

@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.SharedFlow
 
 interface Scanner : DefaultLifecycleObserver, SavedStateRegistry.SavedStateProvider {
     fun observeScannerResults(): SharedFlow<ScanEvent>
+
     fun startCameraScanner(scanKey: String? = null)
 
     companion object {

scan-engine/src/main/java/de/tillhub/scanengine/ScannerImpl.kt

@@ -19,10 +19,9 @@ abstract class ScannerImpl(
         super.onCreate(owner)
         if (savedStateRegistry.getSavedStateProvider(PROVIDER) == null) {
             savedStateRegistry.registerSavedStateProvider(PROVIDER, this)
-        } else {
-            scanKey = savedStateRegistry.consumeRestoredStateForKey(PROVIDER)
-                ?.getString(SCAN_KEY)
         }
+        scanKey = savedStateRegistry.consumeRestoredStateForKey(PROVIDER)
+            ?.getString(SCAN_KEY)
     }
 
     override fun saveState(): Bundle {

scan-engine/src/main/java/de/tillhub/scanengine/default/DefaultScanner.kt

@@ -27,14 +27,14 @@ class DefaultScanner(
         ) {
             when (it) {
                 ScanEvent.Canceled -> mutableScanEvents.tryEmit(it)
-                is ScanEvent.Success -> mutableScanEvents.tryEmit(
-                    it.copy(scanKey = scanKey)
-                )
+                is ScanEvent.Success -> mutableScanEvents.tryEmit(it.copy(scanKey = scanKey))
+                ScanEvent.InProgress -> Unit
             }
         }
     }
 
     override fun startCameraScanner(scanKey: String?) {
+        mutableScanEvents.tryEmit(ScanEvent.InProgress)
         this.scanKey = scanKey
         scannerLauncher.launch(scanKey)
     }

scan-engine/src/main/java/de/tillhub/scanengine/helper/ManagerBuilder.kt

@@ -1,7 +1,8 @@
 package de.tillhub.scanengine.helper
 
 import androidx.lifecycle.Lifecycle
+import androidx.savedstate.SavedStateRegistry
 
 interface ManagerBuilder<T> {
-    fun build(lifecycle: Lifecycle): T
+    fun build(lifecycle: Lifecycle, savedStateRegistry: SavedStateRegistry): T
 }

scan-engine/src/main/java/de/tillhub/scanengine/sunmi/SunmiScanner.kt

@@ -29,12 +29,14 @@ class SunmiScanner(
                 when (it) {
                     ScanEvent.Canceled -> mutableScanEvents.tryEmit(it)
                     is ScanEvent.Success -> mutableScanEvents.tryEmit(it.copy(scanKey = scanKey))
+                    ScanEvent.InProgress -> Unit
                 }
             }
         }
     }
 
     override fun startCameraScanner(scanKey: String?) {
+        mutableScanEvents.tryEmit(ScanEvent.InProgress)
         this.scanKey = scanKey
         scannerLauncher.launch(scanIntent())
     }