From d07ff2ebfdc9ae61c3e7927978ac85ea0efbb953 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 20 May 2021 15:14:46 +0200
Subject: [PATCH] Added new progress bar for file transfers

---
 .../main/chat/data/ChatMessageContentData.kt  |  3 +++
 .../background_round_secondary_color.xml      |  5 ++++
 .../res/layout/chat_message_content_cell.xml  | 24 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 app/src/main/res/drawable/background_round_secondary_color.xml

diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
index 08dccdd5c..6870f1069 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
@@ -50,6 +50,7 @@ class ChatMessageContentData(
     val downloadable = MutableLiveData<Boolean>()
     val downloadEnabled = MutableLiveData<Boolean>()
     val downloadProgress = MutableLiveData<Int>()
+    val downloadProgressString = MutableLiveData<String>()
     val downloadLabel = MutableLiveData<String>()
 
     val isAlone: Boolean
@@ -74,6 +75,7 @@ class ChatMessageContentData(
                 val percent = offset * 100 / total
                 Log.d("[Content] Download progress is: $offset / $total ($percent%)")
                 downloadProgress.postValue(percent)
+                downloadProgressString.postValue("$percent%")
             }
         }
 
@@ -136,6 +138,7 @@ class ChatMessageContentData(
         isGenericFile.value = !isPdf.value!! && !isAudio.value!! && !isVideo.value!! && !isImage.value!!
         downloadEnabled.value = !chatMessage.isFileTransferInProgress
         downloadProgress.value = 0
+        downloadProgressString.value = "0%"
         chatMessage.addListener(chatMessageListener)
     }
 
diff --git a/app/src/main/res/drawable/background_round_secondary_color.xml b/app/src/main/res/drawable/background_round_secondary_color.xml
new file mode 100644
index 000000000..4b8a04dad
--- /dev/null
+++ b/app/src/main/res/drawable/background_round_secondary_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/dark_grey_color"/>
+    <size android:width="35dp" android:height="35dp" />
+</shape>
diff --git a/app/src/main/res/layout/chat_message_content_cell.xml b/app/src/main/res/layout/chat_message_content_cell.xml
index 5c8c86d93..3cfc13fd3 100644
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_content_cell.xml
@@ -86,6 +86,30 @@
 
         </LinearLayout>
 
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="@{data.downloadProgress > 0 ? View.VISIBLE : View.GONE}"
+            android:layout_centerInParent="true">
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:max="100"
+                android:layout_centerInParent="true"
+                app:trackColor="?attr/backgroundColor"
+                android:progress="@{data.downloadProgress, default=50}"
+                android:background="@drawable/background_round_secondary_color"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:textColor="?attr/secondaryTextColor"
+                android:text="@{data.downloadProgressString, default=`50%`}"/>
+
+        </RelativeLayout>
+
     </RelativeLayout>
 
 </layout>