From 5d782819314a2e700fb005dec63c74e470f2ca82 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Jan 2021 12:07:12 +0100
Subject: [PATCH] Improved a bit the chat message file download layout

---
 .../chat/viewmodels/ChatMessageViewModel.kt   |  2 -
 .../res/layout/chat_message_content_cell.xml  | 51 +++++++++++--------
 app/src/main/res/values/styles.xml            |  5 ++
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt
index 8524d9f3e..9bc0ede78 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageViewModel.kt
@@ -76,8 +76,6 @@ class ChatMessageViewModel(
             // TODO FIXME : find a way to refresh outgoing message downloaded
             if (state == ChatMessage.State.FileTransferDone && !message.isOutgoing) {
                 Log.i("[Chat Message] File transfer done")
-                // No need to refresh content lists on outgoing messages after file transfer is done
-                // It will even cause the app to crash if updateContentsList isn't called right after
                 updateContentsList()
 
                 if (!message.isEphemeral && corePreferences.makePublicMediaFilesDownloaded) {
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 0a5f6de92..77bbf88bd 100644
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_content_cell.xml
@@ -95,43 +95,50 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/download"
-                android:padding="10dp" />
+                android:contentDescription="@string/chat_message_download_file"
+                android:padding="5dp"
+                android:src="@drawable/download" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:gravity="center"
-                android:padding="10dp">
+                android:gravity="center_vertical"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp">
 
                 <TextView
                     style="@style/button_small_font"
-                    android:text="@{data.fileName + ` (` + data.fileSize + `)`}"
+                    android:text="@{data.fileName}"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAlignment="center"
+                    android:ellipsize="end"
                     android:textColor="@drawable/assistant_button_text_color" />
 
-                <TextView
-                    style="@style/button_font"
-                    android:text="@string/chat_message_download_file"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@drawable/assistant_button_text_color"
-                    android:layout_marginTop="5dp"
-                    android:ellipsize="end"
-                    android:visibility="@{data.downloadEnabled ? View.VISIBLE : View.GONE}" />
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-                <ProgressBar
-                    android:layout_width="100dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                    android:max="101"
-                    android:layout_marginTop="5dp"
-                    android:visibility="@{data.downloadProgress > 0 ? View.VISIBLE : View.GONE, default=gone}"
-                    android:progress="@{data.downloadProgress, default=50}"/>
+                    <TextView
+                        style="@style/button_tiny_font"
+                        android:text="@{data.fileSize}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="5dp"
+                        android:textColor="@drawable/assistant_button_text_color" />
+
+                    <ProgressBar
+                        android:layout_width="100dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                        android:max="100"
+                        android:visibility="@{data.downloadProgress > 0 ? View.VISIBLE : View.GONE, default=gone}"
+                        android:progress="@{data.downloadProgress, default=50}"/>
+
+                </LinearLayout>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 066ea0534..972b78215 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -247,6 +247,11 @@
         <item name="android:textSize">13sp</item>
     </style>
 
+    <style name="button_tiny_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/primarySubtextDarkColor</item>
+        <item name="android:textSize">10sp</item>
+    </style>
+
     <style name="standard_small_text_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primarySubtextDarkColor</item>
         <item name="android:textSize">15sp</item>