From a534ec2b502fc10bb7bcda879cfdd7758c22c33c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 26 May 2021 10:33:33 -0300
Subject: [PATCH] Adapt hotspot buttons to latest design and add a nullability
 annotation

---
 .../briar/android/hotspot/ConditionManager.java           | 3 ++-
 .../src/main/res/layout/fragment_hotspot_help.xml         | 2 +-
 .../src/main/res/layout/fragment_hotspot_tabs.xml         | 8 ++++----
 briar-android/src/main/res/values/strings.xml             | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ConditionManager.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ConditionManager.java
index d8e217060..c0fc3b3f0 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ConditionManager.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ConditionManager.java
@@ -10,6 +10,7 @@ import org.briarproject.briar.R;
 
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
@@ -106,7 +107,7 @@ class ConditionManager {
 		return false;
 	}
 
-	void onRequestPermissionResult(Boolean granted) {
+	void onRequestPermissionResult(@Nullable Boolean granted) {
 		if (granted != null && granted) {
 			locationPermission = Permission.GRANTED;
 		} else if (shouldShowRequestPermissionRationale(ctx,
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_help.xml b/briar-android/src/main/res/layout/fragment_hotspot_help.xml
index 50935079c..ff361aa93 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_help.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_help.xml
@@ -134,7 +134,7 @@
 
 		<Button
 			android:id="@+id/fallbackButton"
-			style="@style/BriarButton"
+			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_margin="16dp"
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml b/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
index 108ca44dd..941f970b4 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
@@ -76,15 +76,15 @@
 
 	<Button
 		android:id="@+id/stopButton"
-		style="@style/BriarButton"
-		android:layout_width="0dp"
+		style="@style/BriarButtonFlat.Negative"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"
+		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_stop_sharing"
-		app:backgroundTint="@color/briar_red_500"
 		app:drawableLeftCompat="@drawable/ic_portable_wifi_off"
 		app:drawableStartCompat="@drawable/ic_portable_wifi_off"
-		app:drawableTint="@color/button_text"
+		app:drawableTint="@color/briar_red_500"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 1edb813b5..18a01f81e 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -701,7 +701,7 @@
 	<string name="hotspot_progress_text_start">Setting up hotspot…</string>
 	<string name="hotspot_notification_channel_title">Wi-Fi hotspot</string>
 	<string name="hotspot_notification_title">Sharing Briar offline</string>
-	<string name="hotspot_button_connected">Confirm connection</string>
+	<string name="hotspot_button_connected">Start app sharing</string>
 
 	<string name="permission_hotspot_location_request_body">To create a Wi-Fi hotspot, Briar needs permission to access your location.\n\nBriar does not store your location or share it with anyone.</string>
 	<string name="permission_hotspot_location_denied_body">You have denied access to your location, but Briar needs this permission to create a Wi-Fi hotspot.\n\nPlease consider granting access.</string>