From c394285a87ee4b6e74fe860beb335d36d084a7b1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 19 Nov 2018 17:18:13 +0100
Subject: [PATCH] Use red color for security events + improved layout

---
 .../org/linphone/chat/ChatEventsAdapter.java  |   7 +
 .../main/res/drawable-xhdpi/event_gray.png    | Bin 176 -> 0 bytes
 .../res/drawable/event_decoration_gray.xml    |   7 +
 .../res/drawable/event_decoration_red.xml     |   7 +
 app/src/main/res/layout-land/call.xml         |   1 +
 app/src/main/res/layout/call.xml              |   1 +
 app/src/main/res/layout/chat_bubble.xml       | 261 +++++++++---------
 app/src/main/res/values/styles.xml            |   8 +
 8 files changed, 156 insertions(+), 136 deletions(-)
 delete mode 100644 app/src/main/res/drawable-xhdpi/event_gray.png
 create mode 100644 app/src/main/res/drawable/event_decoration_gray.xml
 create mode 100644 app/src/main/res/drawable/event_decoration_red.xml

diff --git a/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java b/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java
index c1423d5bc..b237ed351 100644
--- a/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java
@@ -359,6 +359,9 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
             holder.bubbleLayout.setLayoutParams(layoutParams);
         } else { // Event is not chat message
             holder.eventLayout.setVisibility(View.VISIBLE);
+            holder.eventMessage.setTextColor(mContext.getResources().getColor(R.color.colorE));
+            holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_gray);
+            holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_gray);
 
             Address address = event.getParticipantAddress();
             String displayName = null;
@@ -400,6 +403,10 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
                     holder.eventMessage.setText(mContext.getString(R.string.device_removed).replace("%s", displayName));
                     break;
                 case ConferenceSecurityEvent:
