From bc56ae194a66abc6321c72076dded408b1c28097 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 22 Nov 2019 10:58:57 -0600
Subject: [PATCH] Fix 6048 - Improve alignment in Edit Bookmark screen

---
 .../res/layout/fragment_edit_bookmark.xml     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/fragment_edit_bookmark.xml b/app/src/main/res/layout/fragment_edit_bookmark.xml
index a8b02b89d..8533abb9c 100644
--- a/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -14,12 +14,13 @@
         android:id="@+id/bookmark_name_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="16dp"
+        android:labelFor="@id/bookmarkNameEdit"
         android:text="@string/bookmark_name_label"
         android:textAllCaps="true"
         android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:labelFor="@id/bookmarkNameEdit" />
+        android:textSize="12sp" />
 
     <org.mozilla.fenix.utils.ClearableEditText
         android:id="@+id/bookmarkNameEdit"
@@ -39,12 +40,13 @@
         android:id="@+id/bookmarkUrlLabel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="8dp"
+        android:labelFor="@id/bookmarkUrlEdit"
         android:text="@string/bookmark_url_label"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
         android:textAllCaps="true"
-        android:labelFor="@id/bookmarkUrlEdit" />
+        android:textColor="?primaryText"
+        android:textSize="12sp" />
 
     <org.mozilla.fenix.utils.ClearableEditText
         android:id="@+id/bookmarkUrlEdit"
@@ -64,17 +66,19 @@
         android:id="@+id/bookmark_folder_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="8dp"
+        android:labelFor="@id/bookmarkParentFolderSelector"
         android:text="@string/bookmark_folder_label"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
         android:textAllCaps="true"
-        android:labelFor="@id/bookmarkParentFolderSelector" />
+        android:textColor="?primaryText"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/bookmarkParentFolderSelector"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
         android:layout_marginTop="8dp"
         android:drawableStart="@drawable/ic_folder_icon"
         android:drawablePadding="10dp"