From 4a2c1113c10818950c0045ee539b85225ef2f507 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 21 Oct 2022 12:55:46 -0300
Subject: [PATCH] Replace illustration for crash

---
 briar-android/artwork/il_crash_dark.svg       |  7 ++++++
 briar-android/artwork/il_crash_light.svg      |  7 ++++++
 .../android/reporting/CrashFragment.java      |  7 ++++++
 .../src/main/res/drawable/ic_crash.xml        |  9 -------
 .../src/main/res/drawable/il_crash.xml        | 25 +++++++++++++++++++
 .../src/main/res/layout/fragment_crash.xml    |  2 +-
 6 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 briar-android/artwork/il_crash_dark.svg
 create mode 100644 briar-android/artwork/il_crash_light.svg
 delete mode 100644 briar-android/src/main/res/drawable/ic_crash.xml
 create mode 100644 briar-android/src/main/res/drawable/il_crash.xml

diff --git a/briar-android/artwork/il_crash_dark.svg b/briar-android/artwork/il_crash_dark.svg
new file mode 100644
index 000000000..631be6878
--- /dev/null
+++ b/briar-android/artwork/il_crash_dark.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.4014 76.8438C60.5598 76.8438 76.9014 60.5021 76.9014 40.3438C76.9014 20.1854 60.5598 3.84375 40.4014 3.84375C20.243 3.84375 3.90137 20.1854 3.90137 40.3438C3.90137 60.5021 20.243 76.8438 40.4014 76.8438ZM40.4014 78.3438C61.3882 78.3438 78.4014 61.3306 78.4014 40.3438C78.4014 19.3569 61.3882 2.34375 40.4014 2.34375C19.4145 2.34375 2.40137 19.3569 2.40137 40.3438C2.40137 61.3306 19.4145 78.3438 40.4014 78.3438Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8334 26.9951C16.1263 26.7022 16.6012 26.7022 16.8941 26.9951L24.3638 34.4647L31.8334 26.9951C32.1263 26.7022 32.6012 26.7022 32.8941 26.9951C33.187 27.288 33.187 27.7628 32.8941 28.0557L25.4244 35.5254L32.8941 42.9951C33.187 43.288 33.187 43.7628 32.8941 44.0557C32.6012 44.3486 32.1263 44.3486 31.8334 44.0557L24.3638 36.5861L16.8941 44.0557C16.6012 44.3486 16.1263 44.3486 15.8334 44.0557C15.5405 43.7628 15.5405 43.288 15.8334 42.9951L23.3031 35.5254L15.8334 28.0557C15.5405 27.7628 15.5405 27.288 15.8334 26.9951Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.9091 26.9951C48.202 26.7022 48.6769 26.7022 48.9698 26.9951L56.4395 34.4647L63.9091 26.9951C64.202 26.7022 64.6769 26.7022 64.9698 26.9951C65.2627 27.288 65.2627 27.7628 64.9698 28.0557L57.5001 35.5254L64.9698 42.9951C65.2627 43.288 65.2627 43.7628 64.9698 44.0557C64.6769 44.3486 64.202 44.3486 63.9091 44.0557L56.4395 36.5861L48.9698 44.0557C48.6769 44.3486 48.202 44.3486 47.9091 44.0557C47.6162 43.7628 47.6162 43.288 47.9091 42.9951L55.3788 35.5254L47.9091 28.0557C47.6162 27.7628 47.6162 27.288 47.9091 26.9951Z" fill="#64748B"/>
+<path d="M53.4633 63.7465C53.4633 60.2823 52.0871 56.9599 49.6375 54.5103C47.1879 52.0607 43.8656 50.6846 40.4013 50.6846C36.9371 50.6846 33.6147 52.0607 31.1651 54.5103C28.7155 56.9599 27.3394 60.2823 27.3394 63.7465L40.4013 63.7465L53.4633 63.7465Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M51.8656 62.2465C51.5368 59.7336 50.3885 57.3826 48.5768 55.571C46.4086 53.4027 43.4677 52.1846 40.4013 52.1846C37.3349 52.1846 34.3941 53.4027 32.2258 55.571C30.4141 57.3826 29.2658 59.7336 28.937 62.2465L51.8656 62.2465ZM53.3769 62.2465C53.0403 59.3345 51.7309 56.6037 49.6375 54.5103C47.1879 52.0607 43.8656 50.6846 40.4013 50.6846C36.9371 50.6846 33.6147 52.0607 31.1651 54.5103C29.0717 56.6037 27.7623 59.3345 27.4257 62.2465C27.3685 62.742 27.3394 63.2428 27.3394 63.7465L53.4633 63.7465C53.4633 63.2428 53.4342 62.742 53.3769 62.2465Z" fill="#64748B"/>
+</svg>
diff --git a/briar-android/artwork/il_crash_light.svg b/briar-android/artwork/il_crash_light.svg
new file mode 100644
index 000000000..9790eef8e
--- /dev/null
+++ b/briar-android/artwork/il_crash_light.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.6514 76.5C60.8098 76.5 77.1514 60.1584 77.1514 40C77.1514 19.8416 60.8098 3.5 40.6514 3.5C20.493 3.5 4.15137 19.8416 4.15137 40C4.15137 60.1584 20.493 76.5 40.6514 76.5ZM40.6514 78C61.6382 78 78.6514 60.9868 78.6514 40C78.6514 19.0132 61.6382 2 40.6514 2C19.6645 2 2.65137 19.0132 2.65137 40C2.65137 60.9868 19.6645 78 40.6514 78Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0834 26.6513C16.3763 26.3584 16.8512 26.3584 17.1441 26.6513L24.6138 34.121L32.0834 26.6513C32.3763 26.3584 32.8512 26.3584 33.1441 26.6513C33.437 26.9442 33.437 27.4191 33.1441 27.712L25.6744 35.1816L33.1441 42.6513C33.437 42.9442 33.437 43.4191 33.1441 43.712C32.8512 44.0049 32.3763 44.0049 32.0834 43.712L24.6138 36.2423L17.1441 43.712C16.8512 44.0049 16.3763 44.0049 16.0834 43.712C15.7905 43.4191 15.7905 42.9442 16.0834 42.6513L23.5531 35.1816L16.0834 27.712C15.7905 27.4191 15.7905 26.9442 16.0834 26.6513Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.1591 26.6513C48.452 26.3584 48.9269 26.3584 49.2198 26.6513L56.6895 34.121L64.1591 26.6513C64.452 26.3584 64.9269 26.3584 65.2198 26.6513C65.5127 26.9442 65.5127 27.4191 65.2198 27.712L57.7501 35.1816L65.2198 42.6513C65.5127 42.9442 65.5127 43.4191 65.2198 43.712C64.9269 44.0049 64.452 44.0049 64.1591 43.712L56.6895 36.2423L49.2198 43.712C48.9269 44.0049 48.452 44.0049 48.1591 43.712C47.8662 43.4191 47.8662 42.9442 48.1591 42.6513L55.6288 35.1816L48.1591 27.712C47.8662 27.4191 47.8662 26.9442 48.1591 26.6513Z" fill="#9CA3AF"/>
+<path d="M53.7133 63.4028C53.7133 59.9385 52.3371 56.6162 49.8875 54.1666C47.4379 51.717 44.1156 50.3408 40.6513 50.3408C37.1871 50.3408 33.8647 51.717 31.4151 54.1666C28.9655 56.6162 27.5894 59.9385 27.5894 63.4028L40.6513 63.4028L53.7133 63.4028Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M52.1156 61.9028C51.7868 59.3899 50.6385 57.0389 48.8268 55.2272C46.6586 53.059 43.7177 51.8408 40.6513 51.8408C37.5849 51.8408 34.6441 53.059 32.4758 55.2272C30.6641 57.0389 29.5158 59.3898 29.187 61.9028L52.1156 61.9028ZM53.6269 61.9028C53.2903 58.9907 51.9809 56.26 49.8875 54.1666C47.4379 51.717 44.1156 50.3408 40.6513 50.3408C37.1871 50.3408 33.8647 51.717 31.4151 54.1666C29.3217 56.26 28.0123 58.9907 27.6757 61.9028C27.6185 62.3983 27.5894 62.899 27.5894 63.4028L53.7133 63.4028C53.7133 62.899 53.6842 62.3983 53.6269 61.9028Z" fill="#9CA3AF"/>
+</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
index cad46395a..75174a345 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
@@ -16,6 +16,8 @@ import javax.inject.Inject;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
+
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class CrashFragment extends BaseFragment {
@@ -55,4 +57,9 @@ public class CrashFragment extends BaseFragment {
 		return TAG;
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+		hideViewOnSmallScreen(requireView().findViewById(R.id.errorIcon));
+	}
 }
diff --git a/briar-android/src/main/res/drawable/ic_crash.xml b/briar-android/src/main/res/drawable/ic_crash.xml
deleted file mode 100644
index 9f6a33ecb..000000000
--- a/briar-android/src/main/res/drawable/ic_crash.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="128dp"
-        android:height="128dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="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>
diff --git a/briar-android/src/main/res/drawable/il_crash.xml b/briar-android/src/main/res/drawable/il_crash.xml
new file mode 100644
index 000000000..1149e2d93
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_crash.xml
@@ -0,0 +1,25 @@
+<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>
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index 02c136de4..80349dbee 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/ic_crash"
+				app:srcCompat="@drawable/il_crash"
 				app:tint="?attr/colorControlNormal"
 				tools:ignore="ContentDescription" />