Consistent quick action button order

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

@@ -56,12 +56,12 @@ public class FragmentDialogQuickActions extends FragmentDialogBase {
         final CheckBox cbImportanceLow = dview.findViewById(R.id.cbImportanceLow);
         final CheckBox cbImportanceNormal = dview.findViewById(R.id.cbImportanceNormal);
         final CheckBox cbImportanceHigh = dview.findViewById(R.id.cbImportanceHigh);
-        final CheckBox cbInbox = dview.findViewById(R.id.cbInbox);
+        final CheckBox cbMove = dview.findViewById(R.id.cbMove);
         final CheckBox cbArchive = dview.findViewById(R.id.cbArchive);
-        final CheckBox cbJunk = dview.findViewById(R.id.cbJunk);
         final CheckBox cbTrash = dview.findViewById(R.id.cbTrash);
         final CheckBox cbDelete = dview.findViewById(R.id.cbDelete);
-        final CheckBox cbMove = dview.findViewById(R.id.cbMove);
+        final CheckBox cbJunk = dview.findViewById(R.id.cbJunk);
+        final CheckBox cbInbox = dview.findViewById(R.id.cbInbox);
         final CheckBox cbClear = dview.findViewById(R.id.cbClear);
 
         tvHint.setText(getString(R.string.title_quick_actions_hint, MAX_QUICK_ACTIONS));
@@ -75,12 +75,12 @@ public class FragmentDialogQuickActions extends FragmentDialogBase {
         cbImportanceLow.setChecked(prefs.getBoolean("more_importance_low", false));
         cbImportanceNormal.setChecked(prefs.getBoolean("more_importance_normal", false));
         cbImportanceHigh.setChecked(prefs.getBoolean("more_importance_high", false));
-        cbInbox.setChecked(prefs.getBoolean("more_inbox", true));
+        cbMove.setChecked(prefs.getBoolean("more_move", true));
         cbArchive.setChecked(prefs.getBoolean("more_archive", true));
-        cbJunk.setChecked(prefs.getBoolean("more_junk", true));
         cbTrash.setChecked(prefs.getBoolean("more_trash", true));
         cbDelete.setChecked(prefs.getBoolean("more_delete", false));
-        cbMove.setChecked(prefs.getBoolean("more_move", true));
+        cbJunk.setChecked(prefs.getBoolean("more_junk", true));
+        cbInbox.setChecked(prefs.getBoolean("more_inbox", true));
         cbClear.setChecked(prefs.getBoolean("more_clear", true));
 
         return new AlertDialog.Builder(getContext())
@@ -99,12 +99,12 @@ public class FragmentDialogQuickActions extends FragmentDialogBase {
                         editor.putBoolean("more_importance_low", cbImportanceLow.isChecked());
                         editor.putBoolean("more_importance_normal", cbImportanceNormal.isChecked());
                         editor.putBoolean("more_importance_high", cbImportanceHigh.isChecked());
-                        editor.putBoolean("more_inbox", cbInbox.isChecked());
+                        editor.putBoolean("more_move", cbMove.isChecked());
                         editor.putBoolean("more_archive", cbArchive.isChecked());
-                        editor.putBoolean("more_junk", cbJunk.isChecked());
                         editor.putBoolean("more_trash", cbTrash.isChecked());
                         editor.putBoolean("more_delete", cbDelete.isChecked());
-                        editor.putBoolean("more_move", cbMove.isChecked());
+                        editor.putBoolean("more_junk", cbJunk.isChecked());
+                        editor.putBoolean("more_inbox", cbInbox.isChecked());
                         editor.putBoolean("more_clear", cbClear.isChecked());
                         editor.apply();
                         sendResult(Activity.RESULT_OK);

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

@@ -300,12 +300,12 @@ public class FragmentMessages extends FragmentBase
     private ImageButton ibLowImportance;
     private ImageButton ibNormalImportance;
     private ImageButton ibHighImportance;
-    private ImageButton ibInbox;
-    private ImageButton ibJunk;
+    private ImageButton ibMove;
+    private ImageButton ibArchive;
     private ImageButton ibTrash;
     private ImageButton ibDelete;
-    private ImageButton ibArchive;
-    private ImageButton ibMove;
+    private ImageButton ibJunk;
+    private ImageButton ibInbox;
     private ImageButton ibMoreSettings;
     private FloatingActionButton fabSearch;
     private FloatingActionButton fabError;
@@ -629,12 +629,12 @@ public class FragmentMessages extends FragmentBase
         ibLowImportance = view.findViewById(R.id.ibLowImportance);
         ibNormalImportance = view.findViewById(R.id.ibNormalImportance);
         ibHighImportance = view.findViewById(R.id.ibHighImportance);
-        ibInbox = view.findViewById(R.id.ibInbox);
-        ibJunk = view.findViewById(R.id.ibJunk);
+        ibMove = view.findViewById(R.id.ibMove);
+        ibArchive = view.findViewById(R.id.ibArchive);
         ibTrash = view.findViewById(R.id.ibTrash);
         ibDelete = view.findViewById(R.id.ibDelete);
-        ibArchive = view.findViewById(R.id.ibArchive);
-        ibMove = view.findViewById(R.id.ibMove);
+        ibJunk = view.findViewById(R.id.ibJunk);
+        ibInbox = view.findViewById(R.id.ibInbox);
         ibMoreSettings = view.findViewById(R.id.ibMoreSettings);
         fabSearch = view.findViewById(R.id.fabSearch);
         fabError = view.findViewById(R.id.fabError);
@@ -1697,64 +1697,6 @@ public class FragmentMessages extends FragmentBase
             }
         });
 
