From bd430a1009d6e7017a353a4c50a9b3fda2a6fef1 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 29 Nov 2022 18:00:37 +0000
Subject: [PATCH] Use outlined button style for secondary actions.

---
 .../src/main/res/drawable/button_outline.xml  | 15 ++++++
 .../res/layout/fragment_hotspot_error.xml     |  4 +-
 .../res/layout/fragment_hotspot_fallback.xml  |  4 +-
 .../main/res/layout/fragment_hotspot_tabs.xml | 14 +++--
 .../layout/fragment_mailbox_error_wizard.xml  |  5 +-
 .../fragment_mailbox_error_wizard_access.xml  | 17 +++---
 .../res/layout/fragment_mailbox_status.xml    | 52 ++++++++++---------
 .../src/main/res/layout/fragment_offline.xml  | 10 ++--
 briar-android/src/main/res/values/color.xml   |  1 +
 briar-android/src/main/res/values/dimens.xml  |  1 +
 briar-android/src/main/res/values/styles.xml  | 35 ++++++++++---
 11 files changed, 100 insertions(+), 58 deletions(-)
 create mode 100644 briar-android/src/main/res/drawable/button_outline.xml

diff --git a/briar-android/src/main/res/drawable/button_outline.xml b/briar-android/src/main/res/drawable/button_outline.xml
new file mode 100644
index 000000000..0db27b162
--- /dev/null
+++ b/briar-android/src/main/res/drawable/button_outline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:bottom="6dp"
+		android:left="4dp"
+		android:right="4dp"
+		android:top="4dp">
+		<shape android:shape="rectangle">
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="1dp"
+				android:color="@color/briar_button_outline" />
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
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 2bf918c5b..3285cffc1 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_error.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_error.xml
@@ -56,9 +56,7 @@
 
 		<Button
 			android:id="@+id/feedbackButton"
-			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			style="@style/BriarButtonOutline.Neutral"
 			android:layout_marginTop="16dp"
 			android:text="@string/send_feedback"
 			app:layout_constraintEnd_toEndOf="parent"
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_fallback.xml b/briar-android/src/main/res/layout/fragment_hotspot_fallback.xml
index 1fbb39157..818f6abe0 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_fallback.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_fallback.xml
@@ -30,9 +30,7 @@
 
 	<Button
 		android:id="@+id/fallbackButton"
-		style="@style/BriarButtonFlat.Positive"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		style="@style/BriarButtonOutline.Neutral"
 		android:layout_marginTop="16dp"
 		android:text="@string/hotspot_help_fallback_button"
 		app:layout_constraintEnd_toEndOf="parent"
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 10f6e95ff..1fdd7d620 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
@@ -62,13 +62,12 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginTop="6dp"
-		android:layout_marginBottom="1dp"
 		android:gravity="center"
 		android:text="@string/hotspot_no_peers_connected"
-		app:layout_constraintTop_toBottomOf="@+id/coordinatorLayout"
 		app:layout_constraintBottom_toTopOf="@+id/connectedButton"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent" />
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/coordinatorLayout" />
 
 	<Button
 		android:id="@+id/connectedButton"
@@ -76,8 +75,8 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
-		android:layout_marginTop="1dp"
-		android:layout_marginBottom="1dp"
+		android:layout_marginTop="6dp"
+		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_connected"
 		app:drawableLeftCompat="@drawable/ic_check_white"
 		app:drawableStartCompat="@drawable/ic_check_white"
@@ -89,12 +88,11 @@
 
 	<Button
 		android:id="@+id/stopButton"
-		style="@style/BriarButtonFlat.Negative"
-		android:layout_width="wrap_content"
+		style="@style/BriarButtonOutline.Negative"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginTop="6dp"
-		android:layout_marginBottom="2dp"
 		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_stop_sharing"
 		app:drawableLeftCompat="@drawable/ic_portable_wifi_off"
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_error_wizard.xml b/briar-android/src/main/res/layout/fragment_mailbox_error_wizard.xml
index c8e176540..fbd026dd3 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_error_wizard.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_error_wizard.xml
@@ -79,10 +79,11 @@
 
 			<org.briarproject.briar.android.view.BriarButton
 				android:id="@+id/button3"
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				app:buttonStyle="@style/BriarButtonFlat.Negative"
+				android:layout_marginHorizontal="16dp"
+				app:buttonStyle="@style/BriarButtonOutline.Negative"
 				app:text="@string/mailbox_status_unlink_button" />
 		</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_error_wizard_access.xml b/briar-android/src/main/res/layout/fragment_mailbox_error_wizard_access.xml
