From ecc2c18f4dabc442ca14607ec0c2cfe3e2fe4116 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sat, 19 Nov 2022 01:34:46 +0530
Subject: [PATCH] Avoid overlapping views

Also removed the unnecessary parent layout
---
 .../dialer/adapters/RecentCallsAdapter.kt     |   2 +-
 app/src/main/res/layout/item_recent_call.xml  | 227 +++++++++---------
 2 files changed, 114 insertions(+), 115 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 98a01cea..66de686f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
@@ -274,7 +274,7 @@ class RecentCallsAdapter(
 
     private fun setupView(view: View, call: RecentCall) {
         view.apply {
-            item_recents_frame.isSelected = selectedKeys.contains(call.id)
+            item_recents_holder.isSelected = selectedKeys.contains(call.id)
             var nameToShow = SpannableString(call.name)
             if (call.specificType.isNotEmpty()) {
                 nameToShow = SpannableString("${call.name} - ${call.specificType}")
diff --git a/app/src/main/res/layout/item_recent_call.xml b/app/src/main/res/layout/item_recent_call.xml
index 0e35bccf..3bfae1d6 100644
--- a/app/src/main/res/layout/item_recent_call.xml
+++ b/app/src/main/res/layout/item_recent_call.xml
@@ -1,132 +1,131 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/item_recents_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="@drawable/selector">
+    android:foreground="@drawable/selector"
+    android:paddingTop="@dimen/medium_margin"
+    android:paddingBottom="@dimen/medium_margin">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/item_recents_holder"
-        android:layout_width="match_parent"
+    <ImageView
+        android:id="@+id/item_recents_image"
+        android:layout_width="@dimen/normal_icon_size"
+        android:layout_height="@dimen/normal_icon_size"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
+        android:padding="@dimen/small_margin"
+        android:src="@drawable/ic_person_vector"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/item_recents_name"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/medium_margin"
-        android:paddingBottom="@dimen/medium_margin">
+        android:layout_marginStart="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/small_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="@dimen/bigger_text_size"
+        app:layout_constraintBottom_toTopOf="@id/item_recents_date_time"
+        app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
+        app:layout_constraintStart_toEndOf="@+id/item_recents_image"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        tools:text="John Doe" />
 
-        <ImageView
-            android:id="@+id/item_recents_image"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/small_margin"
-            android:layout_marginEnd="@dimen/small_margin"
-            android:padding="@dimen/small_margin"
-            android:src="@drawable/ic_person_vector"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <ImageView
+        android:id="@+id/item_recents_sim_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/tiny_margin"
+        android:alpha="0.6"
+        android:padding="@dimen/tiny_margin"
+        android:src="@drawable/ic_sim_vector"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintStart_toEndOf="@+id/item_recents_image"
+        app:layout_constraintTop_toTopOf="@id/item_recents_date_time"
+        tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/item_recents_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/small_margin"
-            android:layout_marginEnd="@dimen/small_margin"
-            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" />
+    <TextView
+        android:id="@+id/item_recents_sim_id"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        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"
+        tools:visibility="visible" />
 
-        <ImageView
-            android:id="@+id/item_recents_sim_image"
-            android:layout_width="@dimen/activity_margin"
-            android:layout_height="@dimen/activity_margin"
-            android:layout_marginStart="@dimen/small_margin"
-            android:alpha="0.6"
-            android:paddingTop="@dimen/tiny_margin"
-            android:paddingBottom="@dimen/tiny_margin"
-            android:src="@drawable/ic_sim_vector"
-            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"
-            tools:visibility="visible" />
+    <ImageView
+        android:id="@+id/item_recents_type"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/tiny_margin"
+        android:alpha="0.6"
+        android:padding="@dimen/tiny_margin"
+        android:src="@drawable/ic_incoming_call_vector"
+        app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toStartOf="@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_sim_id"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            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" />
+    <TextView
+        android:id="@+id/item_recents_date_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/tiny_margin"
+        android:alpha="0.6"
+        android:maxLines="1"
+        android:textSize="@dimen/normal_text_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/item_recents_type"
+        app:layout_constraintTop_toBottomOf="@id/item_recents_name"
+        tools:text="18.11.2022" />
 
-        <ImageView
-            android:id="@+id/item_recents_type"
-            android:layout_width="@dimen/activity_margin"
-            android:layout_height="@dimen/activity_margin"
-            android:layout_marginStart="@dimen/small_margin"
-            android:alpha="0.6"
-            android:scaleType="fitStart"
-            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_duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/item_recents_name"
+        android:layout_marginEnd="@dimen/small_margin"
+        android:alpha="0.6"
+        android:gravity="end"
+        android:textSize="@dimen/normal_text_size"
+        app:layout_constraintBottom_toBottomOf="@id/item_recents_date_time"
+        app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
+        app:layout_constraintTop_toTopOf="@id/item_recents_date_time"
+        tools:text="00:10" />
 
-        <TextView
-            android:id="@+id/item_recents_date_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/small_margin"
-            android:alpha="0.6"
-            android:maxLines="1"
-            android:textSize="@dimen/normal_text_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/item_recents_duration"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toEndOf="@+id/item_recents_type"
-            tools:text="0123 456 789" />
+    <ImageView
+        android:id="@+id/overflow_menu_icon"
+        style="@style/OverflowMenuIconStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/item_recents_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/item_recents_name"
-            android:layout_marginEnd="@dimen/small_margin"
-            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" />
+    <View
+        android:id="@+id/overflow_menu_anchor"
+        style="@style/OverflowMenuAnchorStyle"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/overflow_menu_icon"
-            style="@style/OverflowMenuIconStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            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"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>