mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-13 11:19:04 +01:00
Merge branch 'illustration-revert' into 'master'
Don't change icons for thinner versions See merge request briar/briar!1740
This commit is contained in:
akwizgran
@@ -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));
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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_lime"
|
||||
android:pathData="M62.571,35.163C63.214,34.517 63.211,33.473 62.565,32.83C61.919,32.187 60.874,32.19 60.231,32.836L39.524,53.66L30.571,44.658C29.929,44.012 28.884,44.009 28.238,44.651C27.592,45.294 27.589,46.339 28.232,46.985L39.524,58.34L62.571,35.163Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_lime"
|
||||
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>
|
||||
9
briar-android/src/main/res/drawable/ic_crash.xml
Normal file
9
briar-android/src/main/res/drawable/ic_crash.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="128dp"
|
||||
android:height="128dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M11.99,2C6.47,2 2,6.47 2,12s4.47,10 9.99,10S22,17.53 22,12 17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM16.18,7.76l-1.06,1.06 -1.06,-1.06L13,8.82l1.06,1.06L13,10.94 14.06,12l1.06,-1.06L16.18,12l1.06,-1.06 -1.06,-1.06 1.06,-1.06zM7.82,12l1.06,-1.06L9.94,12 11,10.94 9.94,9.88 11,8.82 9.94,7.76 8.88,8.82 7.82,7.76 6.76,8.82l1.06,1.06 -1.06,1.06zM12,14c-2.33,0 -4.31,1.46 -5.11,3.5h10.22c-0.8,-2.04 -2.78,-3.5 -5.11,-3.5z" />
|
||||
</vector>
|
||||
@@ -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>
|
||||
@@ -1,16 +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_orange"
|
||||
android:pathData="M43.797,23.755C43.797,22.844 44.536,22.105 45.447,22.105C46.358,22.105 47.097,22.844 47.097,23.755V50.86C47.097,51.772 46.358,52.51 45.447,52.51C44.536,52.51 43.797,51.772 43.797,50.86V23.755Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_orange"
|
||||
android:pathData="M43.797,61.486C43.797,60.575 44.536,59.836 45.447,59.836C46.358,59.836 47.097,60.575 47.097,61.486V61.755C47.097,62.667 46.358,63.405 45.447,63.405C44.536,63.405 43.797,62.667 43.797,61.755V61.486Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_orange"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M89.4,45C89.4,69.3 69.701,89 45.4,89C21.1,89 1.4,69.3 1.4,45C1.4,20.699 21.1,1 45.4,1C69.701,1 89.4,20.699 89.4,45ZM86.1,45C86.1,67.478 67.878,85.7 45.4,85.7C22.922,85.7 4.7,67.478 4.7,45C4.7,22.522 22.922,4.3 45.4,4.3C67.878,4.3 86.1,22.522 86.1,45Z" />
|
||||
</vector>
|
||||
@@ -1,25 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="80dp"
|
||||
android:height="80dp"
|
||||
android:viewportWidth="80"
|
||||
android:viewportHeight="80">
|
||||
<path
|
||||
android:fillColor="@color/il_border"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M40.651,76.5C60.81,76.5 77.151,60.158 77.151,40C77.151,19.842 60.81,3.5 40.651,3.5C20.493,3.5 4.151,19.842 4.151,40C4.151,60.158 20.493,76.5 40.651,76.5ZM40.651,78C61.638,78 78.651,60.987 78.651,40C78.651,19.013 61.638,2 40.651,2C19.664,2 2.651,19.013 2.651,40C2.651,60.987 19.664,78 40.651,78Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_border"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M16.083,26.651C16.376,26.358 16.851,26.358 17.144,26.651L24.614,34.121L32.083,26.651C32.376,26.358 32.851,26.358 33.144,26.651C33.437,26.944 33.437,27.419 33.144,27.712L25.674,35.182L33.144,42.651C33.437,42.944 33.437,43.419 33.144,43.712C32.851,44.005 32.376,44.005 32.083,43.712L24.614,36.242L17.144,43.712C16.851,44.005 16.376,44.005 16.083,43.712C15.79,43.419 15.79,42.944 16.083,42.651L23.553,35.182L16.083,27.712C15.79,27.419 15.79,26.944 16.083,26.651Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_border"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M48.159,26.651C48.452,26.358 48.927,26.358 49.22,26.651L56.689,34.121L64.159,26.651C64.452,26.358 64.927,26.358 65.22,26.651C65.513,26.944 65.513,27.419 65.22,27.712L57.75,35.182L65.22,42.651C65.513,42.944 65.513,43.419 65.22,43.712C64.927,44.005 64.452,44.005 64.159,43.712L56.689,36.242L49.22,43.712C48.927,44.005 48.452,44.005 48.159,43.712C47.866,43.419 47.866,42.944 48.159,42.651L55.629,35.182L48.159,27.712C47.866,27.419 47.866,26.944 48.159,26.651Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_background"
|
||||
android:pathData="M53.713,63.403C53.713,59.938 52.337,56.616 49.888,54.167C47.438,51.717 44.116,50.341 40.651,50.341C37.187,50.341 33.865,51.717 31.415,54.167C28.965,56.616 27.589,59.938 27.589,63.403L40.651,63.403L53.713,63.403Z" />
|
||||
<path
|
||||
android:fillColor="@color/il_border"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M52.116,61.903C51.787,59.39 50.639,57.039 48.827,55.227C46.659,53.059 43.718,51.841 40.651,51.841C37.585,51.841 34.644,53.059 32.476,55.227C30.664,57.039 29.516,59.39 29.187,61.903L52.116,61.903ZM53.627,61.903C53.29,58.991 51.981,56.26 49.888,54.167C47.438,51.717 44.116,50.341 40.651,50.341C37.187,50.341 33.865,51.717 31.415,54.167C29.322,56.26 28.012,58.991 27.676,61.903C27.618,62.398 27.589,62.899 27.589,63.403L53.713,63.403C53.713,62.899 53.684,62.398 53.627,61.903Z" />
|
||||
</vector>
|
||||
@@ -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" />
|
||||
|
||||
|
||||
@@ -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" />
|
||||
|
||||
|
||||
@@ -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" />
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user