From dab8d731fa55aa0f1f26c46ce8ae057767fa1b09 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 20 Oct 2022 14:39:40 -0300
Subject: [PATCH] Replace illustration for error fragment
---
briar-android/artwork/ic_error.svg | 4 ++++
.../contact/add/remote/NicknameFragment.java | 2 +-
.../briar/android/login/LoginUtils.java | 2 +-
.../briar/android/mailbox/ErrorFragment.java | 3 +--
.../android/mailbox/MailboxStatusFragment.java | 6 +++---
.../briar/android/removabledrive/ErrorFragment.java | 3 +--
briar-android/src/main/res/drawable/ic_error.xml | 13 +++++++++++++
.../src/main/res/layout/fragment_error.xml | 2 +-
.../src/main/res/layout/fragment_final.xml | 2 +-
.../res/layout/list_item_conversation_msg_out.xml | 3 +--
briar-android/src/main/res/values-night/color.xml | 1 +
briar-android/src/main/res/values/color.xml | 3 +++
12 files changed, 31 insertions(+), 13 deletions(-)
create mode 100644 briar-android/artwork/ic_error.svg
create 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
new file mode 100644
index 0000000000..fb585e1524
--- /dev/null
+++ b/briar-android/artwork/ic_error.svg
@@ -0,0 +1,4 @@
+<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/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
index 229683f7c3..d2edbc98d2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
@@ -211,7 +211,7 @@ public class NicknameFragment extends BaseFragment {
private void showWarningDialog(String name1, String name2) {
Context ctx = requireContext();
Builder b = new Builder(ctx, R.style.BriarDialogTheme);
- b.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
+ b.setIcon(getDialogIcon(ctx, R.drawable.ic_error));
b.setTitle(getString(R.string.duplicate_link_dialog_title));
b.setMessage(
getString(R.string.duplicate_link_dialog_text_3, name1, name2));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
index fe706bc845..2e1e3bb19c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
@@ -15,7 +15,7 @@ class LoginUtils {
static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
AlertDialog.Builder builder =
new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
- builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
+ builder.setIcon(getDialogIcon(ctx, R.drawable.ic_error));
builder.setTitle(R.string.dialog_title_cannot_check_password);
builder.setMessage(R.string.dialog_message_cannot_check_password);
builder.setPositiveButton(R.string.ok, null);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
index 47468e98a4..6f713ab565 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
@@ -29,8 +29,7 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
- args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
+ args.putInt(ARG_ICON, R.drawable.ic_error);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
index 6f3db3e582..6c2584b057 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
@@ -148,7 +148,7 @@ public class MailboxStatusFragment extends Fragment {
if (status.hasProblem(System.currentTimeMillis())) {
tintRes = R.color.briar_red_500;
title = getString(R.string.mailbox_status_failure_title);
- iconRes = R.drawable.alerts_and_states_error;
+ iconRes = R.drawable.ic_error;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getAttemptsSinceSuccess() > 0) {
@@ -169,11 +169,11 @@ public class MailboxStatusFragment extends Fragment {
message = getString(
R.string.mailbox_status_mailbox_too_old_message);
}
- iconRes = R.drawable.alerts_and_states_error;
+ iconRes = R.drawable.ic_error;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
} else {
- iconRes = R.drawable.ic_check_circle_outline;
+ iconRes = R.drawable.ic_check_circle;
title = getString(R.string.mailbox_status_connected_title);
tintRes = R.color.briar_brand_green;
showUnlinkWarning = true;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
index 7ab791b889..f9a7787927 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
@@ -25,8 +25,7 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
- args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
+ args.putInt(ARG_ICON, R.drawable.ic_error);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/res/drawable/ic_error.xml b/briar-android/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000..645dcf10e9
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,13 @@
+<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/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
index 643f81e387..a785cfed6b 100644
--- a/briar-android/src/main/res/layout/fragment_error.xml
+++ b/briar-android/src/main/res/layout/fragment_error.xml
@@ -21,7 +21,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/alerts_and_states_error"
+ app:srcCompat="@drawable/ic_error"
app:tint="@color/briar_red_500"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_final.xml b/briar-android/src/main/res/layout/fragment_final.xml
index a75ac3d99c..4b781301f6 100644
--- a/briar-android/src/main/res/layout/fragment_final.xml
+++ b/briar-android/src/main/res/layout/fragment_final.xml
@@ -28,7 +28,7 @@
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
tools:ignore="ContentDescription"
- tools:srcCompat="@drawable/alerts_and_states_error"
+ tools:srcCompat="@drawable/ic_error"
tools:tint="@color/briar_red_500" />
<TextView
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 7e03d0a7fb..9bd2ea5896 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,8 +36,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:spanCount="2"
- tools:ignore="ContentDescription"
- tools:src="@drawable/alerts_and_states_error" />
+ tools:ignore="ContentDescription" />
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/text"
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index f2dfe00b90..f741587362 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -30,4 +30,5 @@
<color name="il_border">#64748B</color>
<color name="il_background">#334155</color>
<color name="il_lime">@color/briar_lime_400_new</color>
+ <color name="il_red">@color/briar_red_500_new</color>
</resources>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 2928f38681..ced7798966 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -13,6 +13,8 @@
<color name="briar_orange_500">#fc9403</color>
<color name="briar_red_500">#db3b21</color>
+ <color name="briar_red_500_new">#EF4444</color>
+ <color name="briar_red_600">#DC2626</color>
<color name="briar_night_950">#0e171f</color>
<color name="briar_night_800">#212d3b</color>
@@ -58,6 +60,7 @@
<color name="il_border">#9CA3AF</color>
<color name="il_background">#E5E7EB</color>
<color name="il_lime">@color/briar_lime_600_new</color>
+ <color name="il_red">@color/briar_red_600</color>
<!-- text colors -->
<color name="briar_text_link">@color/briar_blue_400</color>
--
GitLab