+                    holder.eventMessage.setTextColor(mContext.getResources().getColor(R.color.colorI));
+                    holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_red);
+                    holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_red);
+
                     switch (event.getSecurityEventType()) {
                         case LimeIdentityKeyChanged:
                             holder.eventMessage.setText(mContext.getString(R.string.lime_identity_key_changed).replace("%s", displayName));
diff --git a/app/src/main/res/drawable-xhdpi/event_gray.png b/app/src/main/res/drawable-xhdpi/event_gray.png
deleted file mode 100644
index 3c1ba6e96daa1200fa9160cc3c983735f19191e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^AT|>R8<0#)^t}M2*pj^6T^Rm@;DWu&Cj&(|3p^r=
z85p>QL70(Y)*K0-AbW|YuPggQE^$s1w$oY_zCa<_%#er@=ltB<)VvZPmw~~#C^fMp
zHASI3vm`^o-P1Q9MK6^dC@$jZ;uyklJ=vz{$%%S4B?e*Ui9mbHnf)u}CBr}(Jzf1=
J);T3K0RTMsDO~^n

diff --git a/app/src/main/res/drawable/event_decoration_gray.xml b/app/src/main/res/drawable/event_decoration_gray.xml
new file mode 100644
index 000000000..e037f8225
--- /dev/null
+++ b/app/src/main/res/drawable/event_decoration_gray.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="line">
+    <stroke android:width="1dp" android:color="@color/colorE"/>
+    <size android:height="1dp" android:width="50dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/event_decoration_red.xml b/app/src/main/res/drawable/event_decoration_red.xml
new file mode 100644
index 000000000..839e8ff17
--- /dev/null
+++ b/app/src/main/res/drawable/event_decoration_red.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="line">
+    <stroke android:width="50dp" android:color="@color/colorI"/>
+    <size android:height="1dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index bdb4a217e..538c2bcb0 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/topLayout"
+    android:background="@color/colorB"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index a47d108a1..263154b8d 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/topLayout"
+    android:background="@color/colorB"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/chat_bubble.xml b/app/src/main/res/layout/chat_bubble.xml
index 015bf3a97..c045f5d03 100644
--- a/app/src/main/res/layout/chat_bubble.xml
+++ b/app/src/main/res/layout/chat_bubble.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <CheckBox
         android:id="@+id/delete_message"
@@ -11,46 +11,35 @@
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:adjustViewBounds="true"
-		android:clickable="false"
+        android:clickable="false"
         android:layout_alignParentRight="true"/>
 
-	<LinearLayout
-		android:id="@+id/event"
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <LinearLayout
+        android:id="@+id/event"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/delete_message"
-		android:layout_marginTop="5dp"
-		android:layout_marginBottom="5dp"
-		android:gravity="center_vertical">
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:gravity="center"
+        android:background="@drawable/event_decoration_gray">
 
-		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:layout_marginRight="10dp"
-			android:src="@drawable/event_gray"
-			android:scaleType="fitXY"/>
+        <TextView
+            android:id="@+id/event_text"
+            android:textAppearance="@style/font_group_chat_event"
+            android:background="@color/colorH"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
 
-		<TextView
-			android:id="@+id/event_text"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+    </LinearLayout>
 
-		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:layout_marginLeft="10dp"
-			android:src="@drawable/event_gray"
-			android:scaleType="fitXY"/>
-
-	</LinearLayout>
-
-	<RelativeLayout
-		android:id="@+id/bubble"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+    <RelativeLayout
+        android:id="@+id/bubble"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/delete_message">
 
         <LinearLayout
@@ -59,39 +48,39 @@
             android:layout_height="10dp"
             android:orientation="horizontal"/>
 
-		<LinearLayout
-		    android:id="@+id/background"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/separator"
-			android:orientation="horizontal">
+        <LinearLayout
+            android:id="@+id/background"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/separator"
+            android:orientation="horizontal">
 
-			<RelativeLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingLeft="10dp"
-				android:paddingTop="10dp">
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:paddingTop="10dp">
 
-				<include layout="@layout/contact_avatar"/>
+                <include layout="@layout/contact_avatar"/>
 
-			</RelativeLayout>
+            </RelativeLayout>
 
-			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:paddingTop="10dp"
-				android:paddingRight="10dp">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingTop="10dp"
+                android:paddingRight="10dp">
 
-				<TextView
-					android:id="@+id/contact_header"
-					android:maxLines="1"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
+                <TextView
+                    android:id="@+id/contact_header"
+                    android:maxLines="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
 
-				<RelativeLayout
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content">
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
 
                     <TextView
                         android:id="@+id/file_name"
@@ -118,7 +107,7 @@
                         android:layout_centerVertical="true"
                         android:visibility="gone"/>
 
-				</RelativeLayout>
+                </RelativeLayout>
 
                 <TextView
                     android:id="@+id/message"
@@ -128,95 +117,95 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
-				<RelativeLayout
-					android:id="@+id/file_transfer_layout"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
+                <RelativeLayout
+                    android:id="@+id/file_transfer_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:visibility="gone">
 
-					<ProgressBar
-						android:id="@+id/progress_bar"
-						style="@android:style/Widget.ProgressBar.Horizontal"
-						android:paddingRight="5dp"
-						android:layout_marginTop="10dp"
-						android:layout_marginBottom="10dp"
-						android:layout_width="150dp"
-						android:layout_height="5dp"/>
+                    <ProgressBar
+                        android:id="@+id/progress_bar"
+                        style="@android:style/Widget.ProgressBar.Horizontal"
+                        android:paddingRight="5dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_width="150dp"
+                        android:layout_height="5dp"/>
 
-					<Button
-						android:id="@+id/file_transfer_action"
+                    <Button
+                        android:id="@+id/file_transfer_action"
                         android:textAppearance="@style/font8"
                         android:background="@drawable/resizable_assistant_button"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/progress_bar"/>
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/progress_bar"/>
 
-				</RelativeLayout>
+                </RelativeLayout>
 
-				<LinearLayout
-					android:id="@+id/imdmLayout"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_alignParentRight="true"
-					android:layout_marginTop="2dp"
-					android:layout_marginBottom="2dp"
-					android:orientation="horizontal"
-					android:layout_gravity="right"
-					android:gravity="right"
-					android:visibility="invisible">
+                <LinearLayout
+                    android:id="@+id/imdmLayout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginBottom="2dp"
+                    android:orientation="horizontal"
+                    android:layout_gravity="right"
+                    android:gravity="right"
+                    android:visibility="invisible">
 
-					<TextView
-						android:id="@+id/imdmText"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="Displayed"
-						android:textSize="12sp"
-						android:paddingRight="3dp"/>
+                    <TextView
+                        android:id="@+id/imdmText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Displayed"
+                        android:textSize="12sp"
+                        android:paddingRight="3dp"/>
 
-					<ImageView
-						android:id="@+id/imdmIcon"
-						android:layout_width="10dp"
-						android:layout_height="10dp"
-						android:src="@drawable/valid"
-						android:scaleType="fitCenter"
-						android:layout_marginTop="2dp" />
+                    <ImageView
+                        android:id="@+id/imdmIcon"
+                        android:layout_width="10dp"
+                        android:layout_height="10dp"
+                        android:src="@drawable/valid"
+                        android:scaleType="fitCenter"
+                        android:layout_marginTop="2dp" />
 
-				</LinearLayout>
+                </LinearLayout>
 
-			</LinearLayout>
+            </LinearLayout>
 
-		</LinearLayout>
+        </LinearLayout>
 
-		<RelativeLayout
-		    android:layout_alignRight="@id/background"
-		    android:layout_alignTop="@id/background"
-			android:layout_width="15dp"
-			android:layout_height="15dp"
-			android:paddingTop="5dp"
-			android:paddingBottom="3dp">
+        <RelativeLayout
+            android:layout_alignRight="@id/background"
+            android:layout_alignTop="@id/background"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="3dp">
 
-			<ImageView
-				android:id="@+id/status"
-				android:contentDescription="@string/content_description_message_status"
-				android:visibility="invisible"
-				android:layout_alignParentTop="true"
-				android:layout_alignParentRight="true"
-				android:paddingRight="5dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:adjustViewBounds="true" />
+            <ImageView
+                android:id="@+id/status"
+                android:contentDescription="@string/content_description_message_status"
+                android:visibility="invisible"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:paddingRight="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:adjustViewBounds="true" />
 
-			<ProgressBar
-				android:id="@+id/inprogress"
+            <ProgressBar
+                android:id="@+id/inprogress"
                 android:progressTint="@color/colorB"
-				android:layout_alignParentTop="true"
-				android:layout_alignParentRight="true"
-				android:paddingRight="5dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:paddingRight="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
 
-		</RelativeLayout>
+        </RelativeLayout>
 
-	</RelativeLayout>
+    </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7709da8d0..b2728660c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -197,4 +197,12 @@
         <item name="android:lineSpacingExtra">8.3sp</item>
     </style>
 
+    <style name="font_group_chat_event" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/colorE</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingExtra">0sp</item>
+        <item name="android:textStyle">italic</item>
+    </style>
+
 </resources>
\ No newline at end of file