From 60e3c81942fc7e6207594e12d71ab147c1d7a380 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 4 Jun 2019 14:42:27 -0700
Subject: [PATCH] No issue: Update home screen margins

---
 app/src/main/res/layout/collection_header.xml        | 5 ++---
 app/src/main/res/layout/collection_home_list_row.xml | 2 +-
 app/src/main/res/layout/fragment_home.xml            | 8 ++++----
 app/src/main/res/layout/save_tab_group_button.xml    | 6 ++++--
 app/src/main/res/layout/tab_header.xml               | 3 ++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout/collection_header.xml b/app/src/main/res/layout/collection_header.xml
index 9e33e3da0..e42f23d00 100644
--- a/app/src/main/res/layout/collection_header.xml
+++ b/app/src/main/res/layout/collection_header.xml
@@ -8,8 +8,7 @@
     android:id="@+id/collections_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="5dp"
-    android:layout_marginBottom="15.5dp">
+    android:layout_marginBottom="20dp">
 
     <View
         android:id="@+id/divider_line"
@@ -26,7 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4.5dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="20dp"
         android:text="@string/collections_header"
         android:textAppearance="@style/HeaderTextStyle"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index 09425fb25..0e8d99f4e 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -8,7 +8,7 @@
     android:id="@+id/item_collection"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="12dp"
+    android:layout_marginBottom="12dp"
     android:background="@drawable/rounded_all_corners"
     android:clickable="true"
     android:clipToPadding="false"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index f897ea192..88a9cef02 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -19,7 +19,7 @@
             android:id="@+id/menuButton"
             android:layout_width="@dimen/glyph_button_height"
             android:layout_height="@dimen/glyph_button_height"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="12dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_menu"
             android:contentDescription="@string/content_description_menu"
@@ -40,7 +40,7 @@
             android:id="@+id/wordmark"
             android:layout_width="wrap_content"
             android:layout_height="80dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="24dp"
             android:layout_marginStart="16dp"
             android:src="?fenixLogo"
             android:contentDescription="@string/app_name"
@@ -53,7 +53,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="64dp"
+            android:layout_marginTop="48dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/home_search_background_normal"
             android:elevation="@dimen/toolbar_elevation"
@@ -90,7 +90,7 @@
             app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="32dp"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="40dp"/>
 
diff --git a/app/src/main/res/layout/save_tab_group_button.xml b/app/src/main/res/layout/save_tab_group_button.xml
index 821c79949..9c2a34d42 100644
--- a/app/src/main/res/layout/save_tab_group_button.xml
+++ b/app/src/main/res/layout/save_tab_group_button.xml
@@ -8,7 +8,10 @@
     style="@style/Widget.MaterialComponents.Button.TextButton"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="12dp"
+    android:minHeight="36dp"
+    android:insetTop="0dp"
+    android:insetBottom="0dp"
+    android:layout_marginBottom="20dp"
     android:background="@drawable/button_background"
     android:letterSpacing="0"
     android:text="@string/save_to_collection"
@@ -19,5 +22,4 @@
     app:icon="@drawable/ic_tab_collection"
     app:iconGravity="textStart"
     app:iconPadding="8dp"
-    app:iconSize="20dp"
     app:iconTint="?attr/foundation" />
diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml
index 52feddb0e..0ab152185 100644
--- a/app/src/main/res/layout/tab_header.xml
+++ b/app/src/main/res/layout/tab_header.xml
@@ -6,7 +6,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/tabs_header"
-    android:layout_marginBottom="15.5dp"
+    android:layout_marginTop="4dp"
+    android:layout_marginBottom="20dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">