From 3a7265295e7fc3651394e53ed4628adaf5589205 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 3 Dec 2024 22:16:35 +0100
Subject: [PATCH] Fixed chat message file upload indicator

---
 .../layout/chat_bubble_content_grid_cell.xml   | 10 +++++-----
 .../chat_bubble_single_media_content.xml       | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 6 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 c2d53505f..41cebe1fa 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
@@ -95,7 +95,7 @@
             android:layout_width="@dimen/chat_bubble_grid_image_size"
             android:layout_height="@dimen/chat_bubble_grid_image_size"
             android:background="@drawable/shape_squircle_main2_200_left"
-            android:visibility="@{model.isImage || model.isVideoPreview ? View.GONE : View.VISIBLE}"
+            android:visibility="@{model.isImage || model.isVideoPreview ? View.INVISIBLE : View.VISIBLE}"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
@@ -157,10 +157,10 @@
             android:textSize="16sp"
             android:textAlignment="center"
             android:textColor="?attr/color_main1_500"
-            app:layout_constraintTop_toTopOf="@id/left_background"
-            app:layout_constraintBottom_toBottomOf="@id/left_background"
-            app:layout_constraintStart_toStartOf="@id/left_background"
-            app:layout_constraintEnd_toEndOf="@id/left_background" />
+            app:layout_constraintTop_toTopOf="@id/transfer_progress"
+            app:layout_constraintBottom_toBottomOf="@id/transfer_progress"
+            app:layout_constraintStart_toStartOf="@id/transfer_progress"
+            app:layout_constraintEnd_toEndOf="@id/transfer_progress" />
 
         <View
             android:id="@+id/file_background"
diff --git a/app/src/main/res/layout/chat_bubble_single_media_content.xml b/app/src/main/res/layout/chat_bubble_single_media_content.xml
index 432ddde49..e80eed5db 100644
--- a/app/src/main/res/layout/chat_bubble_single_media_content.xml
+++ b/app/src/main/res/layout/chat_bubble_single_media_content.xml
@@ -87,11 +87,11 @@
             android:id="@+id/transfer_progress"
             android:layout_width="@dimen/chat_bubble_grid_image_size"
             android:layout_height="@dimen/chat_bubble_grid_image_size"
-            android:padding="18dp"
             android:indeterminate="false"
             android:progress="@{model.transferProgress}"
             android:max="100"
             android:visibility="@{model.transferProgress == -1 || model.transferProgress >= 100 ? View.GONE : View.VISIBLE}"
+            app:indicatorSize="50dp"
             app:trackColor="?attr/color_main1_100"
             app:indicatorColor="?attr/color_main1_500"
             app:layout_constraintTop_toTopOf="@id/image"
@@ -100,6 +100,22 @@
             app:layout_constraintEnd_toEndOf="@id/image"
             tools:progress="40" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/main_page_title_style"
+            android:id="@+id/transfer_progress_label"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:onClick="@{() -> model.onClick()}"
+            android:onLongClick="@{onLongClickListener}"
+            android:text="@{model.transferProgressLabel, default=`40%`}"
+            android:textSize="16sp"
+            android:textAlignment="center"
+            android:textColor="?attr/color_main1_500"
+            app:layout_constraintTop_toTopOf="@id/transfer_progress"
+            app:layout_constraintBottom_toBottomOf="@id/transfer_progress"
+            app:layout_constraintStart_toStartOf="@id/transfer_progress"
+            app:layout_constraintEnd_toEndOf="@id/transfer_progress" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file