diff --git a/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt b/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt index 04687afa..fadc019c 100644 --- a/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt +++ b/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt @@ -70,7 +70,7 @@ open class BankAccount( override var hideAccount = false - override var updateAccountAutomatically = true + override var includeInAutomaticAccountsUpdate = true override var doNotShowStrikingFetchAllTransactionsView = false diff --git a/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt b/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt index f18bf7b9..582bf17c 100644 --- a/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt +++ b/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt @@ -36,7 +36,7 @@ open class BankAccountEntity( override var countDaysForWhichTransactionsAreKept: Int? = null, override var displayIndex: Int = 0, override var hideAccount: Boolean = false, - override var updateAccountAutomatically: Boolean = true, + override var includeInAutomaticAccountsUpdate: Boolean = true, override var doNotShowStrikingFetchAllTransactionsView: Boolean = false ) : IBankAccount { diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankAccountSettingsDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankAccountSettingsDialog.kt index b17831fe..c4470971 100644 --- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankAccountSettingsDialog.kt +++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankAccountSettingsDialog.kt @@ -44,10 +44,10 @@ open class BankAccountSettingsDialog : SettingsDialogBase() { edtxtBankAccountName.text = account.displayName - swtchHideAccount.setOnCheckedChangeListener { _, hideAccount -> swtchUpdateAccountAutomatically.isEnabled = hideAccount == false } + swtchHideAccount.setOnCheckedChangeListener { _, hideAccount -> swtchIncludeInAutomaticAccountsUpdate.isEnabled = hideAccount == false } swtchHideAccount.isChecked = account.hideAccount - swtchUpdateAccountAutomatically.isChecked = account.updateAccountAutomatically + swtchIncludeInAutomaticAccountsUpdate.isChecked = account.includeInAutomaticAccountsUpdate btnShareAccountData.setOnClickListener { shareAccountData() } @@ -110,13 +110,13 @@ open class BankAccountSettingsDialog : SettingsDialogBase() { override val hasUnsavedChanges: Boolean get() = didChange(edtxtBankAccountName, account.displayName) || swtchHideAccount.isChecked != account.hideAccount - || swtchUpdateAccountAutomatically.isChecked != account.updateAccountAutomatically + || swtchIncludeInAutomaticAccountsUpdate.isChecked != account.includeInAutomaticAccountsUpdate override fun saveChanges() { account.userSetDisplayName = edtxtBankAccountName.text account.hideAccount = swtchHideAccount.isChecked - account.updateAccountAutomatically = swtchUpdateAccountAutomatically.isChecked + account.includeInAutomaticAccountsUpdate = swtchIncludeInAutomaticAccountsUpdate.isChecked presenter.accountUpdated(account) } diff --git a/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_account_settings.xml b/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_account_settings.xml index 7698d993..221a4a57 100644 --- a/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_account_settings.xml +++ b/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_account_settings.xml @@ -76,10 +76,10 @@ /> diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml index 2b8d8771..b9e65f75 100644 --- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml +++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml @@ -157,7 +157,7 @@ Name Konto ausblenden - Konto automatisch updaten + Bei Kontoaktualisierung einbeziehen Kontodaten Kontoinhaber Kontonummer diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml index 5f6825f9..88b2292f 100644 --- a/ui/BankingAndroidApp/src/main/res/values/strings.xml +++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml @@ -157,7 +157,7 @@ Name Hide account - Update account automatically + Include in automatic updates Account data Account holder name Account identifier diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt index 29ddd48f..2093cd40 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt @@ -54,7 +54,7 @@ open class BankAccount @JvmOverloads constructor( override var hideAccount = false - override var updateAccountAutomatically = true + override var includeInAutomaticAccountsUpdate = true override var doNotShowStrikingFetchAllTransactionsView = false diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt index 7dad6461..29130a70 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt @@ -42,7 +42,7 @@ interface IBankAccount : OrderedDisplayable { * * However it still can be updated if navigated to that single account and call update there. */ - var updateAccountAutomatically: Boolean + var includeInAutomaticAccountsUpdate: Boolean /** * If there are still older transactions to fetch, that is [haveAllTransactionsBeenRetrieved] is [false], at a striking place, diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt index 13810298..36283929 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt @@ -363,7 +363,7 @@ open class BankingPresenter( } protected open fun considerAccountInAutomaticUpdates(account: TypedBankAccount): Boolean { - return account.updateAccountAutomatically + return account.includeInAutomaticAccountsUpdate && account.hideAccount == false && account.bank.wrongCredentialsEntered == false } diff --git a/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents b/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents index 561e16a0..b8f8f243 100644 --- a/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents +++ b/ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents @@ -55,6 +55,7 @@ + @@ -65,7 +66,6 @@ - diff --git a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings index d24a487e..5e5f13db 100644 --- a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings +++ b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings @@ -201,7 +201,7 @@ Unfortunately, Bankmeister cannot know whether a bank charges for real-time tran "Account holder name" = "Account holder name"; "Hide bank account" = "Hide account"; -"Update bank account automatically" = "Update account automatically"; +"Include in automatic accounts updates" = "Include in automatic updates"; "Bank account identifier" = "Account identifier"; "Sub account number" = "Sub account number"; diff --git a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings index 991eae41..5876d0c1 100644 --- a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings +++ b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings @@ -202,7 +202,7 @@ Ob eine Bank Gebühren für Echtzeitüberweisungen erhebt, kann Bankmeister leid "Account holder name" = "Kontoinhaber"; "Hide bank account" = "Konto ausblenden"; -"Update bank account automatically" = "Konto automatisch updaten"; +"Include in automatic accounts updates" = "Bei Kontoaktualisierung einbeziehen"; "Bank account identifier" = "Kontonummer"; "Sub account number" = "Unterkontenmerkmal"; diff --git a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift index 940b9aa2..cf41e5da 100644 --- a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift +++ b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift @@ -69,7 +69,7 @@ class Mapper { mapped.displayIndex = account.displayIndex mapped.hideAccount = account.hideAccount - mapped.updateAccountAutomatically = account.updateAccountAutomatically + mapped.includeInAutomaticAccountsUpdate = account.includeInAutomaticAccountsUpdate mapped.doNotShowStrikingFetchAllTransactionsView = account.doNotShowStrikingFetchAllTransactionsView mapped.bookedTransactions = map(mapped, account.transactions as? Set) @@ -111,7 +111,7 @@ class Mapper { mapped.displayIndex = account.displayIndex mapped.hideAccount = account.hideAccount - mapped.updateAccountAutomatically = account.updateAccountAutomatically + mapped.includeInAutomaticAccountsUpdate = account.includeInAutomaticAccountsUpdate mapped.doNotShowStrikingFetchAllTransactionsView = account.doNotShowStrikingFetchAllTransactionsView mapped.transactions = NSSet(array: map(mapped, account.bookedTransactions, context)) diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/BankAccountSettingsDialog.swift b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/BankAccountSettingsDialog.swift index 18f28946..a2e1df63 100644 --- a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/BankAccountSettingsDialog.swift +++ b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/BankAccountSettingsDialog.swift @@ -15,7 +15,7 @@ struct BankAccountSettingsDialog: View { @State private var hideAccount: Bool - @State private var updateAccountAutomatically: Bool + @State private var includeInAutomaticAccountsUpdate: Bool @State private var unsavedChangesMessage: Message? = nil @@ -23,7 +23,7 @@ struct BankAccountSettingsDialog: View { private var hasUnsavedData: Bool { return account.displayName != displayName || account.hideAccount != hideAccount - || account.updateAccountAutomatically != updateAccountAutomatically + || account.includeInAutomaticAccountsUpdate != includeInAutomaticAccountsUpdate } @@ -32,7 +32,7 @@ struct BankAccountSettingsDialog: View { _displayName = State(initialValue: account.displayName) _hideAccount = State(initialValue: account.hideAccount) - _updateAccountAutomatically = State(initialValue: account.updateAccountAutomatically) + _includeInAutomaticAccountsUpdate = State(initialValue: account.includeInAutomaticAccountsUpdate) } @@ -43,7 +43,7 @@ struct BankAccountSettingsDialog: View { Toggle("Hide bank account", isOn: $hideAccount) - Toggle("Update bank account automatically", isOn: $updateAccountAutomatically) + Toggle("Include in automatic accounts updates", isOn: $includeInAutomaticAccountsUpdate) .disabled(hideAccount) } @@ -159,7 +159,7 @@ struct BankAccountSettingsDialog: View { account.userSetDisplayName = displayName account.hideAccount = hideAccount - account.updateAccountAutomatically = updateAccountAutomatically + account.includeInAutomaticAccountsUpdate = includeInAutomaticAccountsUpdate presenter.accountUpdated(account: account) }