index e7d3996d6..7ba205246 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_error_wizard_access.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_error_wizard_access.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	tools:context=".android.mailbox.MailboxActivity">
 
@@ -75,10 +75,11 @@
 
 		<org.briarproject.briar.android.view.BriarButton
 			android:id="@+id/button1_1_1"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
-			app:buttonStyle="@style/BriarButtonFlat.Negative"
+			android:layout_marginHorizontal="16dp"
+			app:buttonStyle="@style/BriarButtonOutline.Negative"
 			app:text="@string/mailbox_status_unlink_button" />
 
 	</LinearLayout>
@@ -100,10 +101,11 @@
 
 		<org.briarproject.briar.android.view.BriarButton
 			android:id="@+id/button1_1_2"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
-			app:buttonStyle="@style/BriarButtonFlat.Negative"
+			android:layout_marginHorizontal="16dp"
+			app:buttonStyle="@style/BriarButtonOutline.Negative"
 			app:text="@string/mailbox_status_unlink_button" />
 
 	</LinearLayout>
@@ -125,10 +127,11 @@
 
 		<org.briarproject.briar.android.view.BriarButton
 			android:id="@+id/button1_1_3"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
-			app:buttonStyle="@style/BriarButtonFlat.Positive"
+			android:layout_marginHorizontal="16dp"
+			app:buttonStyle="@style/BriarButtonOutline.Positive"
 			app:text="@string/mailbox_status_check_button" />
 
 	</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_status.xml b/briar-android/src/main/res/layout/fragment_mailbox_status.xml
index 8cd9a0c26..eec40a8ae 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_status.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_status.xml
@@ -32,7 +32,8 @@
 			android:id="@+id/statusTitleView"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="16dp"
 			android:gravity="center"
 			android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
 			app:layout_constrainedWidth="true"
@@ -47,62 +48,65 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="16dp"
-			android:layout_marginBottom="16dp"
+			android:layout_marginTop="16dp"
 			android:gravity="center"
 			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
 			android:visibility="gone"
 			app:layout_constrainedWidth="true"
-			app:layout_constraintBottom_toTopOf="@+id/checkButton"
+			app:layout_constraintBottom_toTopOf="@+id/statusInfoView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/statusTitleView"
 			tools:text="@string/mailbox_status_mailbox_too_old_message"
 			tools:visibility="visible" />
 
-		<org.briarproject.briar.android.view.BriarButton
-			android:id="@+id/checkButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			app:buttonStyle="@style/BriarButtonFlat.Neutral"
-			app:layout_constraintBottom_toTopOf="@+id/statusInfoView"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/statusMessageView"
-			app:text="@string/mailbox_status_check_button" />
-
 		<TextView
 			android:id="@+id/statusInfoView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="16dp"
 			android:gravity="center"
-			app:layout_constraintBottom_toTopOf="@+id/unlinkButton"
+			app:layout_constraintBottom_toTopOf="@+id/checkButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/checkButton"
+			app:layout_constraintTop_toBottomOf="@+id/statusMessageView"
 			tools:text="@string/mailbox_status_connected_info" />
 
+		<org.briarproject.briar.android.view.BriarButton
+			android:id="@+id/checkButton"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="16dp"
+			app:buttonStyle="@style/BriarButtonOutline.Neutral"
+			app:layout_constraintBottom_toTopOf="@+id/wizardButton"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/statusInfoView"
+			app:text="@string/mailbox_status_check_button" />
+
 		<Button
 			android:id="@+id/wizardButton"
-			style="@style/BriarButtonFlat.Positive"
-			android:layout_width="wrap_content"
+			style="@style/BriarButtonOutline.Neutral"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="6dp"
 			android:text="@string/mailbox_error_wizard_button"
 			android:visibility="gone"
 			app:drawableTint="@color/briar_button_text_positive"
 			app:layout_constraintBottom_toTopOf="@+id/unlinkButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/statusInfoView"
+			app:layout_constraintTop_toBottomOf="@+id/checkButton"
 			app:layout_constraintVertical_bias="0.0"
 			tools:visibility="visible" />
 
 		<Button
 			android:id="@+id/unlinkButton"
-			style="@style/BriarButtonFlat.Negative"
-			android:layout_width="wrap_content"
+			style="@style/BriarButtonOutline.Negative"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_margin="16dp"
 			android:text="@string/mailbox_status_unlink_button"
