diff --git a/briar-android/artwork/ic_check_circle_dark.svg b/briar-android/artwork/ic_check_circle_dark.svg
deleted file mode 100644
index de27d40e6..000000000
--- a/briar-android/artwork/ic_check_circle_dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/briar-android/artwork/ic_check_circle_light.svg b/briar-android/artwork/ic_check_circle_light.svg
deleted file mode 100644
index 75663aa42..000000000
--- a/briar-android/artwork/ic_check_circle_light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/briar-android/artwork/ic_error.svg b/briar-android/artwork/ic_error.svg
deleted file mode 100644
index fb585e152..000000000
--- a/briar-android/artwork/ic_error.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/briar-android/artwork/ic_exclamation_mark.svg b/briar-android/artwork/ic_exclamation_mark.svg
deleted file mode 100644
index 204d21e72..000000000
--- a/briar-android/artwork/ic_exclamation_mark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/briar-android/artwork/il_crash_dark.svg b/briar-android/artwork/il_crash_dark.svg
deleted file mode 100644
index 631be6878..000000000
--- a/briar-android/artwork/il_crash_dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/briar-android/artwork/il_crash_light.svg b/briar-android/artwork/il_crash_light.svg
deleted file mode 100644
index 9790eef8e..000000000
--- a/briar-android/artwork/il_crash_light.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
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 d2edbc98d..229683f7c 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.ic_error));
+ b.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_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 2e1e3bb19..fe706bc84 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.ic_error));
+ builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_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 6f713ab56..47468e98a 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,7 +29,8 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.ic_error);
+ args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
+ args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
index 48fdeb864..c72993776 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
@@ -186,7 +186,8 @@ public class MailboxActivity extends BriarActivity {
tag = ErrorFragment.TAG;
} else if (s instanceof MailboxPairingState.Paired) {
f = FinalFragment.newInstance(R.string.mailbox_setup_paired_title,
- R.drawable.ic_check_circle, 0,
+ R.drawable.ic_check_circle_outline,
+ R.color.briar_brand_green,
R.string.mailbox_setup_paired_description);
tag = FinalFragment.TAG;
} else {
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 dcaf17304..6f3db3e58 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
@@ -1,6 +1,7 @@
package org.briarproject.briar.android.mailbox;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -20,6 +21,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
import javax.inject.Inject;
+import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
@@ -31,6 +33,8 @@ import androidx.lifecycle.ViewModelProvider;
import static android.view.View.GONE;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
+import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.widget.ImageViewCompat.setImageTintList;
import static androidx.transition.TransitionManager.beginDelayedTransition;
import static org.briarproject.bramble.api.mailbox.MailboxConstants.API_CLIENT_TOO_OLD;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
@@ -137,20 +141,24 @@ public class MailboxStatusFragment extends Fragment {
}
private void onMailboxStateChanged(MailboxStatus status) {
+ @ColorRes int tintRes;
@DrawableRes int iconRes;
String title;
String message = null;
if (status.hasProblem(System.currentTimeMillis())) {
+ tintRes = R.color.briar_red_500;
title = getString(R.string.mailbox_status_failure_title);
- iconRes = R.drawable.ic_error;
+ iconRes = R.drawable.alerts_and_states_error;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getAttemptsSinceSuccess() > 0) {
- iconRes = R.drawable.ic_exclamation_mark;
+ iconRes = R.drawable.ic_help_outline_white;
title = getString(R.string.mailbox_status_problem_title);
+ tintRes = R.color.briar_orange_500;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getMailboxCompatibility() < 0) {
+ tintRes = R.color.briar_red_500;
if (status.getMailboxCompatibility() == API_CLIENT_TOO_OLD) {
title = getString(R.string.mailbox_status_app_too_old_title);
message =
@@ -161,16 +169,19 @@ public class MailboxStatusFragment extends Fragment {
message = getString(
R.string.mailbox_status_mailbox_too_old_message);
}
- iconRes = R.drawable.ic_error;
+ iconRes = R.drawable.alerts_and_states_error;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
} else {
- iconRes = R.drawable.ic_check_circle;
+ iconRes = R.drawable.ic_check_circle_outline;
title = getString(R.string.mailbox_status_connected_title);
+ tintRes = R.color.briar_brand_green;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
}
imageView.setImageResource(iconRes);
+ int color = getColor(requireContext(), tintRes);
+ setImageTintList(imageView, ColorStateList.valueOf(color));
statusTitleView.setText(title);
if (message == null) {
statusMessageView.setVisibility(GONE);
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 f9a778792..7ab791b88 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,7 +25,8 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.ic_error);
+ args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
+ args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/res/drawable/ic_check_circle.xml b/briar-android/src/main/res/drawable/ic_check_circle.xml
deleted file mode 100644
index 9acf3c670..000000000
--- a/briar-android/src/main/res/drawable/ic_check_circle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/ic_crash.xml b/briar-android/src/main/res/drawable/ic_crash.xml
new file mode 100644
index 000000000..f3b7746a1
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_crash.xml
@@ -0,0 +1,9 @@
+
+
+
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 645dcf10e..000000000
--- a/briar-android/src/main/res/drawable/ic_error.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/ic_exclamation_mark.xml b/briar-android/src/main/res/drawable/ic_exclamation_mark.xml
deleted file mode 100644
index 7e728cb86..000000000
--- a/briar-android/src/main/res/drawable/ic_exclamation_mark.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/il_crash.xml b/briar-android/src/main/res/drawable/il_crash.xml
deleted file mode 100644
index 1149e2d93..000000000
--- a/briar-android/src/main/res/drawable/il_crash.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index 80349dbee..02c136de4 100644
--- a/briar-android/src/main/res/layout/fragment_crash.xml
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -30,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/il_crash"
+ app:srcCompat="@drawable/ic_crash"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
index a785cfed6..643f81e38 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/ic_error"
+ app:srcCompat="@drawable/alerts_and_states_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 4b781301f..a75ac3d99 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/ic_error"
+ tools:srcCompat="@drawable/alerts_and_states_error"
tools:tint="@color/briar_red_500" />
+ tools:ignore="ContentDescription"
+ tools:src="@drawable/alerts_and_states_error" />