From 74d30df248608783d56013a6206686d054ad595b Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Mon, 28 Sep 2020 16:58:26 +0200
Subject: [PATCH] Implemented displaying bank and bank account data

---
 .../settings/BankAccountSettingsDialog.kt     |  6 +++
 .../dialogs/settings/BankSettingsDialog.kt    |  5 ++
 .../main/res/layout/dialog_add_account.xml    |  1 +
 .../layout/dialog_bank_account_settings.xml   | 51 +++++++++++++++++++
 .../main/res/layout/dialog_bank_settings.xml  | 47 ++++++++++++++++-
 .../res/layout/view_form_section_title.xml    |  1 -
 .../src/main/res/values-de/strings.xml        | 12 +++++
 .../src/main/res/values/dimens.xml            |  5 +-
 .../src/main/res/values/strings.xml           | 12 +++++
 .../Base.lproj/Localizable.strings            |  2 +-
 10 files changed, 137 insertions(+), 5 deletions(-)

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 6fc2d7b9..b4783fdd 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
@@ -43,6 +43,12 @@ open class BankAccountSettingsDialog : SettingsDialogBase() {
             }
 
             edtxtBankAccountName.text = account.displayName
+
+            lvlAccountHolderName.value = account.accountHolderName
+            lvlAccountIdentifier.value = account.identifier
+            lvlSubAccountNumber.setValueAndVisibilityIfValueIsSet(account.subAccountNumber)
+            lvlIban.setValueAndVisibilityIfValueIsSet(account.iban)
+            lvlAccountType.value = account.type.toString() // TODO: translate
         }
     }
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankSettingsDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankSettingsDialog.kt
index 5483ee52..e1a97d33 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankSettingsDialog.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/settings/BankSettingsDialog.kt
@@ -65,6 +65,11 @@ open class BankSettingsDialog : SettingsDialogBase() {
             bankAccountsAdapter.onClickListener = { navigationToBankAccountSettingsDialog(it.account) }
             bankAccountsAdapter.itemDropped = { oldPosition, oldItem, newPosition, newItem -> reorderedBankAccounts(oldPosition, oldItem.account, newPosition, newItem.account) }
 
+            lvlBankCode.value = bank.bankCode
+            lvlBic.value = bank.bic
+            lvlCustomerName.value = bank.customerName
+            lvlFinTsServerAddress.value = bank.finTsServerAddress
+
             btnDeleteAccount.setOnClickListener { askUserToDeleteAccount() }
         }
     }
diff --git a/ui/BankingAndroidApp/src/main/res/layout/dialog_add_account.xml b/ui/BankingAndroidApp/src/main/res/layout/dialog_add_account.xml
index 4b2db192..e0661c54 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/dialog_add_account.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/dialog_add_account.xml
@@ -19,6 +19,7 @@
     <net.dankito.banking.ui.android.views.FormSectionTitle
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/form_section_title_margin_bottom_for_subsequent_edit_text"
         android:text="@string/online_banking_credentials_section_title"
         />
 
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 81c03829..076b2f7d 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
@@ -63,6 +63,57 @@
 
             </LinearLayout>
 
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <net.dankito.banking.ui.android.views.FormSectionTitle
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dialog_bank_account_settings_account_data_section_title"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlAccountHolderName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/dialog_bank_account_setting_account_holder_name"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlAccountIdentifier"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/dialog_bank_account_setting_bank_account_identifier"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlSubAccountNumber"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/dialog_bank_account_setting_sub_account_number"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlIban"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/iban"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlAccountType"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/dialog_bank_account_setting_bank_account_type"
+                    />
+
+            </LinearLayout>
+
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_settings.xml b/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_settings.xml
index f46f8768..1fbdcd0d 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_settings.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/dialog_bank_settings.xml
@@ -65,6 +65,7 @@
                 <net.dankito.banking.ui.android.views.FormSectionTitle
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/form_section_title_margin_bottom_for_subsequent_edit_text"
                     android:text="@string/online_banking_credentials_section_title"
                     />
 
@@ -92,7 +93,50 @@
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dialog_bank_settings_bank_accounts_section_margin_bottom"
+                >
+
+                <net.dankito.banking.ui.android.views.FormSectionTitle
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/dialog_bank_settings_bank_data_section_title"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlBankCode"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/bank_code"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlBic"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/bic"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlCustomerName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/customer_name"
+                    />
+
+                <net.dankito.banking.ui.android.views.FormLabelledValue
+                    android:id="@+id/lvlFinTsServerAddress"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:label="@string/fints_server_address"
+                    />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/form_section_extra_margin_top"
                 >
 
                 <net.dankito.banking.ui.android.views.FormSectionTitle
@@ -114,6 +158,7 @@
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dialog_bank_settings_delete_account_margin_top"
                 android:gravity="center"
                 >
 
