From c72a3cd604942431718233c2e84d6d43649b9236 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 29 Jan 2018 17:42:24 +0100
Subject: [PATCH] make sure the contact list items have proper height even
 without thumbnail

---
 .../simplemobiletools/contacts/adapters/ContactsAdapter.kt    | 4 ++++
 app/src/main/res/layout/item_contact_with_number.xml          | 3 ++-
 app/src/main/res/layout/item_contact_without_number.xml       | 4 +---
 app/src/main/res/values/dimens.xml                            | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index 2d4d265c..178ace72 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -36,6 +36,8 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     var startNameWithSurname: Boolean
     var showContactThumbnails: Boolean
     var showPhoneNumbers: Boolean
+    var smallPadding = activity.resources.getDimension(R.dimen.small_margin).toInt()
+    var bigPadding = activity.resources.getDimension(R.dimen.normal_margin).toInt()
 
     init {
         initDrawables()
@@ -190,8 +192,10 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
         view.apply {
             contact_name.text = contact.getFullName(startNameWithSurname)
             contact_name.setTextColor(textColor)
+            contact_name.setPadding(if (showContactThumbnails) smallPadding else bigPadding, smallPadding, 0, 0)
             contact_number?.text = contact.phoneNumbers.firstOrNull()?.value ?: ""
             contact_number?.setTextColor(textColor)
+            contact_number?.setPadding(if (showContactThumbnails) smallPadding else bigPadding, 0, 0, 0)
             contact_tmb.beVisibleIf(showContactThumbnails)
 
             if (showContactThumbnails) {
diff --git a/app/src/main/res/layout/item_contact_with_number.xml b/app/src/main/res/layout/item_contact_with_number.xml
index 7e982ee7..bce7b037 100644
--- a/app/src/main/res/layout/item_contact_with_number.xml
+++ b/app/src/main/res/layout/item_contact_with_number.xml
@@ -13,7 +13,7 @@
     <RelativeLayout
         android:id="@+id/contact_holder"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/contact_item_height"
         android:paddingRight="@dimen/activity_margin">
 
         <ImageView
@@ -40,6 +40,7 @@
             android:id="@+id/contact_number"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/contact_name"
             android:layout_below="@+id/contact_name"
             android:layout_toRightOf="@+id/contact_tmb"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/item_contact_without_number.xml b/app/src/main/res/layout/item_contact_without_number.xml
index f7de65da..b87ca0a2 100644
--- a/app/src/main/res/layout/item_contact_without_number.xml
+++ b/app/src/main/res/layout/item_contact_without_number.xml
@@ -26,9 +26,7 @@
         <TextView
             android:id="@+id/contact_name"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/contact_tmb"
-            android:layout_alignTop="@+id/contact_tmb"
+            android:layout_height="@dimen/contact_item_height"
             android:layout_toRightOf="@+id/contact_tmb"
             android:ellipsize="end"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2cb204b0..bb8f1a28 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,4 +3,5 @@
     <dimen name="contact_photo_size">80dp</dimen>
     <dimen name="contact_actions_size">45dp</dimen>
     <dimen name="contact_icons_size">40dp</dimen>
+    <dimen name="contact_item_height">48dp</dimen>
 </resources>