Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
scan-engine = "2.0.1"
scan-engine = "2.0.2"
kotlin = "2.2.0"
agp = "8.11.1"
compose = "1.8.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package de.tillhub.scanengine.camera.contract.legacy

import android.app.Activity
import android.content.Context
import android.content.Intent
import androidx.activity.result.contract.ActivityResultContract
import de.tillhub.scanengine.camera.ui.CameraScanActivity
import de.tillhub.scanengine.data.ScannerEvent

class CameraScanContract : ActivityResultContract<String?, ScannerEvent>() {
override fun createIntent(
context: Context,
input: String?,
): Intent = Intent(context, CameraScanActivity::class.java).apply {
input?.let {
putExtra(CameraScanActivity.SCAN_KEY, it)
}
}

override fun parseResult(
resultCode: Int,
intent: Intent?,
): ScannerEvent {
val resultData = intent?.extras?.getString(CameraScanActivity.DATA_KEY)
val scanKey = intent?.extras?.getString(CameraScanActivity.SCAN_KEY)

return if (resultCode == Activity.RESULT_OK && !resultData.isNullOrEmpty()) {
ScannerEvent.ScanResult(
value = resultData,
scanKey = scanKey,
)
} else {
ScannerEvent.Camera.Canceled
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class CameraScanActivity : ComponentActivity() {
val resultIntent =
Intent().apply {
putExtra(DATA_KEY, barcode)
intent.getStringExtra(SCAN_KEY)?.let {
putExtra(SCAN_KEY, barcode)
}
}
setResult(RESULT_OK, resultIntent)
finish()
Expand All @@ -28,5 +31,6 @@ class CameraScanActivity : ComponentActivity() {

companion object {
const val DATA_KEY = "scanned_data"
const val SCAN_KEY = "scan_key"
}
}