From 680223c4b68c28205750da02efe2c3949009dfbe Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Fri, 14 Jun 2024 10:44:17 -0700
Subject: [PATCH] Update permission buttons for contacts.

Co-authored-by: Greyson Parrelli <greyson@signal.org>
---
 ...ct_selection_find_contacts_banner_item.xml | 55 +++++++++++--------
 app/src/main/res/values/dimens.xml            |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml b/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml
index 04e99d3af4..af3825ac33 100644
--- a/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml
+++ b/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml
@@ -4,9 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="10dp"
+    android:layout_margin="16dp"
     android:background="@drawable/rounded_outline"
-    android:padding="15dp"
+    android:paddingVertical="24dp"
+    android:paddingHorizontal="16dp"
     tools:viewBindingIgnore="true">
 
     <com.google.android.material.imageview.ShapeableImageView
@@ -36,7 +37,6 @@
         android:id="@+id/description"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:gravity="center"
         android:text="@string/ContactSelectionListFragment__allow_access_to_your_contacts_encrypted"
         android:textAppearance="@style/Signal.Text.BodyMedium"
@@ -46,28 +46,39 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/no_thanks_button"
-        style="@style/Signal.Widget.Button.Medium.Tonal"
-        android:layout_width="140dp"
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/permission_buttons"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/description"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/allow_contacts_button"
-        android:text="@string/RatingManager_no_thanks" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/allow_contacts_button"
-        style="@style/Signal.Widget.Button.Medium.Tonal"
-        android:layout_width="140dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        app:layout_constraintStart_toEndOf="@id/no_thanks_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/description"
-        android:text="@string/ContactSelectionListFragment__allow_access" />
+        android:layout_marginTop="4dp"
+        android:layout_marginHorizontal="10dp"
+        app:flexWrap="wrap_reverse">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/no_thanks_button"
+            style="@style/Signal.Widget.Button.Medium.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginHorizontal="6dp"
+            android:minWidth="@dimen/contact_permission_button_min_width"
+            android:text="@string/ContactSelectionListFragment__no_thanks"
+            app:layout_flexGrow="1" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/allow_contacts_button"
+            style="@style/Signal.Widget.Button.Medium.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginHorizontal="6dp"
+            android:minWidth="@dimen/contact_permission_button_min_width"
+            android:text="@string/ContactSelectionListFragment__allow_access"
+            app:layout_flexGrow="1" />
+
+    </com.google.android.flexbox.FlexboxLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 035278ad9f..7a05f27ee6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -236,4 +236,6 @@
     <dimen name="image_editor_hud_tool_invisible_circle_diameter">40dp</dimen>
     <dimen name="image_editor_hud_tool_invisible_circle_padding">6dp</dimen>
 
+    <dimen name="contact_permission_button_min_width">140dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c9db194920..9d11dcd7cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2855,6 +2855,8 @@
     <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
     <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <!-- Text on button to dismiss Signal's request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">No thanks</string>
     <!-- Text asking for user\'s contact permission -->
     <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>