From 770e816468f56358470fa25847dcbae766e9df3e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 22 Apr 2024 09:29:02 +0200
Subject: [PATCH] Hide file size in chat bubble when 0 (for outgoing messages)

---
 .../main/java/org/linphone/ui/main/chat/model/FileModel.kt  | 2 +-
 app/src/main/res/layout/chat_bubble_content_grid_cell.xml   | 6 +++---
 .../main/res/layout/chat_bubble_meeting_invite_content.xml  | 6 ------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
index eb023691d..91d0a95f7 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
@@ -37,7 +37,7 @@ import org.linphone.utils.TimestampUtils
 class FileModel @AnyThread constructor(
     val file: String,
     val fileName: String,
-    fileSize: Long,
+    val fileSize: Long,
     private val isEncrypted: Boolean,
     val isWaitingToBeDownloaded: Boolean = false,
     private val onClicked: ((model: FileModel) -> Unit)? = null
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 80c66aa5d..40774a68a 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
@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="@{model.isImage || model.isVideoPreview ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="file_name, file_size, file_background, file_icon" />
+            app:constraint_referenced_ids="file_name, file_background, file_icon" />
 
         <ImageView
             android:id="@+id/image"
@@ -118,13 +118,13 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginTop="16dp"
             android:text="@{model.fileName, default=`Lorem_ipsum.pdf`}"
             android:textColor="?attr/color_main2_600"
             android:textSize="13sp"
             android:maxLines="1"
             android:ellipsize="middle"
             android:background="@drawable/shape_squircle_white_r10_background"
+            app:layout_constraintVertical_chainStyle="packed"
             app:layout_constraintStart_toEndOf="@id/file_icon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/file_background"
@@ -137,13 +137,13 @@
             android:onLongClick="@{onLongClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:text="@{model.formattedFileSize, default=`42 kb`}"
             android:textColor="?attr/color_main2_600"
             android:textSize="12sp"
             android:maxLines="1"
             android:ellipsize="end"
             android:background="@drawable/shape_squircle_white_r10_background"
+            android:visibility="@{model.isImage || model.isVideoPreview || model.fileSize == 0 ? View.GONE : View.VISIBLE, default=gone}"
             app:layout_constraintStart_toStartOf="@id/file_name"
             app:layout_constraintEnd_toEndOf="@id/file_name"
             app:layout_constraintTop_toBottomOf="@id/file_name"
diff --git a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
index 2081ce644..c57eb590f 100644
--- a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
+++ b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
@@ -47,9 +47,6 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:gravity="center_vertical"
-            android:drawablePadding="8dp"
-            android:drawableStart="@drawable/warning_circle"
-            android:drawableTint="@color/warning_600"
             android:visibility="@{model.meetingUpdated ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toTopOf="@id/header_background"
             app:layout_constraintStart_toStartOf="@id/header_background"
@@ -68,9 +65,6 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:gravity="center_vertical"
-            android:drawablePadding="8dp"
-            android:drawableStart="@drawable/x"
-            android:drawableTint="@color/danger_500"
             android:visibility="@{model.meetingCancelled ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/meeting_updated_title"
             app:layout_constraintStart_toStartOf="@id/header_background"