Compare commits

...

2 Commits

5 changed files with 16 additions and 6 deletions

View File

@ -55,4 +55,14 @@ class BankAccessEntity(
bank.iconUrl, bank.wrongCredentialsEntered, bank.iconUrl, bank.wrongCredentialsEntered,
) )
override val accountsSorted: List<BankAccountEntity>
get() = accounts.sortedBy { it.displayIndex }
override val tanMethodsSorted: List<TanMethodEntity>
get() = tanMethods.sortedBy { it.identifier }
override val tanMediaSorted: List<TanMediumEntity>
get() = tanMedia.sortedBy { it.status }
} }

View File

@ -44,7 +44,7 @@ fun BanksList(
accountSelected?.invoke(bank, null) accountSelected?.invoke(bank, null)
} }
bank.accounts.sortedBy { it.displayIndex }.forEach { account -> bank.accountsSorted.forEach { account ->
NavigationMenuItem(itemModifier, account.displayName, textColor, iconSize, IconTextSpacing, itemHorizontalPadding, bankAccount = account) { NavigationMenuItem(itemModifier, account.displayName, textColor, iconSize, IconTextSpacing, itemHorizontalPadding, bankAccount = account) {
accountSelected?.invoke(bank, account) accountSelected?.invoke(bank, account)
} }

View File

@ -40,7 +40,7 @@ fun TransferMoneyDialog(
) { ) {
val banks = uiState.banks.value val banks = uiState.banks.value
val accountsToBank = banks.sortedBy { it.displayIndex } val accountsToBank = banks.sortedBy { it.displayIndex }
.flatMap { bank -> bank.accounts.sortedBy { it.displayIndex }.map { it to bank } }.toMap() .flatMap { bank -> bank.accountsSorted.map { it to bank } }.toMap()
val accountsSupportingTransferringMoney = banks.flatMap { it.accounts } val accountsSupportingTransferringMoney = banks.flatMap { it.accounts }
.filter { it.supportsMoneyTransfer } .filter { it.supportsMoneyTransfer }

View File

@ -56,7 +56,7 @@ fun BankSettingsScreen(bank: BankAccessEntity, onClosed: () -> Unit) {
SectionHeader("Konten") SectionHeader("Konten")
Column(Modifier.padding(top = 8.dp)) { Column(Modifier.padding(top = 8.dp)) {
bank.accounts.sortedBy { it.displayIndex }.forEach { account -> bank.accountsSorted.forEach { account ->
FormListItem(account.displayName, itemHeight = 42.dp) { FormListItem(account.displayName, itemHeight = 42.dp) {
DI.uiState.showBankAccountSettingsScreenForAccount.value = account DI.uiState.showBankAccountSettingsScreenForAccount.value = account
} }
@ -80,7 +80,7 @@ fun BankSettingsScreen(bank: BankAccessEntity, onClosed: () -> Unit) {
SectionHeader("TAN Verfahren") SectionHeader("TAN Verfahren")
Column(Modifier.padding(top = 8.dp)) { Column(Modifier.padding(top = 8.dp)) {
bank.tanMethods.sortedBy { it.identifier }.forEach { tanMethod -> bank.tanMethodsSorted.forEach { tanMethod ->
SelectableFormListItem(tanMethod.displayName, tanMethod == bank.selectedTanMethod, "TAN Verfahren ist ausgewähltes TAN Verfahren") SelectableFormListItem(tanMethod.displayName, tanMethod == bank.selectedTanMethod, "TAN Verfahren ist ausgewähltes TAN Verfahren")
} }
} }
@ -91,7 +91,7 @@ fun BankSettingsScreen(bank: BankAccessEntity, onClosed: () -> Unit) {
SectionHeader("TAN Medien") SectionHeader("TAN Medien")
Column(Modifier.padding(top = 8.dp)) { Column(Modifier.padding(top = 8.dp)) {
bank.tanMedia.sortedBy { it.status }.forEach { tanMedium -> bank.tanMediaSorted.forEach { tanMedium ->
SelectableFormListItem(tanMedium.displayName, tanMedium == bank.selectedTanMedium, "TAN Medium ist ausgewähltes TAN Medium") SelectableFormListItem(tanMedium.displayName, tanMedium == bank.selectedTanMedium, "TAN Medium ist ausgewähltes TAN Medium")
} }
} }

View File

@ -2,7 +2,7 @@
kotlin = "2.0.10" kotlin = "2.0.10"
kotlinx-coroutines = "1.8.1" kotlinx-coroutines = "1.8.1"
banking-client = "0.6.0" banking-client = "0.6.1-SNAPSHOT"
kcsv = "2.2.0" kcsv = "2.2.0"
kotlinx-serializable = "1.7.1" kotlinx-serializable = "1.7.1"