From d5a8e0f42ae8c48ef2156ac73245281135672deb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Jan 2021 13:32:10 +0100
Subject: [PATCH] Properly center display name, sip address & avatar on
 incoming/outgoing call views

---
 .../res/layout/call_incoming_activity.xml     | 28 ++++-----
 .../res/layout/call_outgoing_activity.xml     | 63 ++++++++++---------
 2 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/app/src/main/res/layout/call_incoming_activity.xml b/app/src/main/res/layout/call_incoming_activity.xml
index 976a7eb75..5d799a13a 100644
--- a/app/src/main/res/layout/call_incoming_activity.xml
+++ b/app/src/main/res/layout/call_incoming_activity.xml
@@ -72,24 +72,27 @@
                 style="@style/sip_uri_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|center_horizontal"
+                android:layout_gravity="center"
                 android:singleLine="true"
                 android:paddingBottom="10dp" />
 
         </LinearLayout>
 
         <RelativeLayout
-            android:visibility="@{viewModel.earlyMediaVideoEnabled ? View.GONE : View.VISIBLE}"
+            android:visibility="@{viewModel.earlyMediaVideoEnabled ? View.GONE : View.VISIBLE, default=visible}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/top_bar"
             android:layout_above="@id/buttons"
             android:layout_centerHorizontal="true">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
+                android:layout_centerInParent="true"
+                android:paddingBottom="@dimen/status_fragment_size"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/contact_name"
@@ -97,9 +100,7 @@
                     style="@style/big_contact_name_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:gravity="center_vertical|center_horizontal"
-                    android:paddingTop="10dp" />
+                    android:gravity="center" />
 
                 <org.linphone.views.MarqueeTextView
                     android:id="@+id/contact_number"
@@ -107,24 +108,17 @@
                     style="@style/sip_uri_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/contact_name"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_vertical|center_horizontal"
-                    android:singleLine="true"
-                    android:paddingBottom="10dp" />
+                    android:singleLine="true" />
 
                 <org.linphone.contact.BigContactAvatarView
                     android:id="@+id/avatar"
                     android:layout_width="200dp"
                     android:layout_height="200dp"
-                    android:layout_margin="5dp"
-                    android:layout_below="@id/contact_number"
-                    android:layout_centerHorizontal="true"
-                    android:gravity="center"
+                    android:layout_marginTop="20dp"
                     tools:layout="@layout/contact_avatar_big"
                     app:viewModel="@{viewModel}"/>
 
-            </RelativeLayout>
+            </LinearLayout>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/call_outgoing_activity.xml b/app/src/main/res/layout/call_outgoing_activity.xml
index 1ea27476b..7de2caa2c 100644
--- a/app/src/main/res/layout/call_outgoing_activity.xml
+++ b/app/src/main/res/layout/call_outgoing_activity.xml
@@ -48,40 +48,41 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/top_bar"
             android:layout_above="@id/buttons"
-            android:layout_centerInParent="true">
+            android:layout_centerHorizontal="true">
 
-            <TextView
-                android:id="@+id/contact_name"
-                android:text="@{viewModel.contact.fullName ?? viewModel.displayName}"
-                style="@style/big_contact_name_font"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:gravity="center_vertical|center_horizontal"
-                android:paddingTop="10dp" />
-
-            <org.linphone.views.MarqueeTextView
-                android:id="@+id/contact_number"
-                android:text="@{viewModel.address}"
-                style="@style/sip_uri_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/contact_name"
-                android:layout_centerHorizontal="true"
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:singleLine="true"
-                android:paddingBottom="10dp" />
-
-            <org.linphone.contact.BigContactAvatarView
-                android:id="@+id/avatar"
-                android:layout_width="200dp"
-                android:layout_height="200dp"
-                android:layout_margin="5dp"
-                android:layout_below="@id/contact_number"
-                android:layout_centerHorizontal="true"
+                android:layout_centerInParent="true"
+                android:paddingBottom="@dimen/status_fragment_size"
                 android:gravity="center"
-                tools:layout="@layout/contact_avatar_big"
-                app:viewModel="@{viewModel}"/>
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/contact_name"
+                    android:text="@{viewModel.contact.fullName ?? viewModel.displayName}"
+                    style="@style/big_contact_name_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center" />
+
+                <org.linphone.views.MarqueeTextView
+                    android:id="@+id/contact_number"
+                    android:text="@{viewModel.address}"
+                    style="@style/sip_uri_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true" />
+
+                <org.linphone.contact.BigContactAvatarView
+                    android:id="@+id/avatar"
+                    android:layout_width="200dp"
+                    android:layout_height="200dp"
+                    android:layout_marginTop="20dp"
+                    tools:layout="@layout/contact_avatar_big"
+                    app:viewModel="@{viewModel}"/>
+
+            </LinearLayout>
 
         </RelativeLayout>