From b395fd866a101a315c4af751a51a91148a13e4fd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 12 Jul 2020 20:25:22 +0200
Subject: [PATCH] Added support remark

---
 .../main/res/layout/fragment_quick_setup.xml    | 17 ++++++++++++++---
 app/src/main/res/values/strings.xml             |  5 +++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index 888c0e8cf5..d0e316c35a 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -150,6 +150,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvErrorRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="@string/title_setup_quick_support"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+
         <Button
             android:id="@+id/btnSupport"
             android:layout_width="wrap_content"
@@ -160,7 +171,7 @@
             android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
 
         <Button
             android:id="@+id/btnHelp"
@@ -172,7 +183,7 @@
             android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvErrorRemark" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvInstructions"
@@ -278,6 +289,6 @@
             android:id="@+id/grpError"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint" />
+            app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint,tvErrorRemark" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 28bdc348ce..6ca0e6d373 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -152,9 +152,10 @@
     </string>
     <string name="title_setup_quick">Quick setup</string>
     <string name="title_setup_quick_remark">To quickly setup an account and an identity for most providers</string>
+    <string name="title_setup_quick_support">Some providers make it difficult to add an account. Please do not blame FairEmail for this, but ask for support instead.</string>
     <string name="title_setup_quick_hint">The quick setup will fetch configuration information from autoconfig.thunderbird.net</string>
-    <string name="title_setup_quick_imap">IMAP server to receive messages</string>
-    <string name="title_setup_quick_smtp">SMTP server to send messages</string>
+    <string name="title_setup_quick_imap">IMAP server to receive messages</string>0
+    <string name="title_setup_quick_smtp">SMTP server to send messages</string>0
     <string name="title_setup_wizard">Wizard</string>
     <string name="title_setup_wizard_multiple">The installation wizard can be used multiple times to set up multiple accounts</string>
     <string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>