From aecd204efe1650eeff0743b7567e1e4ffb372c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Wed, 9 Jun 2021 17:11:46 +0200
Subject: [PATCH] Improve hotspot error fragment UI

* Use different highlighting for error message
* Improve margins in fragment_hotspot_save_apk.xml
* Address some review feedback
---
 .../briar/android/hotspot/HotspotErrorFragment.java       | 1 +
 .../briar/android/hotspot/HotspotHelpFragment.java        | 6 ------
 .../briar/android/hotspot/HotspotViewModel.java           | 5 ++++-
 .../src/main/res/layout/fragment_hotspot_error.xml        | 8 +++++---
 .../src/main/res/layout/fragment_hotspot_save_apk.xml     | 2 +-
 briar-android/src/main/res/values/color.xml               | 1 +
 briar-android/src/main/res/values/strings.xml             | 1 +
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java
index 2f7d0a795..70828484e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotErrorFragment.java
@@ -60,6 +60,7 @@ public class HotspotErrorFragment extends BaseFragment {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
+		requireActivity().setTitle(R.string.error);
 		return inflater
 				.inflate(R.layout.fragment_hotspot_error, container, false);
 	}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java
index 6d8d5507f..4b5a2d20f 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotHelpFragment.java
@@ -9,12 +9,9 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 
-import javax.inject.Inject;
-
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.ViewModelProvider;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -22,9 +19,6 @@ public class HotspotHelpFragment extends Fragment {
 
 	public final static String TAG = HotspotHelpFragment.class.getName();
 
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java
index b98edb023..1fceb5133 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java
@@ -42,6 +42,7 @@ import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Environment.DIRECTORY_DOWNLOADS;
 import static android.os.Environment.getExternalStoragePublicDirectory;
 import static java.util.Objects.requireNonNull;
+import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.IoUtils.copyAndClose;
 import static org.briarproject.briar.BuildConfig.DEBUG;
@@ -144,7 +145,9 @@ class HotspotViewModel extends DbViewModel
 
 	@Override
 	public void onHotspotError(String error) {
-		LOG.warning("Hotspot error: " + error);
+		if (LOG.isLoggable(WARNING)) {
+			LOG.warning("Hotspot error: " + error);
+		}
 		state.postValue(new HotspotError(error));
 		ioExecutor.execute(webServerManager::stopWebServer);
 		notificationManager.clearHotspotNotification();
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_error.xml b/briar-android/src/main/res/layout/fragment_hotspot_error.xml
index 7534159ed..7d6d03619 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_error.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_error.xml
@@ -20,7 +20,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
 			app:srcCompat="@drawable/alerts_and_states_error"
-			app:tint="?attr/colorControlNormal"
+			app:tint="@color/briar_red_500"
 			tools:ignore="ContentDescription" />
 
 		<TextView
@@ -42,10 +42,12 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginVertical="16dp"
-			android:background="@color/briar_warning_background"
+			android:background="@color/briar_orange_200"
+			android:gravity="center"
 			android:padding="8dp"
-			android:textColor="@color/briar_text_primary_inverse"
+			android:textColor="@color/briar_text_primary"
 			android:textSize="@dimen/text_size_medium"
+			android:typeface="monospace"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0.0"
 			app:layout_constraintStart_toStartOf="parent"
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_save_apk.xml b/briar-android/src/main/res/layout/fragment_hotspot_save_apk.xml
index ff2b4fb4c..ee3c637f1 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_save_apk.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_save_apk.xml
@@ -21,7 +21,7 @@
 		android:id="@+id/fallbackIntro"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginVertical="16dp"
+		android:layout_marginTop="16dp"
 		android:text="@string/hotspot_help_fallback_intro"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 445b204c0..f0b66de15 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -7,6 +7,7 @@
 	<color name="briar_blue_600">#1b69b6</color>
 	<color name="briar_blue_400">#418cd8</color>
 
+	<color name="briar_orange_200">#fed69f</color>
 	<color name="briar_orange_500">#fc9403</color>
 
 	<color name="briar_red_500">#db3b21</color>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index b444275be..c35fb0cbe 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -160,6 +160,7 @@
 	<string name="sorry">Sorry</string>
 	<string name="error_start_activity">Unavailable on your system</string>
 	<string name="status_heading">Status:</string>
+	<string name="error">Error</string>
 
 	<!-- Contacts and Private Conversations-->
 	<string name="no_contacts">No contacts to show</string>