From 1e895e960f24dcb42011c748061eb95b508bddf7 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 27 Jul 2018 14:00:11 -0400
Subject: [PATCH] Fix various padding and alignment issues.

---
 res/layout/conversation_input_panel.xml    | 5 +++++
 res/layout/conversation_item_header.xml    | 6 ------
 res/layout/conversation_list_activity.xml  | 3 +++
 res/layout/conversation_list_item_view.xml | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index 408521eaea..041b19e1fd 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -219,6 +219,11 @@
             android:id="@+id/send_button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingTop="6dp"
+            android:paddingRight="6dp"
+            android:paddingBottom="6dp"
+            android:paddingLeft="11dp"
+            android:scaleType="fitCenter"
             android:contentDescription="@string/conversation_activity__send"
             android:nextFocusLeft="@+id/embedded_text_editor"
             android:src="?conversation_transport_sms_indicator"
diff --git a/res/layout/conversation_item_header.xml b/res/layout/conversation_item_header.xml
index 7cccc8995b..464c855a15 100644
--- a/res/layout/conversation_item_header.xml
+++ b/res/layout/conversation_item_header.xml
@@ -10,12 +10,6 @@
     android:paddingLeft="28dp"
     android:paddingRight="28dp">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="?attr/conversation_item_date_line_color"
-        android:layout_marginBottom="3dp"/>
-
     <TextView
         android:id="@+id/text"
         android:layout_width="match_parent"
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index f0b868038d..77a686c5d6 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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:id="@id/container"
                 android:orientation="vertical"
@@ -13,6 +14,8 @@
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            app:contentInsetStart="14dp"
+            app:contentInsetLeft="14dp"
             android:elevation="4dp"
             android:theme="?attr/actionBarStyle">
 
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index 203cbd872f..248356c0cd 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -23,8 +23,8 @@
         android:cropToPadding="true"
         tools:src="@drawable/ic_contact_picture"
         android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
-        android:layout_marginRight="10dp"
-        android:layout_marginEnd="10dp" />
+        android:layout_marginRight="12dp"
+        android:layout_marginEnd="12dp" />
 
     <RelativeLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"