From 7b5c1904cfb81eb35285b699da4d6fcfd78e7c30 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 18 Oct 2019 13:03:58 -0400
Subject: [PATCH] Update contact list divider styling.

---
 res/layout/camera_contact_header_item.xml     |  4 +--
 res/layout/contact_selection_list_divider.xml | 31 ++++++++-----------
 res/layout/search_result_list_divider.xml     | 14 +++++++++
 .../securesms/search/SearchListAdapter.java   |  2 +-
 4 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 res/layout/search_result_list_divider.xml

diff --git a/res/layout/camera_contact_header_item.xml b/res/layout/camera_contact_header_item.xml
index 1d48ce16b7..36ff7c526a 100644
--- a/res/layout/camera_contact_header_item.xml
+++ b/res/layout/camera_contact_header_item.xml
@@ -5,8 +5,8 @@
     android:id="@+id/camera_contact_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/camera_contacts_horizontal_margin"
-    android:layout_marginEnd="@dimen/camera_contacts_horizontal_margin"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
     android:layout_marginTop="16dp"
     android:layout_marginBottom="24dp"
     style="@style/Signal.Text.Preview"
diff --git a/res/layout/contact_selection_list_divider.xml b/res/layout/contact_selection_list_divider.xml
index e4474b10bf..d13e8e4dba 100644
--- a/res/layout/contact_selection_list_divider.xml
+++ b/res/layout/contact_selection_list_divider.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="?attr/contact_list_divider">
-
-    <TextView android:id="@+id/label"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:paddingStart="16dp"
-              android:paddingTop="10dp"
-              android:paddingBottom="10dp"
-              android:textSize="14sp"
-              android:textColor="@color/signal_primary_dark"
-              tools:text="Recent chats"/>
-
-</LinearLayout>
\ No newline at end of file
+<org.thoughtcrime.securesms.components.emoji.EmojiTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/label"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/camera_contacts_horizontal_margin"
+    android:layout_marginEnd="@dimen/camera_contacts_horizontal_margin"
+    android:layout_marginTop="16dp"
+    android:layout_marginBottom="24dp"
+    style="@style/Signal.Text.Preview"
+    android:fontFamily="sans-serif-medium"
+    tools:text="@string/CameraContacts_recent_contacts"/>
diff --git a/res/layout/search_result_list_divider.xml b/res/layout/search_result_list_divider.xml
new file mode 100644
index 0000000000..de377cd033
--- /dev/null
+++ b/res/layout/search_result_list_divider.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.emoji.EmojiTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/label"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="24dp"
+    style="@style/Signal.Text.Preview"
+    android:fontFamily="sans-serif-medium"
+    tools:text="@string/CameraContacts_recent_contacts"/>
diff --git a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
index e5f2594da9..475b52f792 100644
--- a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
+++ b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
@@ -96,7 +96,7 @@ class SearchListAdapter extends    RecyclerView.Adapter<SearchListAdapter.Search
   @Override
   public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int position) {
     return new HeaderViewHolder(LayoutInflater.from(parent.getContext())
-                                              .inflate(R.layout.contact_selection_list_divider, parent, false));
+                                              .inflate(R.layout.search_result_list_divider, parent, false));
   }
 
   @Override