-        ibInbox.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                onActionMoveSelection(EntityFolder.INBOX, false);
-            }
-        });
-
-        ibInbox.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                MoreResult result = (MoreResult) cardMore.getTag();
-                if (result == null || !result.isJunk)
-                    return false;
-
-                if (result.hasPop && !result.hasImap)
-                    onActionBlockSender();
-                else if (!result.hasPop && result.hasImap)
-                    onActionJunkSelection();
-
-                return true;
-            }
-        });
-
-        ibJunk.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                MoreResult result = (MoreResult) cardMore.getTag();
-                if (result == null)
-                    return;
-
-                if (result.hasPop && !result.hasImap)
-                    onActionBlockSender();
-                else if (!result.hasPop && result.hasImap)
-                    onActionJunkSelection();
-            }
-        });
-
-        ibTrash.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onActionMoveSelection(EntityFolder.TRASH, false);
-            }
-        });
-
-        ibDelete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onActionDeleteSelection();
-            }
-        });
-
-        ibArchive.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onActionMoveSelection(EntityFolder.ARCHIVE, false);
-            }
-        });
-
         Runnable runMoveTo = new RunnableEx("moveto") {
             @Override
             protected void delegate() {
@@ -1811,6 +1753,64 @@ public class FragmentMessages extends FragmentBase
             }
         });
 
+        ibArchive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onActionMoveSelection(EntityFolder.ARCHIVE, false);
+            }
+        });
+
+        ibTrash.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onActionMoveSelection(EntityFolder.TRASH, false);
+            }
+        });
+
+        ibDelete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onActionDeleteSelection();
+            }
+        });
+
+        ibJunk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                MoreResult result = (MoreResult) cardMore.getTag();
+                if (result == null)
+                    return;
+
+                if (result.hasPop && !result.hasImap)
+                    onActionBlockSender();
+                else if (!result.hasPop && result.hasImap)
+                    onActionJunkSelection();
+            }
+        });
+
+        ibInbox.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onActionMoveSelection(EntityFolder.INBOX, false);
+            }
+        });
+
+        ibInbox.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                MoreResult result = (MoreResult) cardMore.getTag();
+                if (result == null || !result.isJunk)
+                    return false;
+
+                if (result.hasPop && !result.hasImap)
+                    onActionBlockSender();
+                else if (!result.hasPop && result.hasImap)
+                    onActionJunkSelection();
+
+                return true;
+            }
+        });
+
         ibMoreSettings.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -7073,12 +7073,12 @@ public class FragmentMessages extends FragmentBase
                         ibLowImportance.setVisibility(importance_low ? View.VISIBLE : View.GONE);
                         ibNormalImportance.setVisibility(importance_normal ? View.VISIBLE : View.GONE);
                         ibHighImportance.setVisibility(importance_high ? View.VISIBLE : View.GONE);
-                        ibInbox.setVisibility(inbox ? View.VISIBLE : View.GONE);
-                        ibJunk.setVisibility(junk ? View.VISIBLE : View.GONE);
+                        ibMove.setVisibility(move ? View.VISIBLE : View.GONE);
+                        ibArchive.setVisibility(archive ? View.VISIBLE : View.GONE);
                         ibTrash.setVisibility(trash ? View.VISIBLE : View.GONE);
                         ibDelete.setVisibility(delete ? View.VISIBLE : View.GONE);
-                        ibArchive.setVisibility(archive ? View.VISIBLE : View.GONE);
-                        ibMove.setVisibility(move ? View.VISIBLE : View.GONE);
+                        ibJunk.setVisibility(junk ? View.VISIBLE : View.GONE);
+                        ibInbox.setVisibility(inbox ? View.VISIBLE : View.GONE);
                         cardMore.setTag(fabMore.isOrWillBeShown() ? result : null);
                         cardMore.setVisibility(fabMore.isOrWillBeShown() ? View.VISIBLE : View.GONE);
                     }

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

@@ -162,13 +162,13 @@
             app:layout_constraintTop_toBottomOf="@id/cbImportanceNormal" />
 
         <CheckBox