diff --git a/briar-android/src/main/res/layout/fragment_offline.xml b/briar-android/src/main/res/layout/fragment_offline.xml
index f45a23d33..bea213fbc 100644
--- a/briar-android/src/main/res/layout/fragment_offline.xml
+++ b/briar-android/src/main/res/layout/fragment_offline.xml
@@ -56,10 +56,11 @@
 
 		<Button
 			android:id="@+id/checkButton"
-			style="@style/BriarButtonFlat.Neutral"
-			android:layout_width="wrap_content"
+			style="@style/BriarButtonOutline.Neutral"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_large"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="16dp"
 			android:text="@string/tor_offline_button_check"
 			app:layout_constraintBottom_toTopOf="@+id/button"
 			app:layout_constraintEnd_toEndOf="parent"
@@ -70,7 +71,8 @@
 			style="@style/BriarButton"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_large"
+			android:layout_marginHorizontal="@dimen/margin_large"
+			android:layout_marginTop="6dp"
 			android:text="@string/try_again_button"
 			app:layout_constraintBottom_toBottomOf="parent"
 			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 973a0a0fc..486bd4f4a 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -80,6 +80,7 @@
 	<color name="briar_button_text_neutral">@color/briar_night_500</color>
 	<color name="briar_button_text_negative">@color/briar_red_500</color>
 	<color name="briar_button_text_disabled">#28000000</color>
+	<color name="briar_button_outline">@android:color/secondary_text_dark</color>
 
 	<color name="thread_indicator">@color/briar_gray_500</color>
 	<color name="thread_item_background">@color/window_background</color>
diff --git a/briar-android/src/main/res/values/dimens.xml b/briar-android/src/main/res/values/dimens.xml
index 2d4622702..d02a4577b 100644
--- a/briar-android/src/main/res/values/dimens.xml
+++ b/briar-android/src/main/res/values/dimens.xml
@@ -75,4 +75,5 @@
 
 	<dimen name="text_input_height">42dp</dimen>
 
+	<dimen name="outline_button_stroke">2dp</dimen>
 </resources>
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index e8094ba3e..7d259ad72 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -44,27 +44,48 @@
 		<item name="android:textColor">@color/button_text</item>
 	</style>
 
-	<style name="BriarButtonFlat.Negative" parent="Widget.AppCompat.Button.Borderless">
+	<style name="BriarButtonFlat" parent="Widget.AppCompat.Button.Borderless">
+		<item name="android:textSize">@dimen/text_size_medium</item>
+	</style>
+
+	<style name="BriarButtonFlat.Negative" parent="BriarButtonFlat">
 		<item name="android:textColor">@color/briar_button_text_negative</item>
-		<item name="android:textSize">@dimen/text_size_medium</item>
 	</style>
 
-	<style name="BriarButtonFlat.Positive" parent="Widget.AppCompat.Button.Borderless">
+	<style name="BriarButtonFlat.Positive" parent="BriarButtonFlat">
 		<item name="android:textColor">@color/briar_button_text_positive</item>
-		<item name="android:textSize">@dimen/text_size_medium</item>
 	</style>
 
-	<style name="BriarButtonFlat.Neutral" parent="Widget.AppCompat.Button.Borderless">
+	<style name="BriarButtonFlat.Neutral" parent="BriarButtonFlat">
 		<item name="android:textColor">@color/briar_button_text_neutral</item>
-		<item name="android:textSize">@dimen/text_size_medium</item>
 	</style>
 
-	<style name="BriarButtonFlat.Positive.Tiny" parent="BriarButtonFlat.Positive">
+	<style name="BriarButtonFlat.Positive.Tiny" parent="BriarButtonFlat">
 		<item name="android:textSize">@dimen/text_size_tiny</item>
 		<item name="android:padding">@dimen/margin_medium</item>
 		<item name="android:minWidth">@dimen/button_size</item>
 	</style>
 
+	<style name="BriarButtonOutline" parent="Widget.AppCompat.Button.Borderless">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textSize">@dimen/text_size_medium</item>
+		<item name="android:background">@drawable/button_outline</item>
+		<item name="android:padding">@dimen/margin_large</item>
+	</style>
+
+	<style name="BriarButtonOutline.Negative" parent="BriarButtonOutline">
+		<item name="android:textColor">@color/briar_button_text_negative</item>
+	</style>
+
+	<style name="BriarButtonOutline.Positive" parent="BriarButtonOutline">
+		<item name="android:textColor">@color/briar_button_text_positive</item>
+	</style>
+
+	<style name="BriarButtonOutline.Neutral" parent="BriarButtonOutline">
+		<item name="android:textColor">@color/briar_button_text_neutral</item>
+	</style>
+
 	<style name="Divider">
 		<item name="android:background">@color/divider</item>
 	</style>