From 0fdb3a8f6efccc0e3cfbf66cd3b7b77b25df0cd2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 18 Jun 2023 07:46:27 +0200
Subject: [PATCH] Layout improvements

---
 app/src/main/res/layout/dialog_alias.xml | 36 ++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/dialog_alias.xml b/app/src/main/res/layout/dialog_alias.xml
index 8ea48b5211..e6edda93cd 100644
--- a/app/src/main/res/layout/dialog_alias.xml
+++ b/app/src/main/res/layout/dialog_alias.xml
@@ -11,22 +11,32 @@
         android:layout_height="wrap_content">
 
         <TextView
-            android:id="@+id/tvName"
+            android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/twotone_person_24"
+            android:drawableStart="@drawable/twotone_alternate_email_24"
             android:drawablePadding="6dp"
-            android:labelFor="@+id/etName"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_advanced_create_alias"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/tvName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:labelFor="@+id/etName"
+            android:text="@string/title_contact_name"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCaption" />
+
         <eu.faircode.email.EditTextPlain
             android:id="@+id/etName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
             android:inputType="textPersonName|textCapWords"
             android:text="Name"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -34,24 +44,34 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
 
+        <TextView
+            android:id="@+id/tvEmail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:labelFor="@+id/etName"
+            android:text="@string/title_contact_email"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etName" />
+
         <eu.faircode.email.EditTextPlain
             android:id="@+id/etEmail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
             android:imeOptions="actionDone"
             android:inputType="textEmailAddress"
             android:text="Email"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etName" />
+            app:layout_constraintTop_toBottomOf="@id/tvEmail" />
 
         <TextView
             android:id="@+id/tvRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="12dp"
             android:labelFor="@+id/etName"
             android:text="@string/title_advanced_create_alias_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -64,7 +84,7 @@
             android:id="@+id/ibInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="12dp"
             android:contentDescription="@string/title_info"
             android:tooltipText="@string/title_info"
             app:layout_constraintStart_toStartOf="parent"