Improved a bit the chat message file download layout
This commit is contained in:
parent
9a548ff388
commit
5d78281931
3 changed files with 34 additions and 24 deletions
|
@ -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) {
|
||||
|
|
|
@ -95,41 +95,46 @@
|
|||
<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">
|
||||
|
||||
<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="101"
|
||||
android:layout_marginTop="5dp"
|
||||
android:max="100"
|
||||
android:visibility="@{data.downloadProgress > 0 ? View.VISIBLE : View.GONE, default=gone}"
|
||||
android:progress="@{data.downloadProgress, default=50}"/>
|
||||
|
||||
|
@ -137,6 +142,8 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</layout>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue