From e26cbca59d328e3bbabaf07f4d42ed7152eb5480 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 6 Jul 2022 17:27:42 +0200
Subject: [PATCH] fix duration displaying at the Show call details dialog

---
 .../dialer/adapters/RecentCallsAdapter.kt     |  4 ++
 app/src/main/res/layout/item_recent_call.xml  | 60 ++++++++++---------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
index f7492031..12b11b31 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
@@ -41,6 +41,7 @@ class RecentCallsAdapter(
     private val areMultipleSIMsAvailable = activity.areMultipleSIMsAvailable()
     private val redColor = resources.getColor(R.color.md_red_700)
     private var textToHighlight = ""
+    private var durationPadding = resources.getDimension(R.dimen.normal_margin).toInt()
 
     init {
         initDrawables()
@@ -299,6 +300,9 @@ class RecentCallsAdapter(
                 setTextColor(textColor)
                 beVisibleIf(call.type != Calls.MISSED_TYPE && call.type != Calls.REJECTED_TYPE && call.duration > 0)
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 0.8f)
+                if (!showOverflowMenu) {
+                    item_recents_duration.setPadding(0, 0, durationPadding, 0)
+                }
             }
 
             item_recents_sim_image.beVisibleIf(areMultipleSIMsAvailable && call.simID != -1)
diff --git a/app/src/main/res/layout/item_recent_call.xml b/app/src/main/res/layout/item_recent_call.xml
index fe08f86e..9e6d371c 100644
--- a/app/src/main/res/layout/item_recent_call.xml
+++ b/app/src/main/res/layout/item_recent_call.xml
@@ -1,5 +1,6 @@
 <?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/item_recents_frame"
     android:layout_width="match_parent"
@@ -9,7 +10,7 @@
     android:focusable="true"
     android:foreground="@drawable/selector">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/item_recents_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -24,69 +25,72 @@
             android:layout_marginStart="@dimen/small_margin"
             android:layout_marginEnd="@dimen/small_margin"
             android:padding="@dimen/small_margin"
-            android:src="@drawable/ic_person_vector" />
+            android:src="@drawable/ic_person_vector"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/item_recents_name"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="0dp"
-            android:layout_toStartOf="@+id/overflow_menu_icon"
-            android:layout_toEndOf="@+id/item_recents_image"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="@dimen/bigger_text_size"
+            app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
+            app:layout_constraintStart_toEndOf="@+id/item_recents_image"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="John Doe" />
 
         <ImageView
             android:id="@+id/item_recents_sim_image"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/item_recents_date_time"
-            android:layout_alignBottom="@+id/item_recents_date_time"
-            android:layout_toEndOf="@+id/item_recents_image"
             android:alpha="0.6"
             android:paddingTop="@dimen/tiny_margin"
             android:paddingBottom="@dimen/tiny_margin"
             android:src="@drawable/ic_sim_vector"
-            android:visibility="gone" />
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
+            app:layout_constraintStart_toEndOf="@+id/item_recents_image"
+            app:layout_constraintTop_toTopOf="@+id/item_recents_date_time" />
 
         <TextView
             android:id="@+id/item_recents_sim_id"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_alignStart="@+id/item_recents_sim_image"
-            android:layout_alignTop="@+id/item_recents_sim_image"
-            android:layout_alignEnd="@+id/item_recents_sim_image"
-            android:layout_alignBottom="@+id/item_recents_sim_image"
             android:gravity="center"
             android:textColor="@color/md_grey_black"
             android:textSize="@dimen/small_text_size"
             android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/item_recents_sim_image"
+            app:layout_constraintEnd_toEndOf="@+id/item_recents_sim_image"
+            app:layout_constraintStart_toStartOf="@+id/item_recents_sim_image"
+            app:layout_constraintTop_toTopOf="@+id/item_recents_sim_image"
             tools:text="1" />
 
         <ImageView
             android:id="@+id/item_recents_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/item_recents_date_time"
-            android:layout_alignBottom="@+id/item_recents_date_time"
-            android:layout_toEndOf="@+id/item_recents_sim_image"
             android:alpha="0.6"
             android:paddingTop="@dimen/one_dp"
             android:paddingBottom="@dimen/one_dp"
             android:scaleType="fitStart"
-            android:src="@drawable/ic_incoming_call_vector" />
+            android:src="@drawable/ic_incoming_call_vector"
+            app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
+            app:layout_constraintStart_toEndOf="@+id/item_recents_sim_image"
+            app:layout_constraintTop_toTopOf="@+id/item_recents_date_time" />
 
         <TextView
             android:id="@+id/item_recents_date_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/item_recents_name"
-            android:layout_toEndOf="@+id/item_recents_type"
             android:alpha="0.6"
             android:maxLines="1"
             android:textSize="@dimen/normal_text_size"
+            app:layout_constraintStart_toEndOf="@+id/item_recents_type"
+            app:layout_constraintTop_toBottomOf="@+id/item_recents_name"
             tools:text="0123 456 789" />
 
         <TextView
@@ -95,11 +99,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/item_recents_name"
             android:layout_marginEnd="0dp"
-            android:layout_toStartOf="@+id/overflow_menu_icon"
-            android:layout_toEndOf="@+id/item_recents_date_time"
             android:alpha="0.6"
             android:gravity="end"
             android:textSize="@dimen/normal_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
             tools:text="00:10" />
 
         <ImageView
@@ -107,14 +111,16 @@
             style="@style/OverflowMenuIconStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <View
             android:id="@+id/overflow_menu_anchor"
             style="@style/OverflowMenuAnchorStyle"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true" />
-    </RelativeLayout>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>