From 024b51e1c7672e438cca33b5eb2f11c7f41c0861 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Jul 2022 16:07:19 +0200
Subject: [PATCH] Improved scheduled meeting display in reply

---
 .../chat_message_reply_content_cell.xml       | 24 ++++++++---------
 ...hat_message_reply_preview_content_cell.xml | 27 ++++++-------------
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/layout/chat_message_reply_content_cell.xml b/app/src/main/res/layout/chat_message_reply_content_cell.xml
index 40329a070..66bf0077c 100644
--- a/app/src/main/res/layout/chat_message_reply_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_reply_content_cell.xml
@@ -22,7 +22,7 @@
             android:maxHeight="@dimen/chat_message_bubble_image_height_small"
             android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
             coil="@{data.filePath}"
-            android:visibility="@{data.image ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
             android:scaleType="@{ScaleType.CENTER_CROP}"
             android:adjustViewBounds="true" />
 
@@ -33,12 +33,12 @@
             android:maxHeight="@dimen/chat_message_bubble_image_height_small"
             android:layout_size="@{data.alone ? 0f : @dimen/chat_message_small_bubble_file_size}"
             coilVideoPreview="@{data.filePath}"
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
             android:scaleType="@{ScaleType.CENTER_CROP}"
             android:adjustViewBounds="true" />
 
         <ImageView
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
             android:layout_width="@dimen/play_pause_button_size"
             android:layout_height="@dimen/play_pause_button_size"
             android:padding="9dp"
@@ -48,7 +48,7 @@
             android:layout_centerInParent="true"/>
 
         <TextView
-            android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawablePadding="2dp"
@@ -57,16 +57,16 @@
             android:textColor="@color/light_primary_text_color"
             app:drawableTopCompat="@drawable/audio_recording_reply_preview_default" />
 
-        <ImageView
-            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE}"
+        <TextView
+            android:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE, default=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:text="@{data.conferenceSubject, default=`Lorem Ipsum`}"
+            android:textColor="@color/light_primary_text_color"
+            android:padding="5dp"
+            android:drawableTop="@drawable/icon_meeting_schedule"
+            android:maxLines="3"
+            android:ellipsize="end"
             android:layout_centerVertical="true"/>
 
         <ImageView
diff --git a/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml b/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
index a5e4ad4aa..4ff00ffd0 100644
--- a/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_reply_preview_content_cell.xml
@@ -20,7 +20,7 @@
             android:layout_height="@dimen/chat_message_small_bubble_file_size"
             android:layout_margin="5dp"
             coil="@{data.filePath}"
-            android:visibility="@{data.image ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.image ? View.VISIBLE : View.GONE, default=gone}"
             android:scaleType="@{ScaleType.CENTER_CROP}"
             android:adjustViewBounds="true" />
 
@@ -30,12 +30,12 @@
             android:layout_height="@dimen/chat_message_small_bubble_file_size"
             android:layout_margin="5dp"
             coilVideoPreview="@{data.filePath}"
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
             android:scaleType="@{ScaleType.CENTER_CROP}"
             android:adjustViewBounds="true" />
 
         <ImageView
-            android:visibility="@{data.video ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.video ? View.VISIBLE : View.GONE, default=gone}"
             android:layout_width="@dimen/play_pause_button_size"
             android:layout_height="@dimen/play_pause_button_size"
             android:layout_margin="5dp"
@@ -46,7 +46,7 @@
             android:layout_centerInParent="true"/>
 
         <TextView
-            android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE}"
+            android:visibility="@{data.isVoiceRecording ? View.VISIBLE : View.GONE, default=gone}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/progress_bar_height"
             android:drawablePadding="5dp"
@@ -55,26 +55,15 @@
             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:visibility="@{data.isConferenceSchedule ? View.VISIBLE : View.GONE, default=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:drawablePadding="5dp"
+            android:padding="5dp"
+            android:drawableTop="@drawable/icon_meeting_schedule"
             android:layout_centerVertical="true"/>
 
         <ImageView