From 6600b92d1e53741b55753c1c1efce17b6d6933fd Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 28 Oct 2020 10:15:53 +0100
Subject: [PATCH] Fixed call paused layout avatar white background

---
 .../main/res/drawable/contact_avatar_bg.xml   |  5 ++++
 app/src/main/res/layout/call_paused.xml       |  2 +-
 app/src/main/res/layout/contact_avatar.xml    | 27 ++++++++++---------
 app/src/main/res/values/dimen.xml             |  1 +
 4 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/contact_avatar_bg.xml

diff --git a/app/src/main/res/drawable/contact_avatar_bg.xml b/app/src/main/res/drawable/contact_avatar_bg.xml
new file mode 100644
index 000000000..db8b370a5
--- /dev/null
+++ b/app/src/main/res/drawable/contact_avatar_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="?attr/backgroundColor"/>
+    <size android:width="@dimen/contact_avatar_size" android:height="@dimen/contact_avatar_size"/>
+</shape>
diff --git a/app/src/main/res/layout/call_paused.xml b/app/src/main/res/layout/call_paused.xml
index 8ce9f66ee..7559f2037 100644
--- a/app/src/main/res/layout/call_paused.xml
+++ b/app/src/main/res/layout/call_paused.xml
@@ -36,7 +36,7 @@
             android:layout_weight="1"
             android:gravity="center_vertical|left"
             android:singleLine="true"
-            android:paddingLeft="20dp"
+            android:paddingLeft="10dp"
             android:paddingRight="10dp" />
 
         <Chronometer
diff --git a/app/src/main/res/layout/contact_avatar.xml b/app/src/main/res/layout/contact_avatar.xml
index 988396d6f..614e6a4d0 100644
--- a/app/src/main/res/layout/contact_avatar.xml
+++ b/app/src/main/res/layout/contact_avatar.xml
@@ -31,15 +31,18 @@
         <variable
             name="borderVisibility"
             type="Boolean" />
+        <variable
+            name="backgroundColor"
+            type="Integer" />
     </data>
 
     <RelativeLayout
         android:layout_width="45dp"
-        android:layout_height="35dp">
+        android:layout_height="@dimen/contact_avatar_size">
 
         <ImageView
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/contact_avatar_size"
+            android:layout_height="@dimen/contact_avatar_size"
             android:layout_alignParentLeft="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
@@ -47,8 +50,8 @@
 
         <ImageView
             android:visibility="@{generatedAvatarVisibility &amp;&amp; !groupChatAvatarVisibility ? View.VISIBLE : View.GONE}"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/contact_avatar_size"
+            android:layout_height="@dimen/contact_avatar_size"
             android:layout_alignParentLeft="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
@@ -60,26 +63,26 @@
             android:textColor="?attr/secondaryTextColor"
             android:textSize="21sp"
             android:textStyle="bold"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/contact_avatar_size"
+            android:layout_height="@dimen/contact_avatar_size"
             android:layout_alignParentLeft="true"
             android:gravity="center"
             android:singleLine="true"
             android:ellipsize="none" />
 
         <ImageView
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/contact_avatar_size"
+            android:layout_height="@dimen/contact_avatar_size"
             android:layout_alignParentLeft="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
-            android:background="?attr/backgroundColor"
+            android:background="@drawable/contact_avatar_bg"
             app:glideAvatar="@{imagePath}" />
 
         <ImageView
             android:visibility="@{borderVisibility ? View.VISIBLE : View.GONE, default=gone}"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="@dimen/contact_avatar_size"
+            android:layout_height="@dimen/contact_avatar_size"
             android:layout_alignParentLeft="true"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 66e0cb1bc..edcbcc26e 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -11,4 +11,5 @@
     <dimen name="status_fragment_size">40dp</dimen>
     <dimen name="tabs_fragment_selector_size">5dp</dimen>
     <dimen name="tabs_fragment_unread_count_bounce_offset">5dp</dimen>
+    <dimen name="contact_avatar_size">35dp</dimen>
 </resources>
\ No newline at end of file