From f69a0f0261c51b875239bc228fc1514812324922 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 31 Jul 2020 16:49:52 -0300
Subject: [PATCH] Refine reaction details fragment.

---
 ..._bottom_sheet_dialog_fragment_emoji_item.xml |  6 +-----
 ...tom_sheet_dialog_fragment_recipient_item.xml | 17 +++++++----------
 ...ns_bottom_sheet_dialog_fragment_recycler.xml |  2 ++
 ...ctions_bottom_sheet_dialog_fragment_tabs.xml | 11 ++++++-----
 app/src/main/res/layout/reactions_pill.xml      |  9 ++++++---
 app/src/main/res/values/dimens.xml              |  2 +-
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
index 78405f56e..98a33618c 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
@@ -4,10 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="36dp"
-    android:layout_marginStart="6dp"
-    android:layout_marginTop="8dp"
-    android:layout_marginEnd="4dp"
-    android:layout_marginBottom="8dp"
     android:gravity="center"
     android:orientation="horizontal">
 
@@ -15,7 +11,7 @@
         android:id="@+id/reactions_bottom_view_emoji_item_emoji"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:layout_marginEnd="2dp"
+        android:layout_marginEnd="4dp"
         android:gravity="center"
         android:textStyle="bold"
         app:emoji_forceCustom="true" />
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
index fac0e51b4..9e7d536ee 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="64dp">
+    android:layout_height="52dp">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
         android:id="@+id/reactions_bottom_view_recipient_avatar"
@@ -21,29 +20,27 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:gravity="center_vertical"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+        android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
         android:textColor="?title_text_color_primary"
-        android:textSize="17sp"
-        android:textStyle="bold"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/reactions_bottom_view_recipient_emoji"
-        app:layout_constraintStart_toEndOf="@id/reactions_bottom_view_recipient_avatar"
         app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@id/reactions_bottom_view_recipient_avatar"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/reactions_bottom_view_recipient_emoji"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:gravity="center"
         android:textSize="22dp"
         app:emoji_forceCustom="true"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="SpUsage" />
 
 
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml
index 56fcf1a57..91d4c6c86 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recycler.xml
@@ -6,5 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     tools:listitem="@layout/reactions_bottom_sheet_dialog_fragment_recipient_item" />
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_tabs.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_tabs.xml
index 0d646f58c..cca8265c9 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_tabs.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_tabs.xml
@@ -5,13 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/react_with_any_emoji_bottom_sheet_dialog_fragment_tabs_height"
     android:layout_gravity="bottom"
-    android:background="?attr/emoji_tab_strip_background"
+    android:background="?attr/emoji_drawer_background"
     app:layout_constraintTop_toTopOf="parent"
     app:tabIndicatorColor="?colorAccent"
+    app:tabIndicatorGravity="top"
     app:tabMinWidth="48dp"
     app:tabMode="scrollable"
     app:tabPadding="0dp"
-    app:tabPaddingBottom="0dp"
-    app:tabPaddingEnd="0dp"
-    app:tabPaddingStart="0dp"
-    app:tabPaddingTop="0dp" />
\ No newline at end of file
+    app:tabPaddingBottom="10dp"
+    app:tabPaddingEnd="12dp"
+    app:tabPaddingStart="12dp"
+    app:tabPaddingTop="10dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/reactions_pill.xml b/app/src/main/res/layout/reactions_pill.xml
index bc2f8ac65..7b65c10eb 100644
--- a/app/src/main/res/layout/reactions_pill.xml
+++ b/app/src/main/res/layout/reactions_pill.xml
@@ -8,6 +8,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="1dp"
     android:layout_marginEnd="1dp"
+    android:minWidth="32dp"
     android:paddingStart="7dp"
     android:paddingEnd="7dp"
     android:paddingTop="5dp"
@@ -18,21 +19,23 @@
       android:id="@+id/reactions_pill_emoji"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textSize="16dp"
+      android:textSize="14dp"
+      tools:text="\u2764\ufe0f"
       android:includeFontPadding="false"
+      app:autoSizeTextType="uniform"
       app:emoji_forceCustom="true"
       tools:ignore="SpUsage" />
 
   <Space
       android:id="@+id/reactions_pill_spacer"
-      android:layout_width="3dp"
+      android:layout_width="4dp"
       android:layout_height="wrap_content" />
 
   <TextView
       android:id="@+id/reactions_pill_count"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:textSize="14dp"
+      android:textSize="12dp"
       android:fontFamily="sans-serif-medium"
       android:textColor="?reactions_pill_text_color"
       tools:text="23"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 887d12cef..6ba6768e3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -152,7 +152,7 @@
     <dimen name="picture_in_picture_gesture_helper_pip_height">160dp</dimen>
 
     <dimen name="react_with_any_emoji_bottom_sheet_dialog_fragment_min_height">340dp</dimen>
-    <dimen name="react_with_any_emoji_bottom_sheet_dialog_fragment_tabs_height">36dp</dimen>
+    <dimen name="react_with_any_emoji_bottom_sheet_dialog_fragment_tabs_height">40dp</dimen>
 
     <dimen name="group_manage_fragment_card_vertical_padding">12dp</dimen>
     <dimen name="group_manage_fragment_row_height">52dp</dimen>