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

Implemented validating data if preselectedValues is set and therefore enabling btnTransferMoney if so

This commit is contained in:
dankito 2020-09-02 17:37:30 +02:00
parent 92456604bb
commit 771ec1b7f1
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/TransferMoneyDialog.kt
View File

@ -105,8 +105,6 @@ open class TransferMoneyDialog : DialogFragment() {
} }
protected open fun setupUI(rootView: View) { protected open fun setupUI(rootView: View) {
setPreselectedValues(rootView)
val allBankAccountsSupportingTransferringMoney = presenter.bankAccountsSupportingTransferringMoney val allBankAccountsSupportingTransferringMoney = presenter.bankAccountsSupportingTransferringMoney
bankAccount = preselectedValues?.account ?: allBankAccountsSupportingTransferringMoney.first() bankAccount = preselectedValues?.account ?: allBankAccountsSupportingTransferringMoney.first()
@ -133,7 +131,9 @@ open class TransferMoneyDialog : DialogFragment() {
tryToGetBicFromIban(it) tryToGetBicFromIban(it)
}) })
rootView.edtxtAmount.addTextChangedListener(checkRequiredDataWatcher()) rootView.edtxtAmount.addTextChangedListener(checkRequiredDataWatcher {
checkIfEnteredAmountIsValid()
})
rootView.edtxtUsage.addTextChangedListener(checkRequiredDataWatcher { rootView.edtxtUsage.addTextChangedListener(checkRequiredDataWatcher {
checkIfEnteredUsageTextIsValid() checkIfEnteredUsageTextIsValid()
}) })
@ -202,36 +202,42 @@ open class TransferMoneyDialog : DialogFragment() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
tryToGetBicFromIban(edtxtRemitteeIban.text.toString()) setPreselectedValues()
if (remitteeBic != null) {
tryToGetBicFromIban(edtxtRemitteeIban.text.toString())
}
} }
protected open fun setPreselectedValues(rootView: View) { protected open fun setPreselectedValues() {
preselectedValues?.let { data -> preselectedValues?.let { data ->
rootView.edtxtRemitteeName.setText(data.creditorName) preselectedValues = null
edtxtRemitteeName.setText(data.creditorName)
if (data.creditorIban.isNotBlank()) { // set only if creditorIban has a value as otherwise creditorBic would be overridden by empty search result if (data.creditorIban.isNotBlank()) { // set only if creditorIban has a value as otherwise creditorBic would be overridden by empty search result
rootView.edtxtRemitteeIban.setText(data.creditorIban) edtxtRemitteeIban.setText(data.creditorIban)
} }
// a little bit inconsistent as if IBAN is not set bank's name won't be displayed even though it can be retrieved by BIC // a little bit inconsistent as if IBAN is not set bank's name won't be displayed even though it can be retrieved by BIC
remitteeBic = data.creditorBic remitteeBic = data.creditorBic
if (data.amount > BigDecimal.ZERO) { if (data.amount > BigDecimal.ZERO) {
rootView.edtxtAmount.setText(AmountFormat.format(data.amount)) edtxtAmount.setText(AmountFormat.format(data.amount))
} }
focusEditTextAccordingToPreselectedValues(rootView, data) focusEditTextAccordingToPreselectedValues(data)
} }
} }
protected open fun focusEditTextAccordingToPreselectedValues(rootView: View, data: TransferMoneyData) { protected open fun focusEditTextAccordingToPreselectedValues(data: TransferMoneyData) {
if (data.creditorName.trim().isNotEmpty()) { if (data.creditorName.trim().isNotEmpty()) {
if (data.creditorIban.trim().isNotEmpty()) { if (data.creditorIban.trim().isNotEmpty()) {
rootView.edtxtAmount.requestFocus() edtxtAmount.requestFocus()
} }
else { else {
rootView.edtxtRemitteeIban.requestFocus() edtxtRemitteeIban.requestFocus()
} }
} }
} }