From 3c0afe4b24fbb0c2ec8e00bd25a847279c134e05 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 30 Nov 2021 14:35:13 -0400
Subject: [PATCH] Fix recipient bottom sheet buttons on devices with very large
 font selected.

---
 .../res/layout/recipient_bottom_sheet.xml     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 9a9e7d9b4d..b13d24f75d 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -124,7 +124,8 @@
                 android:id="@+id/rbs_block_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_block"
@@ -136,7 +137,8 @@
                 android:id="@+id/rbs_unblock_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_unblock"
@@ -148,7 +150,8 @@
                 android:id="@+id/rbs_remove_from_group_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_remove_from_group"
@@ -160,7 +163,8 @@
                 android:id="@+id/rbs_make_group_admin_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_make_admin"
@@ -172,7 +176,8 @@
                 android:id="@+id/rbs_remove_group_admin_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_remove_as_admin"
@@ -184,7 +189,8 @@
                 android:id="@+id/rbs_add_to_group_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:visibility="gone"
@@ -196,7 +202,8 @@
                 android:id="@+id/rbs_add_contact_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_add_to_contacts"
@@ -208,7 +215,8 @@
                 android:id="@+id/rbs_contact_details_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/ConversationSettingsFragment__contact_details"
@@ -220,7 +228,8 @@
                 android:id="@+id/rbs_view_safety_number_button"
                 style="@style/Widget.Signal.Button.TextButton.Drawable"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:minHeight="56dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="@string/RecipientBottomSheet_view_safety_number"