From 8f24802a55cfa5bf91f3cb12369b92600d4edc41 Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Wed, 16 Sep 2020 03:20:41 +0200
Subject: [PATCH] Implemented also displaying BIC in remittee search result
 list

---
 .../ui/android/adapter/RemitteeListAdapter.kt |  4 ++-
 .../adapter/viewholder/RemitteeViewHolder.kt  |  2 ++
 .../main/res/layout/list_item_remittee.xml    | 32 +++++++++++++++----
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt
index cd0b7658..6a489f26 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt
@@ -20,7 +20,9 @@ open class RemitteeListAdapter(protected val itemClicked: ((Remittee) -> Unit)?
 
         viewHolder.txtvwRemitteeBankName.text = item.bankName
 
-        viewHolder.txtvwRemitteeBankCode.text = item.iban
+        viewHolder.txtvwRemitteeAccountId.text = item.iban
+
+        viewHolder.txtvwRemitteeBankCode.text = item.bic
 
         viewHolder.itemView.setOnClickListener {
             itemClicked?.invoke(item)
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt
index bc05b78a..6d445cfe 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt
@@ -12,6 +12,8 @@ open class RemitteeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView
 
     val txtvwRemitteeBankName: TextView = itemView.txtvwRemitteeBankName
 
+    val txtvwRemitteeAccountId: TextView = itemView.txtvwRemitteeAccountId
+
     val txtvwRemitteeBankCode: TextView = itemView.txtvwRemitteeBankCode
 
 }
\ No newline at end of file
diff --git a/ui/BankingAndroidApp/src/main/res/layout/list_item_remittee.xml b/ui/BankingAndroidApp/src/main/res/layout/list_item_remittee.xml
index 8f7acb4f..554b782a 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/list_item_remittee.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/list_item_remittee.xml
@@ -31,15 +31,35 @@
         android:textColor="@color/textColorSecondary"
         />
 
-    <TextView
-        android:id="@+id/txtvwRemitteeBankCode"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/list_item_remittee_space_between_fields"
         android:layout_marginBottom="@dimen/list_item_remittee_bank_code_margin_bottom"
-        android:gravity="center_vertical"
-        style="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/textColorSecondary"
-        />
+        >
+
+        <TextView
+            android:id="@+id/txtvwRemitteeAccountId"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:gravity="center_vertical"
+            style="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/textColorSecondary"
+            />
+
+        <TextView
+            android:id="@+id/txtvwRemitteeBankCode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:gravity="center_vertical|end"
+            style="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/textColorSecondary"
+            />
+
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file