From 1c8705933fa2d0c067d36c58e07cc4e9369926c6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Jul 2022 15:06:38 +0200
Subject: [PATCH] Showing icon when replying to an ICS message + updated side
 menu icon for meetings

---
 .../drawable-xhdpi/voip_meeting_schedule.png  | Bin 0 -> 3841 bytes
 .../res/drawable/icon_meeting_schedule.xml    |   7 ++++++
 .../chat_message_reply_content_cell.xml       |  18 +++++++++++---
 ...hat_message_reply_preview_content_cell.xml |  22 ++++++++++++++++++
 .../main/res/layout/side_menu_fragment.xml    |   4 ++--
 app/src/main/res/values-fr/strings.xml        |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 7 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png
 create mode 100644 app/src/main/res/drawable/icon_meeting_schedule.xml

diff --git a/app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png b/app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png
new file mode 100644
index 0000000000000000000000000000000000000000..168e3460f62d0f9f3d272d0b44666c2cd0bbae6b
GIT binary patch
literal 3841
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
DHa$%E

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_meeting_schedule.xml b/app/src/main/res/drawable/icon_meeting_schedule.xml
new file mode 100644
index 000000000..9fcd02f66
--- /dev/null
+++ b/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>
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 7d1e1bc78..40329a070 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
@@ -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: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:maxHeight="@dimen/chat_message_bubble_image_height_small"
+            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>
 
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 c0edc54cd..a5e4ad4aa 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
@@ -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"
diff --git a/app/src/main/res/layout/side_menu_fragment.xml b/app/src/main/res/layout/side_menu_fragment.xml
index c08f6519a..8985109c5 100644
--- a/app/src/main/res/layout/side_menu_fragment.xml
+++ b/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"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 04ed03404..eb288f675 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 196c9d3e2..f5386e049 100644
--- a/app/src/main/res/values/strings.xml
+++ b/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>