codinux
/
Bankmeister
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added informationForUser, but not exposing it to user as it may causes overflow exception of used QR code library

This commit is contained in:
dankito 2024-10-03 21:33:58 +02:00
parent 1520d19625
commit e3f9c78b95
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/screens/CreateEpcQrCodeScreen.kt
View File

@ -54,11 +54,13 @@ fun CreateEpcQrCodeScreen(onClosed: () -> Unit) {
var reference by remember { mutableStateOf("") } var reference by remember { mutableStateOf("") }
var informationForUser by remember { mutableStateOf("") }
val epcQrCodeBytes by remember(receiverName, iban, bic, amount, reference) {
val epcQrCodeBytes by remember(receiverName, iban, bic, amount, reference, informationForUser) {
derivedStateOf { derivedStateOf {
if (receiverName.isNotBlank() && iban.isNotBlank()) { if (receiverName.isNotBlank() && iban.isNotBlank()) {
epcQrCodeService.generateEpcQrCode(receiverName, iban, bic.takeUnless { it.isBlank() }, amount.takeUnless { it.isBlank() }, reference.takeUnless { it.isBlank() }) epcQrCodeService.generateEpcQrCode(receiverName, iban, bic.takeUnless { it.isBlank() }, amount.takeUnless { it.isBlank() }, reference.takeUnless { it.isBlank() }, informationForUser.takeUnless { it.isBlank() })
} else { } else {
null null
} }
@ -152,6 +154,15 @@ fun CreateEpcQrCodeScreen(onClosed: () -> Unit) {
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
keyboardOptions = KeyboardOptions.ImeNext keyboardOptions = KeyboardOptions.ImeNext
) )
// not exposing it to user as it's a) not displayed by most apps and b) may causes overflow of used QR code library
// OutlinedTextField(
// label = { Text("Information für den Nutzer (optional)") },
// value = informationForUser,
// onValueChange = { informationForUser = it },
// modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
// keyboardOptions = KeyboardOptions.ImeNext
// )
} }
} }
} }

4
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/service/EpcQrCodeService.kt
View File

@ -6,10 +6,10 @@ import net.codinux.banking.epcqrcode.EpcQrCodeGenerator
class EpcQrCodeService { class EpcQrCodeService {
fun generateEpcQrCode(receiverName: String, iban: String, bic: String?, amount: String?, reference: String?, heightAndWidth: Int = EpcQrCode.DefaultHeightAndWidth): ByteArray { fun generateEpcQrCode(receiverName: String, iban: String, bic: String?, amount: String?, reference: String?, informationForUser: String? = null, heightAndWidth: Int = EpcQrCode.DefaultHeightAndWidth): ByteArray {
val generator = EpcQrCodeGenerator() val generator = EpcQrCodeGenerator()
return generator.generateEpcQrCode(EpcQrCodeConfig(receiverName, iban, bic, amount, reference, qrCodeHeightAndWidth = heightAndWidth)).bytes return generator.generateEpcQrCode(EpcQrCodeConfig(receiverName, iban, bic, amount, reference, informationForUser, qrCodeHeightAndWidth = heightAndWidth)).bytes
} }
} }