From a88ceaf53341090d43013d3a8feb09791fbcf291 Mon Sep 17 00:00:00 2001
From: M66B <259573+M66B@users.noreply.github.com>
Date: Thu, 2 May 2024 11:19:21 +0200
Subject: [PATCH] Consistent ordering

---
 .../eu/faircode/email/FragmentMessages.java   | 28 ++++++++--------
 app/src/main/res/layout/fragment_messages.xml | 32 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 326e75ffbe..c529de9960 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -301,10 +301,10 @@ public class FragmentMessages extends FragmentBase
     private ImageButton ibNormalImportance;
     private ImageButton ibHighImportance;
     private ImageButton ibInbox;
-    private ImageButton ibArchive;
     private ImageButton ibJunk;
     private ImageButton ibTrash;
     private ImageButton ibDelete;
+    private ImageButton ibArchive;
     private ImageButton ibMove;
     private ImageButton ibMoreSettings;
     private FloatingActionButton fabSearch;
@@ -630,10 +630,10 @@ public class FragmentMessages extends FragmentBase
         ibNormalImportance = view.findViewById(R.id.ibNormalImportance);
         ibHighImportance = view.findViewById(R.id.ibHighImportance);
         ibInbox = view.findViewById(R.id.ibInbox);
-        ibArchive = view.findViewById(R.id.ibArchive);
         ibJunk = view.findViewById(R.id.ibJunk);
         ibTrash = view.findViewById(R.id.ibTrash);
         ibDelete = view.findViewById(R.id.ibDelete);
+        ibArchive = view.findViewById(R.id.ibArchive);
         ibMove = view.findViewById(R.id.ibMove);
         ibMoreSettings = view.findViewById(R.id.ibMoreSettings);
         fabSearch = view.findViewById(R.id.fabSearch);
@@ -1720,13 +1720,6 @@ public class FragmentMessages extends FragmentBase
             }
         });
 
-        ibArchive.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onActionMoveSelection(EntityFolder.ARCHIVE, false);
-            }
-        });
-
         ibJunk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -1755,6 +1748,13 @@ public class FragmentMessages extends FragmentBase
             }
         });
 
+        ibArchive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onActionMoveSelection(EntityFolder.ARCHIVE, false);
+            }
+        });
+
         Runnable runMoveTo = new RunnableEx("moveto") {
             @Override
             protected void delegate() {
@@ -6988,6 +6988,10 @@ public class FragmentMessages extends FragmentBase
                         if (move)
                             count++;
 
+                        boolean archive = (more_archive && count < FragmentDialogQuickActions.MAX_QUICK_ACTIONS && result.canArchive());
+                        if (archive)
+                            count++;
+
                         boolean delete = (more_delete && count < FragmentDialogQuickActions.MAX_QUICK_ACTIONS && result.canDelete());
                         if (delete)
                             count++;
@@ -7006,10 +7010,6 @@ public class FragmentMessages extends FragmentBase
                         if (junk)
                             count++;
 
-                        boolean archive = (more_archive && count < FragmentDialogQuickActions.MAX_QUICK_ACTIONS && result.canArchive());
-                        if (archive)
-                            count++;
-
                         boolean inbox = ((more_inbox || (more_junk && inJunk)) && count < FragmentDialogQuickActions.MAX_QUICK_ACTIONS && result.canInbox());
                         if (inbox)
                             count++;
@@ -7074,10 +7074,10 @@ public class FragmentMessages extends FragmentBase
                         ibNormalImportance.setVisibility(importance_normal ? View.VISIBLE : View.GONE);
                         ibHighImportance.setVisibility(importance_high ? View.VISIBLE : View.GONE);
                         ibInbox.setVisibility(inbox ? View.VISIBLE : View.GONE);
-                        ibArchive.setVisibility(archive ? View.VISIBLE : View.GONE);
                         ibJunk.setVisibility(junk ? 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);
                         cardMore.setTag(fabMore.isOrWillBeShown() ? result : null);
                         cardMore.setVisibility(fabMore.isOrWillBeShown() ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 3848bfbbe0..7dc0abcca3 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -817,20 +817,6 @@
                 app:srcCompat="@drawable/twotone_inbox_24"
                 app:tint="@color/action_foreground" />
 
-            <ImageButton
-                android:id="@+id/ibArchive"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/title_archive"
-                android:padding="6dp"
-                android:scaleType="fitCenter"
-                android:tooltipText="@string/title_archive"
-                app:layout_constraintEnd_toStartOf="@id/ibInbox"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/twotone_archive_24"
-                app:tint="@color/action_foreground" />
-
             <ImageButton
                 android:id="@+id/ibJunk"
                 android:layout_width="48dp"
@@ -840,7 +826,7 @@
                 android:padding="6dp"
                 android:scaleType="fitCenter"
                 android:tooltipText="@string/title_folder_junk"
-                app:layout_constraintEnd_toStartOf="@id/ibArchive"
+                app:layout_constraintEnd_toStartOf="@id/ibInbox"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_report_24"
                 app:tint="@color/action_foreground" />
@@ -873,6 +859,20 @@
                 app:srcCompat="@drawable/twotone_delete_forever_24"
                 app:tint="@color/action_foreground" />
 
+            <ImageButton
+                android:id="@+id/ibArchive"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/title_archive"
+                android:padding="6dp"
+                android:scaleType="fitCenter"
+                android:tooltipText="@string/title_archive"
+                app:layout_constraintEnd_toStartOf="@id/ibDelete"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/twotone_archive_24"
+                app:tint="@color/action_foreground" />
+
             <ImageButton
                 android:id="@+id/ibMove"
                 android:layout_width="48dp"
@@ -882,7 +882,7 @@
                 android:padding="6dp"
                 android:scaleType="fitCenter"
                 android:tooltipText="@string/title_move_to"
-                app:layout_constraintEnd_toStartOf="@id/ibDelete"
+                app:layout_constraintEnd_toStartOf="@id/ibArchive"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/twotone_drive_file_move_24"
                 app:tint="@color/action_foreground" />