Skip to content

Commit

Permalink
Apply proper spacing to RecipientBottomSheetDialogFragment.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-signal @greyson-signal
alex-signal authored and greyson-signal committed May 29, 2020
1 parent 526afd5 commit 204a84c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
53 changes: 26 additions & 27 deletions app/src/main/res/layout/recipient_bottom_sheet.xml
View file
Expand Up @@ -43,10 +43,9 @@

<TextView
android:id="@+id/username_number"
style="@style/TextAppearance.Signal.Body2"
style="@style/Signal.Text.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textColor="?attr/title_text_color_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand All @@ -58,6 +57,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -67,30 +67,29 @@
android:id="@+id/message_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_marginTop="16dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_message"
app:drawableStartCompat="?attr/recipient_message_icon" />

<Button
android:id="@+id/secure_call_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_call"
app:drawableStartCompat="?attr/recipient_call_icon" />

<Button
android:id="@+id/block_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_block"
android:visibility="gone"
app:drawableStartCompat="?attr/recipient_block_icon"
Expand All @@ -100,9 +99,9 @@
android:id="@+id/unblock_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_unblock"
android:visibility="gone"
app:drawableStartCompat="?attr/recipient_block_icon"
Expand All @@ -112,19 +111,19 @@
android:id="@+id/view_safety_number_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_view_safety_number"
app:drawableStartCompat="?attr/recipient_view_safety_icon" />

<Button
android:id="@+id/make_group_admin_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_make_group_admin"
android:visibility="gone"
app:drawableStartCompat="?attr/recipient_make_admin_icon"
Expand All @@ -134,9 +133,9 @@
android:id="@+id/remove_group_admin_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_remove_as_admin"
android:visibility="gone"
app:drawableStartCompat="?attr/recipient_make_admin_icon"
Expand All @@ -146,9 +145,9 @@
android:id="@+id/remove_from_group_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="22dp"
android:paddingEnd="22dp"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_remove_from_group"
android:visibility="gone"
app:drawableStartCompat="?attr/recipient_remove_icon"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/styles.xml
View file
Expand Up @@ -421,8 +421,9 @@

<style name="Widget.Signal.Button.TextButton.Drawable">
<item name="android:textAlignment">viewStart</item>
<item name="android:drawablePadding">16dp</item>
<item name="android:drawablePadding">20dp</item>
<item name="android:background">?attr/selectableItemBackground</item>
<item name="android:textAppearance">@style/Signal.Text.Body</item>
</style>

<style name="Widget.Signal.Button.TextButton.Red" >
Expand Down

0 comments on commit 204a84c

Please sign in to comment.