From 12a41b8325de65b36d3dccead6990cfe8fc862a3 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Mon, 8 Oct 2018 11:22:58 +0200
Subject: [PATCH] Some UI fix

---
 .../assistant_remote_provisioning_login.xml      | 12 +++++++-----
 res/layout/chat_infos_cell.xml                   | 16 +++++++++-------
 res/layout/chatlist_cell.xml                     |  3 ++-
 res/values/non_localizable_custom.xml            |  4 ++--
 .../org/linphone/chat/ChatEventsAdapter.java     |  2 ++
 .../org/linphone/chat/GroupInfoAdapter.java      |  4 ++--
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 93076aea6..db77f7e33 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -134,7 +134,8 @@ Mobile Security Intense"
 						android:layout_width="250dp"
 						android:layout_height="250dp"
 						android:background="@color/transparent"
-						android:src="@drawable/avatar_mask_border"/>
+						android:src="@drawable/avatar_mask_border"
+						android:visibility="visible"/>
 
 					<RelativeLayout
 						android:id="@+id/layout_button"
@@ -151,7 +152,7 @@ Mobile Security Intense"
 							android:background="#595959"
 							android:text="retour"
 							android:textColor="#ffffff"
-							android:visibility="gone"/>
+							android:visibility="visible"/>
 
 						<Button
 							android:id="@+id/valider"
@@ -162,18 +163,19 @@ Mobile Security Intense"
 							android:background="#ff6600"
 							android:text="valider"
 							android:textColor="#ffffff"
-							android:visibility="gone"/>
+							android:visibility="visible"/>
 
 						<EditText
 							android:id="@+id/code_sms"
 							android:layout_width="match_parent"
 							android:layout_height="40dp"
 							android:layout_marginBottom="15dp"
-							android:background="#c4c4c4"
+							android:background="#f3f3f3"
 							android:inputType="number"
 							android:maxLines="1"
+							android:textAlignment="center"
 							android:textColor="@color/colorB"
-							android:visibility="gone"/>
+							android:visibility="visible"/>
 					</RelativeLayout>
 
 					<View
diff --git a/res/layout/chat_infos_cell.xml b/res/layout/chat_infos_cell.xml
index 91d68489a..3394c3380 100644
--- a/res/layout/chat_infos_cell.xml
+++ b/res/layout/chat_infos_cell.xml
@@ -45,9 +45,10 @@
             android:id="@+id/secure"
             android:layout_width="wrap_content"
             android:layout_height="18dp"
-            android:layout_centerInParent="true"
+            android:layout_centerVertical="true"
             android:layout_marginLeft="15dp"
             android:layout_marginRight="15dp"
+            android:layout_toLeftOf="@+id/adminLayout"
             android:src="@drawable/security_1"
             android:visibility="visible"/>
 
@@ -123,20 +124,21 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/avatar_layout"
             android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
             android:layout_toLeftOf="@id/secure"
-            android:layout_marginLeft="10dp">
+            android:layout_toRightOf="@id/avatar_layout"
+            >
 
             <TextView
                 android:id="@+id/name"
                 style="@style/font6"
-                android:lines="1"
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"/>
+                android:layout_alignParentTop="true"
+                android:ellipsize="end"
+                android:lines="1"
+                android:maxLines="1"/>
 
         </RelativeLayout>
 
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 2db3f6bf0..39defe45b 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -108,7 +108,8 @@
 				android:contentDescription="@string/content_description_unread_chat_message"
 				android:gravity="center"
 				android:maxLines="1"
-				android:textSize="18sp"/>
+				android:textAlignment="center"
+				android:textSize="16sp"/>
 
 			<LinearLayout
 				android:id="@id/lastMessageLayout"
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index ba9acf38b..2dbae6fc9 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -79,8 +79,8 @@
 	<bool name="disable_chat">false</bool>
 	<bool name="disable_chat_message_notification">false</bool>
 	<bool name="disable_chat_send_file">false</bool>
-	<string name="temp_photo_name">linphone-android-photo-temp</string>
-	<string name="temp_photo_name_with_date">linphone-android-photo-%s</string>
+	<string name="temp_photo_name">msi-android-photo-temp</string>
+	<string name="temp_photo_name_with_date">msi-android-photo-%s</string>
 	<bool name="lower_space_between_chat_bubbles_if_same_person">true</bool>
 
 	<!-- Contacts -->
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 010cf1d05..4d56a6d16 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -204,6 +204,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 	    holder.messageStatus.setVisibility(View.GONE);
 	    holder.messageSendingInProgress.setVisibility(View.GONE);
 	    holder.imdmLayout.setVisibility(View.GONE);
+	    holder.imdmIcon.setVisibility(View.GONE);
 	    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
 
 	    if (isEditionEnabled()) {
@@ -574,6 +575,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 				});
 			}
 		}
+		notifyDataSetChanged();
 	}
 
 	/*
diff --git a/src/android/org/linphone/chat/GroupInfoAdapter.java b/src/android/org/linphone/chat/GroupInfoAdapter.java
index f8366d55f..b0a6c9aae 100644
--- a/src/android/org/linphone/chat/GroupInfoAdapter.java
+++ b/src/android/org/linphone/chat/GroupInfoAdapter.java
@@ -192,7 +192,7 @@ public class GroupInfoAdapter extends BaseAdapter {
         if (mHideAdminFeatures) {
             delete.setVisibility(View.INVISIBLE);
             isAdmin.setOnClickListener(null); // Do not allow not admin to remove it's rights but display admins
-            isNotAdmin.setVisibility(View.GONE); // Hide not admin button for not admin participants
+            isNotAdmin.setVisibility(ca.isAdmin() ? View.GONE : View.INVISIBLE); // Hide not admin button for not admin participants
         } else if (mChatRoom != null) {
 	        boolean found = false;
 	        for (Participant p : mChatRoom.getParticipants()) {
@@ -202,7 +202,7 @@ public class GroupInfoAdapter extends BaseAdapter {
 		        }
 	        }
 	        if (!found) {
-		        isNotAdmin.setVisibility(View.GONE); // Hide not admin button for participant not yet added so even if user click it it won't have any effect
+		        isNotAdmin.setVisibility(ca.isAdmin() ? View.GONE : View.INVISIBLE); // Hide not admin button for participant not yet added so even if user click it it won't have any effect
 	        }
         }