From e33c859f9e774d234e9dee72275a75dbfd5d97b6 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 12 Jan 2021 16:23:25 +0100 Subject: [PATCH] Added icons to download/file attachments in chat --- .../main/res/drawable-xhdpi/download_default.png | Bin 0 -> 1512 bytes .../res/drawable-xhdpi/download_disabled.png | Bin 0 -> 1513 bytes app/src/main/res/drawable-xhdpi/file.png | Bin 0 -> 1264 bytes app/src/main/res/drawable/download.xml | 6 ++++++ .../res/layout/chat_message_content_cell.xml | 9 ++++++++- app/src/main/res/values-night/styles.xml | 1 + app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/styles.xml | 1 + 8 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable-xhdpi/download_default.png create mode 100644 app/src/main/res/drawable-xhdpi/download_disabled.png create mode 100644 app/src/main/res/drawable-xhdpi/file.png create mode 100644 app/src/main/res/drawable/download.xml diff --git a/app/src/main/res/drawable-xhdpi/download_default.png b/app/src/main/res/drawable-xhdpi/download_default.png new file mode 100644 index 0000000000000000000000000000000000000000..7b0a1095d4794ba59c652e1dde5902ad73c13bf4 GIT binary patch literal 1512 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 asg-}gAyB5*=hPbj0000 + + + + + 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 3b42911fe..86f5fcd20 100644 --- a/app/src/main/res/layout/chat_message_content_cell.xml +++ b/app/src/main/res/layout/chat_message_content_cell.xml @@ -53,10 +53,15 @@ android:textSize="12sp" android:fontFamily="sans-serif" android:textStyle="normal" + android:drawableTop="@drawable/file" + android:drawableTint="?attr/drawableTintColor2" + android:drawablePadding="5dp" + android:padding="5dp" android:text="@{data.content.name}" android:visibility="@{data.downloadable || data.image || data.video ? View.GONE : View.VISIBLE, default=gone}" android:layout_width="150dp" - android:layout_height="100dp" + android:layout_height="match_parent" + android:maxHeight="100dp" android:layout_margin="5dp" android:background="@color/chat_bubble_text_color" android:ellipsize="end" @@ -75,6 +80,8 @@ android:layout_margin="5dp" android:textColor="@drawable/assistant_button_text_color" android:background="@drawable/resizable_assistant_button" + android:drawableLeft="@drawable/download" + android:drawablePadding="10dp" android:ellipsize="end" android:padding="10dp" /> diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index ecc6bbbb8..064ea33f0 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -34,6 +34,7 @@ @color/white_color @color/light_grey_color @color/primary_color + @color/dark_grey_color @color/dark_grey_color @color/light_grey_color diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 5b1850fc6..8345f6c27 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -19,6 +19,7 @@ + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4e34660d8..84286c7b3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -35,6 +35,7 @@ @color/dark_grey_color @color/disabled_color @color/primary_color + @color/white_color @color/toolbar_color @color/light_grey_color