From d312141edae9a77c05d374d2c211a563003904f4 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 28 Nov 2024 15:20:46 +0100
Subject: [PATCH] Fixed issue with media preview in chat bubble

---
 app/src/main/res/layout/chat_bubble_content_grid_cell.xml | 8 ++++----
 app/src/main/res/values/dimen.xml                         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
index 35c0dda9c..c2d53505f 100644
--- a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
+++ b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
@@ -17,7 +17,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="1dp">
+        android:padding="1dp">
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/file_group"
@@ -94,9 +94,8 @@
             android:id="@+id/left_background"
             android:layout_width="@dimen/chat_bubble_grid_image_size"
             android:layout_height="@dimen/chat_bubble_grid_image_size"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="1dp"
             android:background="@drawable/shape_squircle_main2_200_left"
+            android:visibility="@{model.isImage || model.isVideoPreview ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
@@ -172,7 +171,8 @@
             android:background="@drawable/shape_squircle_white_right"
             app:layout_constraintTop_toTopOf="@id/left_background"
             app:layout_constraintBottom_toBottomOf="@id/left_background"
-            app:layout_constraintStart_toEndOf="@id/left_background"/>
+            app:layout_constraintStart_toEndOf="@id/left_background"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 73b98f4ad..6b4ae6d1c 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -84,7 +84,7 @@
     <dimen name="chat_bubble_long_press_emoji_reaction_size">25dp</dimen>
     <dimen name="chat_bubble_grid_image_size">87dp</dimen>
     <dimen name="chat_bubble_big_image_max_size">150dp</dimen>
-    <dimen name="chat_bubble_grid_file_width">152dp</dimen> <!-- 271 - 87 - 32 -->
+    <dimen name="chat_bubble_grid_file_width">178dp</dimen> <!-- (87 + 2) * 2  -->
     <dimen name="chat_bubble_meeting_invite_width">271dp</dimen>
     <dimen name="chat_bubble_voice_record_width">230dp</dimen>
     <dimen name="chat_bubble_max_reply_width">271dp</dimen>