Move accounts/identities to setup

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

@@ -111,12 +111,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
                     case R.string.menu_folders:
                         onMenuFolders();
                         break;
-                    case R.string.menu_accounts:
-                        onMenuAccounts();
-                        break;
-                    case R.string.menu_identities:
-                        onMenuIdentities();
-                        break;
                     case R.string.menu_theme:
                         onMenuTheme();
                         break;
@@ -250,8 +244,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
         ArrayAdapterDrawer drawerArray = new ArrayAdapterDrawer(this, R.layout.item_drawer);
         drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_unified));
         drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_folders));
-        drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_accounts));
-        drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_identities));
         drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_theme, "dark".equals(prefs.getString("theme", "light"))));
         drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_setup));
         drawerArray.add(new DrawerItem(ActivityView.this, R.string.menu_debug));
@@ -276,18 +268,6 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
         fragmentTransaction.commit();
     }
 
-    private void onMenuAccounts() {
-        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.replace(R.id.content_frame, new FragmentAccounts()).addToBackStack("accounts");
-        fragmentTransaction.commit();
-    }
-
-    private void onMenuIdentities() {
-        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.replace(R.id.content_frame, new FragmentIdentities()).addToBackStack("identities");
-        fragmentTransaction.commit();
-    }
-
     private void onMenuTheme() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         String theme = prefs.getString("theme", "light");

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

@@ -42,12 +42,16 @@ import java.util.concurrent.Executors;
 
 public class FragmentSetup extends Fragment {
     private Button btnAccount;
-    private Button btnIdentity;
-    private Button btnPermissions;
     private ProgressBar pbAccount;
-    private ProgressBar pbIdentity;
     private TextView tvAccountDone;
+    private Button btnAccountManage;
+
+    private Button btnIdentity;
+    private ProgressBar pbIdentity;
     private TextView tvIdentityDone;
+    private Button btnIdentityManage;
+
+    private Button btnPermissions;
     private TextView tvPermissionsDone;
 
     private ExecutorService executor = Executors.newCachedThreadPool();
@@ -63,12 +67,16 @@ public class FragmentSetup extends Fragment {
 
         // Get controls
         btnAccount = view.findViewById(R.id.btnAccount);
-        btnIdentity = view.findViewById(R.id.btnIdentity);
-        btnPermissions = view.findViewById(R.id.btnPermissions);
         pbAccount = view.findViewById(R.id.pbAccount);
-        pbIdentity = view.findViewById(R.id.pbIdentity);
         tvAccountDone = view.findViewById(R.id.tvAccountDone);
+        btnAccountManage = view.findViewById(R.id.btnAccountManage);
+
+        btnIdentity = view.findViewById(R.id.btnIdentity);
+        pbIdentity = view.findViewById(R.id.pbIdentity);
         tvIdentityDone = view.findViewById(R.id.tvIdentityDone);
+        btnIdentityManage = view.findViewById(R.id.btnIdentityManage);
+
+        btnPermissions = view.findViewById(R.id.btnPermissions);
         tvPermissionsDone = view.findViewById(R.id.tvPermissionsDone);
 
         // Wire controls
@@ -107,6 +115,16 @@ public class FragmentSetup extends Fragment {
             }
         });
 
+        btnAccountManage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //getFragmentManager().popBackStack();
+                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                fragmentTransaction.replace(R.id.content_frame, new FragmentAccounts()).addToBackStack("accounts");
+                fragmentTransaction.commit();
+            }
+        });
+
         btnIdentity.setOnClickListener(new View.OnClickListener() {
             private boolean once;
 
@@ -140,6 +158,16 @@ public class FragmentSetup extends Fragment {
             }
         });
 
+        btnIdentityManage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //getFragmentManager().popBackStack();
+                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                fragmentTransaction.replace(R.id.content_frame, new FragmentIdentities()).addToBackStack("identities");
+                fragmentTransaction.commit();
+            }
+        });
+
         btnPermissions.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -55,6 +55,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAccount" />
 
+        <Button
+            android:id="@+id/btnAccountManage"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="0dp"
+            android:minWidth="0dp"
+            android:text="@string/title_setup_account_manage"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAccountDone" />
+
         <!-- identity -->
 
         <Button
@@ -66,7 +79,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAccountDone" />
+            app:layout_constraintTop_toBottomOf="@id/btnAccountManage" />
 
         <ProgressBar
             android:id="@+id/pbIdentity"
@@ -99,6 +112,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
+        <Button
+            android:id="@+id/btnIdentityManage"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minHeight="0dp"
+            android:minWidth="0dp"
+            android:text="@string/title_setup_identity_manage"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvIdentityDone" />
+
         <!-- permissions -->
 
         <Button
@@ -111,7 +137,7 @@
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvIdentityDone" />
+            app:layout_constraintTop_toBottomOf="@id/btnIdentityManage" />
 
         <TextView
             android:id="@+id/tvPermissions"

app/src/main/res/values/strings.xml

@@ -10,8 +10,6 @@
 
     <string name="menu_unified">Unified inbox</string>
     <string name="menu_folders">Folders</string>
-    <string name="menu_accounts">Accounts</string>
-    <string name="menu_identities">Identities</string>
     <string name="menu_theme">Dark theme</string>
     <string name="menu_setup">Setup</string>
     <string name="menu_debug">Debug info</string>
@@ -30,10 +28,12 @@
 
     <string name="title_setup">Setup</string>
     <string name="title_setup_account">Configure account</string>
-    <string name="title_setup_indentity">Configure identity</string>
-    <string name="title_setup_permissions">Grant permissions</string>
     <string name="title_setup_account_remark">To receive email</string>
+    <string name="title_setup_account_manage">Manage accounts</string>
+    <string name="title_setup_indentity">Configure identity</string>
     <string name="title_setup_identity_remark">To send email</string>
+    <string name="title_setup_identity_manage">Manage identities</string>
+    <string name="title_setup_permissions">Grant permissions</string>
     <string name="title_setup_permissions_remark">To read contacts (optional)</string>
     <string name="title_setup_done">Done</string>