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

Renamed updateAccountAutomatically to includeInAutomaticAccountsUpdate

This commit is contained in:
dankito 2020-10-17 01:56:10 +02:00
parent dd604fd064
commit 29bbe298f3
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt
View File

@ -70,7 +70,7 @@ open class BankAccount(
override var hideAccount = false
override var updateAccountAutomatically = true
override var includeInAutomaticAccountsUpdate = true
override var doNotShowStrikingFetchAllTransactionsView = false

2
persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt
View File

@ -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<AccountTransactionEntity> {

8
ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankAccountSettingsDialog.kt
View File

@ -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)
}

4
ui/BankingAndroidApp/src/main/res/layout/dialog_bank_account_settings.xml
View File

@ -76,10 +76,10 @@
/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swtchUpdateAccountAutomatically"
android:id="@+id/swtchIncludeInAutomaticAccountsUpdate"
style="@style/FormSwitchStyle"
android:checked="false"
android:text="@string/dialog_bank_account_settings_update_automatically"
android:text="@string/dialog_bank_account_settings_include_in_automatic_accounts_updates"
/>
</LinearLayout>

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

@ -157,7 +157,7 @@
<string name="dialog_bank_account_settings_account_name">Name</string>
<string name="dialog_bank_account_settings_hide_account">Konto ausblenden</string>
<string name="dialog_bank_account_settings_update_automatically">Konto automatisch updaten</string>
<string name="dialog_bank_account_settings_include_in_automatic_accounts_updates">Bei Kontoaktualisierung einbeziehen</string>
<string name="dialog_bank_account_settings_account_data_section_title">Kontodaten</string>
<string name="dialog_bank_account_setting_account_holder_name">Kontoinhaber</string>
<string name="dialog_bank_account_setting_bank_account_identifier">Kontonummer</string>

2
ui/BankingAndroidApp/src/main/res/values/strings.xml
View File

@ -157,7 +157,7 @@
<string name="dialog_bank_account_settings_account_name">Name</string>
<string name="dialog_bank_account_settings_hide_account">Hide account</string>
<string name="dialog_bank_account_settings_update_automatically">Update account automatically</string>
<string name="dialog_bank_account_settings_include_in_automatic_accounts_updates">Include in automatic updates</string>
<string name="dialog_bank_account_settings_account_data_section_title">Account data</string>
<string name="dialog_bank_account_setting_account_holder_name">Account holder name</string>
<string name="dialog_bank_account_setting_bank_account_identifier">Account identifier</string>

2
ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt
View File

@ -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

2
ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt
View File

@ -42,7 +42,7 @@ interface IBankAccount<TTransaction: IAccountTransaction> : 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,

2
ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt
View File

@ -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
}

2
ui/BankingiOSApp/BankingiOSApp/BankingiOSApp.xcdatamodeld/BankingiOSApp.xcdatamodel/contents
View File

@ -55,6 +55,7 @@
<attribute name="hideAccount" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="iban" optional="YES" attributeType="String"/>
<attribute name="identifier" attributeType="String"/>
<attribute name="includeInAutomaticAccountsUpdate" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="isAccountTypeSupportedByApplication" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="productName" optional="YES" attributeType="String"/>
<attribute name="retrievedTransactionsFromOn" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
@ -65,7 +66,6 @@
<attribute name="supportsRetrievingBalance" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="supportsTransferringMoney" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="type" attributeType="String"/>
<attribute name="updateAccountAutomatically" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
<attribute name="userSetDisplayName" optional="YES" attributeType="String"/>
<relationship name="bank" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PersistedBankData" inverseName="accounts" inverseEntity="PersistedBankData"/>
<relationship name="transactions" toMany="YES" deletionRule="Cascade" destinationEntity="PersistedAccountTransaction" inverseName="account" inverseEntity="PersistedAccountTransaction"/>

2
ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
View File

@ -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";

2
ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings
View File

@ -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";

4
ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
View File

@ -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<PersistedAccountTransaction>)
@ -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))

10
ui/BankingiOSApp/BankingiOSApp/ui/dialogs/BankAccountSettingsDialog.swift
View File

@ -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)
}