From 167b42810f4434d487cb5f2b885c3b67b0fda81d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Nov 2024 15:43:19 +0100
Subject: [PATCH] Added download progress percentage label

---
 .../linphone/ui/main/chat/model/FileModel.kt  | 14 +++-
 .../ui/main/chat/model/MessageModel.kt        |  6 +-
 .../layout/chat_bubble_content_grid_cell.xml  | 69 ++++++++++++++-----
 3 files changed, 67 insertions(+), 22 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 70f0650bb..704b1d4df 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
@@ -54,6 +54,8 @@ class FileModel @AnyThread constructor(
 
     val transferProgress = MutableLiveData<Int>()
 
+    val transferProgressLabel = MutableLiveData<String>()
+
     val mediaPreview = MutableLiveData<String>()
 
     val mediaPreviewAvailable = MutableLiveData<Boolean>()
@@ -86,7 +88,7 @@ class FileModel @AnyThread constructor(
 
     init {
         mediaPreviewAvailable.postValue(false)
-        transferProgress.postValue(-1)
+        updateTransferProgress(-1)
         formattedFileSize.postValue(FileUtils.bytesToDisplayableSize(fileSize))
 
         if (!isWaitingToBeDownloaded) {
@@ -136,6 +138,16 @@ class FileModel @AnyThread constructor(
         }
     }
 
+    @AnyThread
+    fun updateTransferProgress(percent: Int) {
+        transferProgress.postValue(percent)
+        if (percent < 0 || percent > 100) {
+            transferProgressLabel.postValue("")
+        } else {
+            transferProgressLabel.postValue("$percent%")
+        }
+    }
+
     @UiThread
     fun onClick() {
         onClicked?.invoke(this)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index a4ccc1679..d562c516c 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -204,7 +204,7 @@ class MessageModel @WorkerThread constructor(
                 }
             } else if (messageState == ChatMessage.State.FileTransferDone) {
                 Log.i("$TAG File transfer is done")
-                transferringFileModel?.transferProgress?.postValue(-1)
+                transferringFileModel?.updateTransferProgress(-1)
                 transferringFileModel = null
                 if (!allFilesDownloaded) {
                     computeContentsList()
@@ -258,7 +258,7 @@ class MessageModel @WorkerThread constructor(
                     )
                 }
             }
-            model?.transferProgress?.postValue(percent)
+            model?.updateTransferProgress(percent)
         }
 
         @WorkerThread
@@ -531,7 +531,7 @@ class MessageModel @WorkerThread constructor(
                     "$TAG File [$contentName] will be downloaded at [${content.filePath}]"
                 )
 
-                model.transferProgress.postValue(0)
+                model.updateTransferProgress(0)
                 transferringFileModel = model
                 chatMessage.downloadContent(content)
             } else {
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 405713998..35c0dda9c 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,14 @@
             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_background, file_icon" />
+            app:constraint_referenced_ids="file_name, file_background" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/download_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="@{model.transferProgress == -1 || model.transferProgress >= 100 ? View.GONE : View.VISIBLE}"
+            app:constraint_referenced_ids="transfer_progress, transfer_progress_label" />
 
         <ImageView
             android:id="@+id/broken_media_icon"
@@ -83,22 +90,32 @@
             app:layout_constraintEnd_toEndOf="@id/image"
             app:tint="@color/white" />
 
-        <ImageView
-            android:id="@+id/file_icon"
+        <View
+            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"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <ImageView
+            android:id="@+id/file_icon"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:onClick="@{() -> model.onClick()}"
             android:onLongClick="@{onLongClickListener}"
             android:adjustViewBounds="true"
             android:padding="18dp"
             android:contentDescription="@string/content_description_chat_bubble_file"
             android:src="@{model.isWaitingToBeDownloaded ? @drawable/download_simple : model.isPdf ? @drawable/file_pdf : model.isAudio ? @drawable/file_audio : @drawable/file, default=@drawable/file_pdf}"
-            android:background="@drawable/shape_squircle_main2_200_left"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            android:visibility="@{model.isImage || model.isVideoPreview || (model.transferProgress >= 0 &amp;&amp; model.transferProgress &lt; 100) ? View.GONE : View.VISIBLE}"
+            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:tint="?attr/color_main2_600" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -111,25 +128,41 @@
             android:textColor="@color/main2_600"
             android:textSize="12sp"
             android:visibility="@{model.isAudio &amp;&amp; model.audioVideoDuration.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintBottom_toBottomOf="@id/file_icon"
-            app:layout_constraintStart_toStartOf="@id/file_icon"/>
+            app:layout_constraintBottom_toBottomOf="@id/left_background"
+            app:layout_constraintStart_toStartOf="@id/left_background"/>
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             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/file_icon"
-            app:layout_constraintBottom_toBottomOf="@id/file_icon"
-            app:layout_constraintStart_toStartOf="parent"
+            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"
             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/left_background"
+            app:layout_constraintBottom_toBottomOf="@id/left_background"
+            app:layout_constraintStart_toStartOf="@id/left_background"
+            app:layout_constraintEnd_toEndOf="@id/left_background" />
+
         <View
             android:id="@+id/file_background"
             android:onClick="@{() -> model.onClick()}"
@@ -137,9 +170,9 @@
             android:layout_width="@dimen/chat_bubble_grid_file_width"
             android:layout_height="0dp"
             android:background="@drawable/shape_squircle_white_right"
-            app:layout_constraintTop_toTopOf="@id/file_icon"
-            app:layout_constraintBottom_toBottomOf="@id/file_icon"
-            app:layout_constraintStart_toEndOf="@id/file_icon"/>
+            app:layout_constraintTop_toTopOf="@id/left_background"
+            app:layout_constraintBottom_toBottomOf="@id/left_background"
+            app:layout_constraintStart_toEndOf="@id/left_background"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
@@ -157,7 +190,7 @@
             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_constraintStart_toEndOf="@id/left_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/file_background"
             app:layout_constraintBottom_toTopOf="@id/file_size"/>