Showing icon when replying to an ICS message + updated side menu icon for meetings

app/src/main/res/drawable/icon_meeting_schedule.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:src="@drawable/voip_meeting_schedule"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>

app/src/main/res/layout/chat_message_reply_content_cell.xml

@@ -58,15 +58,27 @@
             app:drawableTopCompat="@drawable/audio_recording_reply_preview_default" />
 
         <ImageView
+            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxHeight="@dimen/chat_message_bubble_image_height_small"
+            android:padding="10dp"
+            android:src="@drawable/icon_meeting_schedule"
+            android:background="@drawable/chat_bubble_reply_file_background"
+            android:contentDescription="@string/content_description_chat_message_meeting_attachment"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
             android:background="@drawable/chat_bubble_reply_file_background"
-            android:padding="10dp"
             android:contentDescription="@{data.fileName}"
-            android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}"
+            android:maxHeight="@dimen/chat_message_bubble_image_height_small"
-            android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}" />
+            android:padding="10dp"
+            android:src="@{data.video ? @drawable/file_video : (data.image ? @drawable/file_picture : (data.pdf ? @drawable/file_pdf : (data.audio ? @drawable/file_audio : @drawable/file))), default=@drawable/file}"
+            android:visibility="@{data.downloadable || data.pdf || data.audio || data.genericFile ? View.VISIBLE : View.GONE}" />
 
     </RelativeLayout>
 

app/src/main/res/layout/chat_message_reply_preview_content_cell.xml

@@ -55,6 +55,28 @@
             android:textColor="@color/light_primary_text_color"
             app:drawableLeftCompat="@drawable/audio_recording_reply_preview_default" />
 
+        <ImageView
+            android:id="@+id/conference_icon"
+            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
+            android:layout_width="@dimen/chat_message_small_bubble_file_size"
+            android:layout_height="@dimen/chat_message_small_bubble_file_size"
+            android:background="@drawable/chat_bubble_reply_file_background"
+            android:padding="10dp"
+            android:src="@drawable/icon_meeting_schedule"
+            android:contentDescription="@string/content_description_chat_message_meeting_attachment"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"/>
+
+        <TextView
+            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
+            android:layout_marginStart="10dp"
+            android:textColor="@color/light_primary_text_color"
+            android:layout_toEndOf="@id/conference_icon"
+            android:layout_centerVertical="true"/>
+
         <ImageView
             android:layout_width="@dimen/chat_message_small_bubble_file_size"
             android:layout_height="@dimen/chat_message_small_bubble_file_size"

app/src/main/res/layout/side_menu_fragment.xml

@@ -241,9 +241,9 @@
                     <ImageView
                         android:layout_width="45dp"
                         android:layout_height="45dp"
-                        android:padding="5dp"
+                        android:padding="7dp"
                         android:contentDescription="@string/conference_scheduled"
-                        android:src="@drawable/icon_video_conf_new" />
+                        android:src="@drawable/icon_meeting_schedule" />
 
                     <TextView
                         android:text="@string/conference_scheduled"

app/src/main/res/values-fr/strings.xml

@@ -736,4 +736,5 @@
     <string name="conference_no_terminated_schedule">Aucune réunion terminée pour le moment.</string>
     <string name="conference_scheduled_terminated_filter">Terminées</string>
     <string name="conference_scheduled_future_filter">Programmées</string>
+    <string name="content_description_chat_message_meeting_attachment">Invitation à une réunion</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -836,6 +836,7 @@
     <string name="content_description_call_secured">Call is secured</string>
     <string name="content_description_call_security_pending">Call security is pending</string>
     <string name="content_description_chat_message_video_attachment">Video attachment</string>
+    <string name="content_description_chat_message_meeting_attachment">Meeting attachment</string>
     <string name="content_description_take_screenshot">Take a screenshot of received video</string>
     <string name="content_description_close_bubble">Close notification bubble</string>
     <string name="content_description_open_app">Open conversation in app instead of bubble</string>