From 3f0c87572fbb42c454cc9376f9fdce3c05277728 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 4 Aug 2018 16:02:17 +0200
Subject: [PATCH] adjust the Recent Calls items, show phone number only when
 appropriate

---
 app/build.gradle                              |  1 +
 .../contacts/adapters/RecentCallsAdapter.kt   |  4 ++-
 app/src/main/res/layout/item_recent_call.xml  | 28 +++++++++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 21f30e97..51461aae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     implementation 'com.simplemobiletools:commons:4.5.17'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt
index 7c216264..d380cd05 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/RecentCallsAdapter.kt
@@ -9,12 +9,14 @@ import com.simplemobiletools.commons.views.FastScroller
 import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.contacts.R
 import com.simplemobiletools.contacts.activities.SimpleActivity
+import com.simplemobiletools.contacts.extensions.config
 import com.simplemobiletools.contacts.models.RecentCall
 import kotlinx.android.synthetic.main.item_recent_call.view.*
 import java.util.*
 
 class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<RecentCall>, recyclerView: MyRecyclerView, fastScroller: FastScroller,
                          itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
+    val showPhoneNumbers = activity.config.showPhoneNumbers
 
     init {
         setupDragListener(true)
@@ -65,7 +67,7 @@ class RecentCallsAdapter(activity: SimpleActivity, var recentCalls: ArrayList<Re
             }
 
             recent_call_number.apply {
-                beVisibleIf(recentCall.name != null)
+                beVisibleIf(showPhoneNumbers && recentCall.name != null)
                 text = recentCall.number
                 setTextColor(textColor)
             }
diff --git a/app/src/main/res/layout/item_recent_call.xml b/app/src/main/res/layout/item_recent_call.xml
index f0419568..61334288 100644
--- a/app/src/main/res/layout/item_recent_call.xml
+++ b/app/src/main/res/layout/item_recent_call.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recent_call_frame"
     android:layout_width="match_parent"
@@ -10,7 +11,7 @@
     android:focusable="true"
     android:foreground="@drawable/selector">
 
-    <RelativeLayout
+    <android.support.constraint.ConstraintLayout
         android:id="@+id/recent_call_holder"
         android:layout_width="match_parent"
         android:layout_height="@dimen/contact_item_height"
@@ -20,33 +21,42 @@
 
         <TextView
             android:id="@+id/recent_call_name"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
+            android:paddingRight="@dimen/activity_margin"
             android:textSize="@dimen/big_text_size"
+            app:layout_constraintBottom_toTopOf="@+id/recent_call_number"
+            app:layout_constraintEnd_toStartOf="@+id/recent_call_date_time"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="John Doe"/>
 
         <TextView
             android:id="@+id/recent_call_number"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_below="@+id/recent_call_name"
-            android:layout_toLeftOf="@+id/recent_call_date_time"
             android:maxLines="1"
             android:textSize="@dimen/bigger_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/recent_call_date_time"
+            app:layout_constraintStart_toStartOf="parent"
             tools:text="0123 456 789"/>
 
         <TextView
             android:id="@+id/recent_call_date_time"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/recent_call_name"
-            android:gravity="right"
+            android:layout_height="match_parent"
+            android:gravity="center"
             android:maxLines="1"
             android:textSize="@dimen/normal_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_editor_absoluteY="0dp"
             tools:text="Yesterday, 17:00"/>
 
-    </RelativeLayout>
+    </android.support.constraint.ConstraintLayout>
 </FrameLayout>