From c540e221a1e9074ae0cc946d4abd173463bd5442 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 18 Jun 2023 07:40:21 +0200
Subject: [PATCH] Added alias remark

---
 FAQ.md                                   |  2 ++
 app/src/main/res/layout/dialog_alias.xml | 15 ++++++++++++++-
 app/src/main/res/values/strings.xml      |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index 43697bade9..78a313e93b 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -824,6 +824,8 @@ and setting the user name field to your main email address.
 
 Note that you can copy an identity by long pressing it in the list of identities (via *Manual setup and account options* in the main settings page).
 
+**In many cases, an alias address must first be verified via the website of the mail provider**
+
 Alternatively, you can enable *Allow editing sender address* in the advanced settings of an existing identity to edit the username when composing a new message,
 if your provider allows this. Considering the email address test@example.org you can use these special username formats:
 
diff --git a/app/src/main/res/layout/dialog_alias.xml b/app/src/main/res/layout/dialog_alias.xml
index 0cd9259895..8ea48b5211 100644
--- a/app/src/main/res/layout/dialog_alias.xml
+++ b/app/src/main/res/layout/dialog_alias.xml
@@ -47,6 +47,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etName" />
 
+        <TextView
+            android:id="@+id/tvRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:labelFor="@+id/etName"
+            android:text="@string/title_advanced_create_alias_remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?attr/colorWarning"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etEmail" />
+
         <ImageButton
             android:id="@+id/ibInfo"
             android:layout_width="wrap_content"
@@ -55,7 +68,7 @@
             android:contentDescription="@string/title_info"
             android:tooltipText="@string/title_info"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etEmail"
+            app:layout_constraintTop_toBottomOf="@id/tvRemark"
             app:srcCompat="@drawable/twotone_info_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe86634776..d11bf178cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1064,6 +1064,7 @@
     <string name="title_advanced_never_favorite">Never favorite</string>
     <string name="title_advanced_edit_name">Edit name</string>
     <string name="title_advanced_create_alias">Create alias</string>
+    <string name="title_advanced_create_alias_remark">In many cases, an alias address must first be verified via the website of the mail provider</string>
 
     <string name="title_create_folder">Create folder</string>
     <string name="title_create_folder_name">Folder name</string>