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

Implemented displaying that a value has to be entered

This commit is contained in:
dankito 2020-04-23 13:53:28 +02:00
parent e880532cc5
commit 1dce92ec30
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
View File

@ -248,8 +248,15 @@ open class TransferMoneyDialog : DialogFragment() {
lytRemitteeName.error = null
}
else {
lytRemitteeName.error = context?.getString(R.string.error_invalid_sepa_characters_entered,
inputValidator.getInvalidSepaCharacters(edtxtRemitteeName.text.toString()))
val enteredName = edtxtRemitteeName.text.toString()
if (enteredName.isEmpty()) {
lytRemitteeName.error = context?.getString(R.string.error_no_name_entered)
}
else {
lytRemitteeName.error = context?.getString(
R.string.error_invalid_sepa_characters_entered, inputValidator.getInvalidSepaCharacters(enteredName))
}
}
}
@ -266,6 +273,9 @@ open class TransferMoneyDialog : DialogFragment() {
if (isRemitteeIbanValid()) {
lytRemitteeIban.error = null
}
else if (enteredIban.isBlank()) {
lytRemitteeIban.error = context?.getString(R.string.error_no_iban_entered)
}
else {
val invalidIbanCharacters = inputValidator.getInvalidIbanCharacters(enteredIban)
if (invalidIbanCharacters.isNotEmpty()) {
@ -318,6 +328,9 @@ open class TransferMoneyDialog : DialogFragment() {
if (isAmountGreaterZero()) {
lytAmount.error = null
}
else if (edtxtAmount.text.toString().isBlank()) {
lytAmount.error = context?.getString(R.string.error_no_amount_entered)
}
else {
lytAmount.error = context?.getString(R.string.error_invalid_amount_entered)
}

2
fints4javaAndroidApp/src/main/res/values-de/strings.xml
View File

@ -89,7 +89,9 @@
\n\nDies kann nicht rückgängig gemacht werden und die hierzu gespeicherten Daten gehen unwiederbringlich verloren.</string>
<string name="error_no_name_entered">Bitte geben Sie den Namen des Empfängers ein</string>
<string name="error_invalid_sepa_characters_entered">Unzulässige(s) Zeichen eingegeben: %s</string>
<string name="error_no_iban_entered">Bitte geben Sie die IBAN des Empfängers ein</string>
<string name="error_invalid_iban_characters_entered">Unzulässige(s) Zeichen eingegeben: %s</string>
<string name="error_invalid_iban_pattern_entered">IBANs bestehen aus folgendem Muster: DE12 1234 5678 9012 3456 78</string>
<string name="error_no_bank_found_for_entered_iban">Es wurde keine Bank zur eingegebenen IBAN gefunden.</string>

2
fints4javaAndroidApp/src/main/res/values/strings.xml
View File

@ -89,7 +89,9 @@
\n\nThis cannot be undone and data will be lost.</string>
<string name="error_no_name_entered">Please enter remittee\'s name</string>
<string name="error_invalid_sepa_characters_entered">Invalid character(s) entered: %s</string>
<string name="error_no_iban_entered">Please enter remittee\'s IBAN</string>
<string name="error_invalid_iban_characters_entered">Invalid character(s) entered: %s</string>
<string name="error_invalid_iban_pattern_entered">IBAN has to have pattern: EN12 1234 5678 9012 3456 78</string>
<string name="error_no_bank_found_for_entered_iban">No bank found for entered IBAN.</string>