Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Replace illustration for error fragment

Browse Source
This commit is contained in:
Torsten Grote
2022-10-20 14:39:40 -03:00
parent 65509137b6
commit dab8d731fa
12 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
View File

@@ -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));

2
briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
View File

@@ -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);

3
briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
View File

@@ -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;

6
briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
View File

@@ -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;

3
briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
View File

@@ -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;

13
briar-android/src/main/res/drawable/ic_error.xml Normal file
View File

@@ -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>

2
briar-android/src/main/res/layout/fragment_error.xml
View File

@@ -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" />

2
briar-android/src/main/res/layout/fragment_final.xml
View File

@@ -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

3
briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
View File

@@ -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"

1
briar-android/src/main/res/values-night/color.xml
View File

@@ -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>

3
briar-android/src/main/res/values/color.xml
View File

@@ -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>