From 0c40f39a9097b5cfc4b1060a8ecbcad0332265c1 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Mon, 7 Nov 2022 09:39:01 -0300 Subject: [PATCH] Revert "Replace illustration for error fragment" This reverts commit dab8d731 --- briar-android/artwork/ic_error.svg | 4 ---- briar-android/src/main/res/drawable/ic_error.xml | 13 ------------- .../res/layout/list_item_conversation_msg_out.xml | 3 ++- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 briar-android/artwork/ic_error.svg delete mode 100644 briar-android/src/main/res/drawable/ic_error.xml diff --git a/briar-android/artwork/ic_error.svg b/briar-android/artwork/ic_error.svg deleted file mode 100644 index fb585e1524..0000000000 --- a/briar-android/artwork/ic_error.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg width="91" height="90" viewBox="0 0 91 90" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M33.5682 30.8334C32.9238 30.189 31.8791 30.189 31.2347 30.8334C30.5904 31.4777 30.5904 32.5225 31.2347 33.1668L43.068 45.0001L31.2347 56.8334C30.5904 57.4777 30.5904 58.5225 31.2347 59.1668C31.8791 59.8112 32.9238 59.8112 33.5682 59.1668L45.4015 47.3335L57.2347 59.1668C57.8791 59.8112 58.9238 59.8112 59.5682 59.1668C60.2126 58.5225 60.2126 57.4777 59.5682 56.8334L47.7349 45.0001L59.5682 33.1668C60.2126 32.5225 60.2126 31.4777 59.5682 30.8334C58.9238 30.189 57.8791 30.189 57.2347 30.8334L45.4015 42.6666L33.5682 30.8334Z" fill="#EF4444"/> -<path fill-rule="evenodd" clip-rule="evenodd" d="M89.4014 45C89.4014 69.3005 69.7019 89 45.4014 89C21.1008 89 1.40137 69.3005 1.40137 45C1.40137 20.6995 21.1008 1 45.4014 1C69.7019 1 89.4014 20.6995 89.4014 45ZM86.1014 45C86.1014 67.478 67.8794 85.7 45.4014 85.7C22.9234 85.7 4.70137 67.478 4.70137 45C4.70137 22.522 22.9234 4.3 45.4014 4.3C67.8794 4.3 86.1014 22.522 86.1014 45Z" fill="#EF4444"/> -</svg> diff --git a/briar-android/src/main/res/drawable/ic_error.xml b/briar-android/src/main/res/drawable/ic_error.xml deleted file mode 100644 index 645dcf10e9..0000000000 --- a/briar-android/src/main/res/drawable/ic_error.xml +++ /dev/null @@ -1,13 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="90dp" - android:height="90dp" - android:viewportWidth="91" - android:viewportHeight="90"> - <path - android:fillColor="@color/il_red" - android:pathData="M33.568,30.833C32.924,30.189 31.879,30.189 31.235,30.833C30.59,31.478 30.59,32.522 31.235,33.167L43.068,45L31.235,56.833C30.59,57.478 30.59,58.522 31.235,59.167C31.879,59.811 32.924,59.811 33.568,59.167L45.402,47.333L57.235,59.167C57.879,59.811 58.924,59.811 59.568,59.167C60.213,58.522 60.213,57.478 59.568,56.833L47.735,45L59.568,33.167C60.213,32.522 60.213,31.478 59.568,30.833C58.924,30.189 57.879,30.189 57.235,30.833L45.402,42.667L33.568,30.833Z" /> - <path - android:fillColor="@color/il_red" - android:fillType="evenOdd" - android:pathData="M89.401,45C89.401,69.3 69.702,89 45.401,89C21.101,89 1.401,69.3 1.401,45C1.401,20.699 21.101,1 45.401,1C69.702,1 89.401,20.699 89.401,45ZM86.101,45C86.101,67.478 67.879,85.7 45.401,85.7C22.923,85.7 4.701,67.478 4.701,45C4.701,22.522 22.923,4.3 45.401,4.3C67.879,4.3 86.101,22.522 86.101,45Z" /> -</vector> diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml index 9bd2ea5896..7e03d0a7fb 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml @@ -36,7 +36,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:spanCount="2" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" + tools:src="@drawable/alerts_and_states_error" /> <com.vanniktech.emoji.EmojiTextView android:id="@+id/text" -- GitLab