diff --git a/ui/BankingAndroidApp/src/main/res/layout/view_form_section_title.xml b/ui/BankingAndroidApp/src/main/res/layout/view_form_section_title.xml
index 57233feb..0a1b91fb 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/view_form_section_title.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/view_form_section_title.xml
@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/form_section_title_margin_top"
-        android:layout_marginBottom="@dimen/form_section_title_margin_bottom"
         android:textSize="@dimen/form_section_title_text_size"
         android:textColor="@color/colorPrimary"
         />
diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
index b307a10d..29fa05af 100644
--- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml
@@ -22,6 +22,12 @@
     <string name="accounts">Konten</string>
     <string name="bank_credentials">Bankzugänge</string>
 
+    <string name="bank_code">Bankleitzahl</string>
+    <string name="bic">BIC</string>
+    <string name="iban">IBAN</string>
+    <string name="customer_name">Kontoinhaber</string>
+    <string name="fints_server_address">FinTS Server</string>
+
     <string name="navigation_drawer_open">Seitenleiste öffnen</string>
     <string name="navigation_drawer_close">Seitenleiste schließen</string>
     <string name="nav_header_title">@string/app_name</string>
@@ -104,9 +110,15 @@
 
 
     <string name="dialog_bank_settings_bank_name">Name</string>
+    <string name="dialog_bank_settings_bank_data_section_title">Bankdaten</string>
     <string name="dialog_bank_settings_delete_account">Konto löschen</string>
 
     <string name="dialog_bank_account_settings_account_name">Name</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>
+    <string name="dialog_bank_account_setting_sub_account_number">Unterkontenmerkmal</string>
+    <string name="dialog_bank_account_setting_bank_account_type">Typ</string>
 
 
     <string name="alert_ask_discard_changes_title">Nicht gespeicherte Änderungen</string>
diff --git a/ui/BankingAndroidApp/src/main/res/values/dimens.xml b/ui/BankingAndroidApp/src/main/res/values/dimens.xml
index ef4437d3..d6793aa5 100644
--- a/ui/BankingAndroidApp/src/main/res/values/dimens.xml
+++ b/ui/BankingAndroidApp/src/main/res/values/dimens.xml
@@ -19,6 +19,7 @@
     <dimen name="form_padding">12dp</dimen>
     <dimen name="form_section_height">60dp</dimen>
     <dimen name="form_section_margin_top">6dp</dimen>
+    <dimen name="form_section_extra_margin_top">8dp</dimen>
     <dimen name="form_section_margin_bottom">6dp</dimen>
     <dimen name="form_section_title_text_size">15sp</dimen>
     <dimen name="form_section_title_margin_top">18dp</dimen>
@@ -158,10 +159,10 @@
     <dimen name="list_item_bank_data_icon_margin_right">8dp</dimen>
     <dimen name="list_item_bank_data_bank_name_text_size">16sp</dimen>
 
-    <dimen name="dialog_bank_settings_bank_accounts_section_margin_bottom">18dp</dimen>
+    <dimen name="dialog_bank_settings_delete_account_margin_top">18dp</dimen>
     <dimen name="dialog_bank_settings_delete_account_button_height">50dp</dimen>
 
-    <dimen name="list_item_draggable_bank_account_height">35dp</dimen>
+    <dimen name="list_item_draggable_bank_account_height">32dp</dimen>
     <dimen name="list_item_draggable_bank_account_padding">2dp</dimen>
     <dimen name="list_item_draggable_bank_account_account_name_text_size">16sp</dimen>
 
diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml
index a20eb531..6664100a 100644
--- a/ui/BankingAndroidApp/src/main/res/values/strings.xml
+++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml
@@ -22,6 +22,12 @@
     <string name="accounts">Accounts</string>
     <string name="bank_credentials">Bank credentials</string>
 
+    <string name="bank_code">Bank code</string>
+    <string name="bic">BIC</string>
+    <string name="iban">IBAN</string>
+    <string name="customer_name">Customer name</string>
+    <string name="fints_server_address">FinTS server</string>
+
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_title">@string/app_name</string>
@@ -104,9 +110,15 @@
 
 
     <string name="dialog_bank_settings_bank_name">Name</string>
+    <string name="dialog_bank_settings_bank_data_section_title">Bank data</string>
     <string name="dialog_bank_settings_delete_account">Delete account</string>
 
     <string name="dialog_bank_account_settings_account_name">Name</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>
+    <string name="dialog_bank_account_setting_sub_account_number">Sub account number</string>
+    <string name="dialog_bank_account_setting_bank_account_type">Type</string>
 
 
     <string name="alert_ask_discard_changes_title">Unsaved changed</string>
diff --git a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
index 11870e70..31f5b823 100644
--- a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
+++ b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings
@@ -164,7 +164,7 @@ Unfortunately, Bankmeister cannot know whether a bank charges for real-time tran
 "Credentials" = "Credentials";
 
 "Customer name" = "Customer name";
-"FinTS server address" = "FinTS server address";
+"FinTS server address" = "FinTS server";
 
 "Delete account" = "Delete account";