Small refactorings

Author: peter-witt

quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt

@@ -2,13 +2,11 @@ package io.github.g00fy2.quickie
 
 import android.Manifest.permission.CAMERA
 import android.app.Activity
-import android.app.Dialog
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.util.Size
 import android.view.HapticFeedbackConstants
-import android.view.KeyEvent
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
@@ -28,11 +26,11 @@ import com.google.mlkit.vision.barcode.common.Barcode
 import io.github.g00fy2.quickie.config.ParcelableScannerConfig
 import io.github.g00fy2.quickie.config.ScannerAction
 import io.github.g00fy2.quickie.config.ScannerConfig
+import io.github.g00fy2.quickie.config.ScannerSuccessActionProvider
 import io.github.g00fy2.quickie.content.QRContent
 import io.github.g00fy2.quickie.databinding.QuickieScannerActivityBinding
 import io.github.g00fy2.quickie.extensions.toParcelableContentType
 import io.github.g00fy2.quickie.utils.MlKitErrorHandler
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -46,7 +44,7 @@ internal class QRScannerActivity : AppCompatActivity() {
   private var showTorchToggle = false
   private var showCloseButton = false
   private var useFrontCamera = false
-  private var scannerSuccessActionProvider: (suspend CoroutineScope.(QRContent) -> ScannerAction)? = null
+  private var scannerSuccessActionProvider: ScannerSuccessActionProvider? = null
   private var analysisPaused = false
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -103,7 +101,6 @@ internal class QRScannerActivity : AppCompatActivity() {
             QRCodeAnalyzer(
               barcodeFormats = barcodeFormats,
               onSuccess = { barcode ->
-//                it.clearAnalyzer()
                 if (!analysisPaused) {
                   analysisPaused = true
                   onSuccess(barcode)
@@ -217,8 +214,9 @@ internal class QRScannerActivity : AppCompatActivity() {
       showTorchToggle = it.showTorchToggle
       useFrontCamera = it.useFrontCamera
       showCloseButton = it.showCloseButton
-      scannerSuccessActionProvider = ScannerConfig.scannerSuccessActionProvider
     }
+
+    scannerSuccessActionProvider = ScannerConfig.scannerSuccessActionProvider
   }
 
   private fun requestCameraPermissionIfMissing(onResult: ((Boolean) -> Unit)) {

quickie/src/main/kotlin/io/github/g00fy2/quickie/ScanQRCode.kt

@@ -11,13 +11,17 @@ import io.github.g00fy2.quickie.QRResult.QRSuccess
 import io.github.g00fy2.quickie.QRResult.QRUserCanceled
 import io.github.g00fy2.quickie.QRScannerActivity.Companion.RESULT_ERROR
 import io.github.g00fy2.quickie.QRScannerActivity.Companion.RESULT_MISSING_PERMISSION
+import io.github.g00fy2.quickie.config.ScannerConfig
+import io.github.g00fy2.quickie.config.ScannerSuccessActionProvider
 import io.github.g00fy2.quickie.extensions.getRootException
 import io.github.g00fy2.quickie.extensions.toQuickieContentType
 
-public class ScanQRCode : ActivityResultContract<Nothing?, QRResult>() {
+public class ScanQRCode : ActivityResultContract<ScannerSuccessActionProvider?, QRResult>() {
 
-  override fun createIntent(context: Context, input: Nothing?): Intent =
-    Intent(context, QRScannerActivity::class.java)
+  override fun createIntent(context: Context, input: ScannerSuccessActionProvider?): Intent {
+    ScannerConfig.scannerSuccessActionProvider = input
+    return Intent(context, QRScannerActivity::class.java)
+  }
 
   override fun parseResult(resultCode: Int, intent: Intent?): QRResult {
     return when (resultCode) {

quickie/src/main/kotlin/io/github/g00fy2/quickie/config/ScannerConfig.kt

@@ -84,7 +84,7 @@ public class ScannerConfig internal constructor(
     /**
      * Set a listener to be called when a barcode is detected.
      */
-    public fun setScannerSuccessActionProvider(listener: suspend CoroutineScope.(QRContent) -> ScannerAction): Builder =
+    public fun setScannerSuccessActionProvider(listener: ScannerSuccessActionProvider): Builder =
       apply { scannerSuccessActionProvider = listener }
 
     /**
@@ -109,6 +109,8 @@ public class ScannerConfig internal constructor(
      */
     public fun build(func: Builder.() -> Unit): ScannerConfig = Builder().apply { func() }.build()
 
-    internal var scannerSuccessActionProvider: (suspend CoroutineScope.(QRContent) -> ScannerAction)? = null
+    internal var scannerSuccessActionProvider: ScannerSuccessActionProvider? = null
   }
-}
+}
+
+public typealias ScannerSuccessActionProvider = suspend CoroutineScope.(QRContent) -> ScannerAction

sample/src/main/kotlin/io/github/g00fy2/quickiesample/MainActivity.kt

@@ -36,15 +36,34 @@ class MainActivity : AppCompatActivity() {
     setContentView(binding.root)
     setBarcodeFormatDropdown()
 
+
     binding.qrScannerButton.setOnClickListener {
-      scanQrCode.launch(null)
+      var count = 0
+      scanQrCode.launch() {
+        delay(1000)
+        if (it.rawValue.length != 6) {
+          count = 0
+          ScannerAction.Error("Invalid code")
+        } else if (count++ == 2) {
+          binding.qrScannerButton.text = "Scan again"
+          ScannerAction.CloseScanner
+        } else
+          ScannerAction.ContinueScanning
+      }
     }
 
     binding.customScannerButton.setOnClickListener {
       var count = 0
       scanCustomCode.launch(
         ScannerConfig.build {
-          setBarcodeFormats(listOf(BarcodeFormat.FORMAT_QR_CODE))
+          setBarcodeFormats(listOf(selectedBarcodeFormat)) // set interested barcode formats
+          setOverlayStringRes(R.string.scan_barcode) // string resource used for the scanner overlay
+          setOverlayDrawableRes(R.drawable.ic_scan_barcode) // drawable resource used for the scanner overlay
+          setHapticSuccessFeedback(false) // enable (default) or disable haptic feedback when a barcode was detected
+          setShowTorchToggle(true) // show or hide (default) torch/flashlight toggle button
+          setShowCloseButton(true) // show or hide (default) close button
+          setHorizontalFrameRatio(2.2f) // set the horizontal overlay ratio (default is 1 / square frame)
+          setUseFrontCamera(false) // use the front camera
           setScannerSuccessActionProvider {
             delay(1000)
             if (it.rawValue.length != 6) {