diff --git a/mobile/src/main/java/ru/omni_devel/cards/AddCardActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/AddCardActivity.kt index e92f23f..59f290e 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/AddCardActivity.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/AddCardActivity.kt @@ -18,12 +18,7 @@ class AddCardActivity : AppCompatActivity() { private val barcodeLauncher = registerForActivityResult(ScanContract()) { result -> if (result.contents != null) { - val codeTypes = BarcodeFormat.entries.map { it.name } - val codeTypeIndex = codeTypes.indexOf(result.formatName) - - if (codeTypeIndex >= 0) { - findViewById(R.id.cardCodeTypeSelector).setSelection(codeTypeIndex) - } + setCodeType(result.formatName) findViewById(R.id.cardValueInput).setText(result.contents) } @@ -51,6 +46,7 @@ class AddCardActivity : AppCompatActivity() { val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, options) adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) cardCodeTypeSelector.adapter = adapter + setCodeType("QR_CODE") scanCodeButton.setOnClickListener { val options = ScanOptions() @@ -70,4 +66,13 @@ class AddCardActivity : AppCompatActivity() { finish() } } + + private fun setCodeType(codeTypeString: String) { + val codeTypes = BarcodeFormat.entries.map { it.name } + val codeTypeIndex = codeTypes.indexOf(codeTypeString) + + if (codeTypeIndex >= 0) { + findViewById(R.id.cardCodeTypeSelector).setSelection(codeTypeIndex) + } + } } \ No newline at end of file