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

Using now String as data type for amount

This commit is contained in:
dankito 2022-03-13 22:17:47 +01:00
parent 93c3b915bf
commit d668c61c3d
8 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EpcQrCode/src/commonMain/kotlin/net/codinux/banking/epcqrcode/EpcQrCode.kt
View File

@ -58,7 +58,7 @@ open class EpcQrCode(
* Optional amount.
* Max. 12 bytes.
*/
open val amount: Double?, // TODO: use BigDecimal
open val amount: String?,
/**
* Optional purpose code.

17
EpcQrCode/src/commonMain/kotlin/net/codinux/banking/epcqrcode/EpcQrCodeConfig.kt
View File

@ -9,7 +9,7 @@ open class EpcQrCodeConfig(
var bic: String? = null,
var amount: Double? = null,
amount: String? = null,
var reference: String? = null,
@ -17,4 +17,17 @@ open class EpcQrCodeConfig(
var encoding: EpcQrCodeCharacterSet = EpcQrCodeCharacterSet.UTF_8
)
) {
companion object {
fun ensureAmountFormat(amount: String?): String? {
return amount?.replace(',', '.')
}
}
open val amount: String? = ensureAmountFormat(amount)
}

6
EpcQrCode/src/commonMain/kotlin/net/codinux/banking/epcqrcode/EpcQrCodeCreator.kt
View File

@ -38,7 +38,7 @@ open class EpcQrCodeCreator {
epcQrCodeBuilder.appendLine(mapNullable(epcQrCode.bic))
epcQrCodeBuilder.appendLine(epcQrCode.receiverName)
epcQrCodeBuilder.appendLine(epcQrCode.iban)
epcQrCodeBuilder.appendLine(mapNullable(epcQrCode.amount?.let { (epcQrCode.currencyCode ?: EpcQrCode.CurrencyCodeDefaultValue) + convert(it) }))
epcQrCodeBuilder.appendLine(mapNullable(epcQrCode.amount?.let { (epcQrCode.currencyCode ?: EpcQrCode.CurrencyCodeDefaultValue) + it })) // TODO: ensure that amount is converted to the correct format
epcQrCodeBuilder.appendLine(epcQrCode.purposeCode)
epcQrCodeBuilder.appendLine(mapNullable(epcQrCode.remittanceReference))
@ -54,10 +54,6 @@ open class EpcQrCodeCreator {
}
protected open fun convert(amount: Double): String {
return amount.toString() // TODO: ensure that it's converted to the correct format
}
protected open fun mapNullable(value: String?): String {
return value ?: ""
}

6
EpcQrCodeAndroidApp/src/main/java/net/codinux/banking/epcqrcode/MainActivity.kt
View File

@ -20,7 +20,7 @@ class MainActivity : AppCompatActivity() {
private fun generateQrCode() {
hideKeyboard(edtxtReference)
val param = EpcQrCodeConfig(edtxtReceiver.string, edtxtIban.string, edtxtBic.string, map(edtxtAmount.string), edtxtReference.string)
val param = EpcQrCodeConfig(edtxtReceiver.string, edtxtIban.string, edtxtBic.string, edtxtAmount.string, edtxtReference.string)
generateQrCodeAsync(param) { createdQrCode ->
imgGeneratedQrCode.setImageBitmap(createdQrCode)
@ -43,8 +43,4 @@ class MainActivity : AppCompatActivity() {
}
}
private fun map(amount: String): Double? {
return amount.replace(',', '.').toDoubleOrNull()
}
}

2
EpcQrCodeJavaFxApp/src/main/kotlin/net/codinux/banking/epcqrcode/windows/main/AppSettings.kt
View File

@ -5,7 +5,7 @@ open class AppSettings(
open var receiver: String = "",
open var iban: String = "",
open var bic: String = "",
open var amount: Double? = null,
open var amount: String? = null,
open var reference: String = "",
open var destinationFile: String = ""
)

8
EpcQrCodeJavaFxApp/src/main/kotlin/net/codinux/banking/epcqrcode/windows/main/MainWindow.kt
View File

@ -267,7 +267,7 @@ class MainWindow : View(FX.messages["application.title"]) {
}
private fun generateQrCode() {
val param = EpcQrCodeConfig(receiver.value, iban.value, bic.value, map(amount.value), reference.value)
val param = EpcQrCodeConfig(receiver.value, iban.value, bic.value, amount.value, reference.value)
val qrCodeContent = EpcQrCodeCreator().generateAsString(param)
generatedQrCodeImage.value = generateQrCode(qrCodeContent)
@ -277,10 +277,6 @@ class MainWindow : View(FX.messages["application.title"]) {
saveSettings() // TODO: actually a side effect
}
private fun map(amount: String): Double? {
return DecimalFormat.parse(amount, ParsePosition(0))?.toDouble()
}
private fun generateQrCode(informationToEncode: String): Image? {
try {
generatedQrCodeBytes = qrCodeGenerator.generateQrCode(informationToEncode)
@ -296,7 +292,7 @@ class MainWindow : View(FX.messages["application.title"]) {
private fun saveSettings() {
try {
val appSettings = AppSettings(receiver.value, iban.value, bic.value, map(amount.value), reference.value,
val appSettings = AppSettings(receiver.value, iban.value, bic.value, amount.value, reference.value,
selectedDestinationFile.value)
serializer.serializeObject(appSettings, AppSettingsFile)

2
EpcQrCodeRest/src/main/kotlin/net/codinux/banking/epcqrcode/rest/dto/GenerateEpcQrCodeRequestDto.kt
View File

@ -12,7 +12,7 @@ class GenerateEpcQrCodeRequestDto {
var iban: String = ""
var amount: Double? = null
var amount: String? = null
var reference: String? = null

10
EpcQrCodeiOSApp/EpcQrCodeiOSApp/ContentView.swift
View File

@ -82,21 +82,13 @@ struct ContentView: View {
private func generateQRCode() {
let creator = EpcQrCodeCreator()
let param = EpcQrCodeConfig(receiverName: receiver, iban: iban, bic: bic, amount: map(amount), reference: reference, noteToUser: nil, encoding: .utf8)
let param = EpcQrCodeConfig(receiverName: receiver, iban: iban, bic: bic, amount: amount, reference: reference, noteToUser: nil, encoding: .utf8)
let qrCodeContent = creator.generateAsString(param: param)
self.generatedQrCode = generateQRCode(qrCodeContent)
}
private func map(_ amount: String) -> KotlinDouble? {
if let double = Double(amount.replacingOccurrences(of: ",", with: ".")) {
return KotlinDouble(double: double)
}
return nil
}
private func generateQRCode(_ informationToEncode: String) -> UIImage? {
let writer = ZXQRCodeWriter()