Quick setup: improvements

app/src/main/java/eu/faircode/email/FragmentQuickSetup.java

@@ -103,6 +103,7 @@ public class FragmentQuickSetup extends FragmentBase {
     private Group grpSetup;
     private Group grpCertificate;
     private Group grpError;
+    private Group grpManual;
 
     private int title;
     private boolean update;
@@ -173,6 +174,7 @@ public class FragmentQuickSetup extends FragmentBase {
         grpSetup = view.findViewById(R.id.grpSetup);
         grpCertificate = view.findViewById(R.id.grpCertificate);
         grpError = view.findViewById(R.id.grpError);
+        grpManual = view.findViewById(R.id.grpManual);
 
         // Wire controls
 
@@ -273,9 +275,9 @@ public class FragmentQuickSetup extends FragmentBase {
         tvProgress.setVisibility(View.GONE);
         pbSave.setVisibility(View.GONE);
         tvArgument.setVisibility(View.GONE);
+        tvErrorHint.setVisibility(View.GONE);
         tvInstructions.setVisibility(View.GONE);
         tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
-        btnManual.setVisibility(View.GONE);
         btnHelp.setVisibility(View.GONE);
         cbUpdate.setChecked(update);
         cbUpdate.setVisibility(View.GONE);
@@ -283,6 +285,7 @@ public class FragmentQuickSetup extends FragmentBase {
         grpSetup.setVisibility(View.GONE);
         grpCertificate.setVisibility(View.GONE);
         grpError.setVisibility(View.GONE);
+        grpManual.setVisibility(View.GONE);
 
         if (savedInstanceState != null) {
             tilPassword.getEditText().setText(savedInstanceState.getString("fair:password"));
@@ -346,9 +349,10 @@ public class FragmentQuickSetup extends FragmentBase {
                 tvPatience.setVisibility(check ? View.VISIBLE : View.GONE);
                 pbSave.setVisibility(check ? View.GONE : View.VISIBLE);
                 grpError.setVisibility(View.GONE);
+                grpManual.setVisibility(View.GONE);
                 tvArgument.setVisibility(View.GONE);
+                tvErrorHint.setVisibility(View.GONE);
                 tvInstructions.setVisibility(View.GONE);
-                btnManual.setVisibility(View.GONE);
                 btnHelp.setVisibility(View.GONE);
                 cbUpdate.setVisibility(check ? View.GONE : View.VISIBLE);
                 btnSave.setVisibility(check ? View.GONE : View.VISIBLE);
@@ -719,13 +723,12 @@ public class FragmentQuickSetup extends FragmentBase {
                     String message = getString(R.string.title_setup_no_auth_hint);
                     if (provider != null && provider.appPassword)
                         message += "\n\n" + getString(R.string.title_setup_app_password_hint);
-                    else if (provider == null)
-                        btnManual.setVisibility(View.VISIBLE);
                     tvErrorHint.setText(message);
-                } else {
+                    tvErrorHint.setVisibility(View.VISIBLE);
-                    tvErrorHint.setText(R.string.title_setup_no_settings_hint);
+                    if (provider == null)
-                    btnManual.setVisibility(View.VISIBLE);
+                        grpManual.setVisibility(View.VISIBLE);
-                }
+                } else
+                    grpManual.setVisibility(View.VISIBLE);
 
                 if (ex instanceof IllegalArgumentException || ex instanceof UnknownHostException) {
                     tvError.setText(ex.getMessage());

app/src/main/res/layout/fragment_quick_setup.xml

@@ -202,23 +202,33 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
+        <TextView
+            android:id="@+id/tvManualHint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_no_settings_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+
         <Button
             android:id="@+id/btnManual"
             style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:drawableEnd="@drawable/twotone_edit_24"
-            android:drawableEnd="@drawable/twotone_settings_24"
             android:drawablePadding="6dp"
             android:text="@string/title_setup_manual_setup"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvManualHint" />
 
         <TextView
             android:id="@+id/tvErrorRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="12dp"
             android:text="@string/title_setup_quick_support"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
@@ -441,6 +451,12 @@
             android:id="@+id/grpError"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorHint,tvErrorRemark,btnSupport" />
+            app:constraint_referenced_ids="tvErrorTitle,tvError,tvErrorRemark,btnSupport" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/grpManual"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:constraint_referenced_ids="tvManualHint,btnManual" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>