From d2cabdd668a5af384391c755ebd97dbeb7047e8a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 22 Jul 2021 07:18:33 +0200
Subject: [PATCH] Added export hint

---
 .../java/eu/faircode/email/ActivitySetup.java     |  2 ++
 app/src/main/res/layout/dialog_password.xml       | 15 ++++++++++++++-
 app/src/main/res/values/strings.xml               |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 9e22e566c2..492c2037ca 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1328,6 +1328,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             TextView tvCaption = dview.findViewById(R.id.tvCaption);
             etPassword1 = dview.findViewById(R.id.tilPassword1);
             etPassword2 = dview.findViewById(R.id.tilPassword2);
+            TextView tvExportHint = dview.findViewById(R.id.tvExportHint);
             TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
 
             tvCaption.setText(export ? R.string.title_setup_export : R.string.title_setup_import);
@@ -1338,6 +1339,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             }
 
             etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
+            tvExportHint.setVisibility(export ? View.VISIBLE : View.GONE);
             tvImportHint.setVisibility(export ? View.GONE : View.VISIBLE);
 
             return new AlertDialog.Builder(getContext())
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index 946fb78d3c..ad0dde3f6f 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -26,6 +26,7 @@
             android:layout_marginTop="24dp"
             android:text="@string/title_setup_export_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCaption" />
 
@@ -71,6 +72,17 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
         </com.google.android.material.textfield.TextInputLayout>
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvExportHint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_export_do"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvImportHint"
             android:layout_width="wrap_content"
@@ -79,7 +91,8 @@
             android:text="@string/title_setup_import_do"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
+            android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
+            app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
     </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 7e8fb3b2ab..86c6b10c9c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -239,6 +239,7 @@
         Since the settings file contains all settings and account information, it is encrypted with a password.
         The password is required to import the settings again, so please don\'t forget it!
     </string>
+    <string name="title_setup_export_do">The export file will contain all settings and data, but won\'t contain messages</string>
     <string name="title_setup_import_do">Imported accounts will be added without overwriting any existing ones</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_chars">Password contains control or whitespace characters</string>