-            android:id="@+id/cbInbox"
+            android:id="@+id/cbMove"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_inbox_24"
+            android:drawableEnd="@drawable/twotone_drive_file_move_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_folder_inbox"
+            android:text="@string/title_move"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -185,20 +185,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbInbox" />
-
-        <CheckBox
-            android:id="@+id/cbJunk"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_report_24"
-            android:drawablePadding="6dp"
-            android:text="@string/title_folder_junk"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbArchive" />
+            app:layout_constraintTop_toBottomOf="@id/cbMove" />
 
         <CheckBox
             android:id="@+id/cbTrash"
@@ -211,7 +198,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbJunk" />
+            app:layout_constraintTop_toBottomOf="@id/cbArchive" />
 
         <CheckBox
             android:id="@+id/cbDelete"
@@ -227,18 +214,31 @@
             app:layout_constraintTop_toBottomOf="@id/cbTrash" />
 
         <CheckBox
-            android:id="@+id/cbMove"
+            android:id="@+id/cbJunk"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:drawableEnd="@drawable/twotone_drive_file_move_24"
+            android:drawableEnd="@drawable/twotone_report_24"
             android:drawablePadding="6dp"
-            android:text="@string/title_move"
+            android:text="@string/title_folder_junk"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbDelete" />
 
+        <CheckBox
+            android:id="@+id/cbInbox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:drawableEnd="@drawable/twotone_inbox_24"
+            android:drawablePadding="6dp"
+            android:text="@string/title_folder_inbox"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbJunk" />
+
         <View
             android:id="@+id/vSeparator"
             android:layout_width="0dp"
@@ -247,7 +247,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbMove" />
+            app:layout_constraintTop_toBottomOf="@id/cbInbox" />
 
         <CheckBox
             android:id="@+id/cbClear"

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

@@ -804,31 +804,31 @@
                 app:tint="@color/action_foreground" />
 
             <ImageButton
-                android:id="@+id/ibInbox"
+                android:id="@+id/ibMove"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/title_folder_inbox"
+                android:contentDescription="@string/title_move_to"
                 android:padding="6dp"
                 android:scaleType="fitCenter"
-                android:tooltipText="@string/title_folder_inbox"
+                android:tooltipText="@string/title_move_to"
                 app:layout_constraintEnd_toStartOf="@id/ibHighImportance"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/twotone_inbox_24"
+                app:srcCompat="@drawable/twotone_drive_file_move_24"
                 app:tint="@color/action_foreground" />
 
             <ImageButton
-                android:id="@+id/ibJunk"
+                android:id="@+id/ibArchive"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/title_folder_junk"
+                android:contentDescription="@string/title_archive"
                 android:padding="6dp"
                 android:scaleType="fitCenter"
-                android:tooltipText="@string/title_folder_junk"
-                app:layout_constraintEnd_toStartOf="@id/ibInbox"
+                android:tooltipText="@string/title_archive"
+                app:layout_constraintEnd_toStartOf="@id/ibMove"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/twotone_report_24"
+                app:srcCompat="@drawable/twotone_archive_24"
                 app:tint="@color/action_foreground" />
 
             <ImageButton
@@ -840,7 +840,7 @@
                 android:padding="6dp"
                 android:scaleType="fitCenter"
                 android:tooltipText="@string/title_trash"
-                app:layout_constraintEnd_toStartOf="@id/ibJunk"
+                app:layout_constraintEnd_toStartOf="@id/ibArchive"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_delete_24"
                 app:tint="@color/action_foreground" />
@@ -860,31 +860,31 @@
                 app:tint="@color/action_foreground" />
 
             <ImageButton
-                android:id="@+id/ibArchive"
+                android:id="@+id/ibJunk"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/title_archive"
+                android:contentDescription="@string/title_folder_junk"
                 android:padding="6dp"
                 android:scaleType="fitCenter"
-                android:tooltipText="@string/title_archive"
+                android:tooltipText="@string/title_folder_junk"
                 app:layout_constraintEnd_toStartOf="@id/ibDelete"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/twotone_archive_24"
+                app:srcCompat="@drawable/twotone_report_24"
                 app:tint="@color/action_foreground" />
 
             <ImageButton
-                android:id="@+id/ibMove"
+                android:id="@+id/ibInbox"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/title_move_to"
+                android:contentDescription="@string/title_folder_inbox"
                 android:padding="6dp"
                 android:scaleType="fitCenter"
-                android:tooltipText="@string/title_move_to"
-                app:layout_constraintEnd_toStartOf="@id/ibArchive"
+                android:tooltipText="@string/title_folder_inbox"
+                app:layout_constraintEnd_toStartOf="@id/ibJunk"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/twotone_drive_file_move_24"
+                app:srcCompat="@drawable/twotone_inbox_24"
                 app:tint="@color/action_foreground" />
 
             <ImageButton
@@ -896,7 +896,7 @@
                 android:padding="3dp"
                 android:paddingVertical="6dp"
                 android:tooltipText="@string/title_setup"
-                app:layout_constraintEnd_toStartOf="@id/ibMove"
+                app:layout_constraintEnd_toStartOf="@id/ibInbox"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_settings_24"
                 app:tint="@color/action_foreground" />