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 000000000..168e3460f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/voip_meeting_schedule.png differ 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 @@ + + + + + + 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" /> + + + 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}" /> 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" /> + + + + + android:src="@drawable/icon_meeting_schedule" /> Aucune réunion terminée pour le moment. Terminées Programmées + Invitation à une réunion \ 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 @@ Call is secured Call security is pending Video attachment + Meeting attachment Take a screenshot of received video Close notification bubble Open conversation in app instead of bubble