From 8d8e0aa7e2184e6e0be97cfbff66af74159dc469 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 27 Sep 2018 11:23:28 +0200
Subject: [PATCH] Fix call layout and chat list

---
 res/layout/call.xml                                |  4 ++--
 res/layout/call_incoming.xml                       |  9 +++++----
 res/layout/call_outgoing.xml                       | 11 ++++++-----
 res/layout/chat_bubble.xml                         | 14 +++++++-------
 res/values-fr/strings.xml                          |  1 +
 res/values/strings.xml                             |  1 +
 .../org/linphone/chat/ChatRoomsAdapter.java        |  7 ++++++-
 7 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/res/layout/call.xml b/res/layout/call.xml
index 7d77406e0..56651143c 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -93,8 +93,8 @@
 
 						<ImageView
 							android:id="@+id/contact_picture"
-							android:layout_width="180dp"
-							android:layout_height="180dp"
+							android:layout_width="225dp"
+							android:layout_height="wrap_content"
 							android:adjustViewBounds="true"
 							android:contentDescription="@string/content_description_contact_picture"
 							android:src="@drawable/avatar_big_secure1"/>
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index afa89d476..b92944110 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -47,9 +47,10 @@
 		android:id="@+id/contact_detail"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:layout_above="@+id/menu"
 		android:layout_below="@id/top_bar"
-		android:paddingTop="10dp"
-		android:layout_above="@+id/menu">
+		android:gravity="center"
+		android:paddingTop="10dp">
 
 		<TextView
 			android:id="@+id/contact_name"
@@ -68,8 +69,8 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/contact_name"
 			android:layout_centerHorizontal="true"
-			android:paddingBottom="10dp"
-			android:layout_gravity="center_vertical|center_horizontal" />
+			android:layout_gravity="center_vertical|center_horizontal"
+			android:paddingBottom="10dp"/>
 
 		<RelativeLayout
 			android:id="@+id/avatar_layout"
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index bb15031c2..745dbac44 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -47,6 +47,7 @@
 		android:layout_height="match_parent"
 		android:layout_above="@id/menu"
 		android:layout_below="@id/top_bar"
+		android:gravity="center"
 		android:paddingTop="10dp">
 
 		<TextView
@@ -56,8 +57,8 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/avatar_layout"
 			android:layout_centerHorizontal="true"
-			android:paddingTop="5dp"
-			android:gravity="center_vertical|center_horizontal" />
+			android:gravity="center_vertical|center_horizontal"
+			android:paddingTop="5dp"/>
 
 		<TextView
 			android:id="@+id/contact_number"
@@ -66,8 +67,8 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/contact_name"
 			android:layout_centerHorizontal="true"
-			android:paddingBottom="10dp"
-			android:layout_gravity="center_vertical|center_horizontal" />
+			android:layout_gravity="center_vertical|center_horizontal"
+			android:paddingBottom="10dp"/>
 
 		<RelativeLayout
 			android:id="@+id/avatar_layout"
@@ -79,7 +80,7 @@
 
 			<ImageView
 				android:id="@+id/contact_picture"
-				android:layout_width="200dp"
+				android:layout_width="225dp"
 				android:layout_height="wrap_content"
 				android:adjustViewBounds="true"
 				android:contentDescription="@string/content_description_contact_picture"
diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index eeebb86f1..175ddc690 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -130,13 +130,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"/>
 
-                    <ImageView
-                        android:id="@+id/image"
-                        android:layout_width="150dp"
-                        android:layout_height="150dp"
-                        android:layout_below="@id/file_name"
-                        android:layout_centerHorizontal="true"
-                        android:scaleType="centerInside"/>
+					<ImageView
+						android:id="@+id/image"
+						android:layout_width="150dp"
+						android:layout_height="150dp"
+						android:layout_below="@id/file_name"
+						android:layout_centerHorizontal="true"
+						android:scaleType="centerInside"/>
 
 					<Button
 						android:id="@+id/open_file"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 88722c334..49ec7b818 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -47,6 +47,7 @@
   <string name="no">Non</string>
   <string name="yes">Oui</string>
   <string name="link_account">Associer votre compte</string>
+  <string name="you">Vous</string>
   <!--Launch screen-->
   <string name="app_description">le client SIP <i>libre</i></string>
   <!--Assistant-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5c62f1d0b..d3d76894e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -53,6 +53,7 @@
     <string name="yes">Yes</string>
     <string name="link_account">Link your account</string>
     <string name="update_available">An update is available</string>
+    <string name="you">You</string>
 
     <!-- Launch screen -->
     <string name="app_description"></string>
diff --git a/src/android/org/linphone/chat/ChatRoomsAdapter.java b/src/android/org/linphone/chat/ChatRoomsAdapter.java
index c4a71e197..d18e371bb 100644
--- a/src/android/org/linphone/chat/ChatRoomsAdapter.java
+++ b/src/android/org/linphone/chat/ChatRoomsAdapter.java
@@ -60,6 +60,7 @@ import java.util.List;
 import static android.text.format.DateUtils.isToday;
 import static org.linphone.LinphoneUtils.getZrtpStatus;
 import static org.linphone.LinphoneUtils.hasContentFileSharing;
+import static org.linphone.LinphoneUtils.isUs;
 
 public class ChatRoomsAdapter extends ListSelectionAdapter {
 
@@ -230,7 +231,11 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 				if (contact != null) {
 					holder.lastMessageSenderView.setText(contact.getFullName() + mContext.getString(R.string.separator));
 				} else {
-					holder.lastMessageSenderView.setText(LinphoneUtils.getAddressDisplayName(lastMessageSenderAddress) + mContext.getString(R.string.separator));
+					if (isUs(LinphoneManager.getLc().getDefaultProxyConfig(), lastMessage.getFromAddress().getUsername())) {
+						holder.lastMessageSenderView.setText(mContext.getString(R.string.you) + mContext.getString(R.string.separator));
+					} else {
+						holder.lastMessageSenderView.setText(LinphoneUtils.getAddressDisplayName(lastMessageSenderAddress) + mContext.getString(R.string.separator));
+					}
 				}
 			}
 		}