Move sort option above archive

lib/ui/viewer/gallery/gallery_app_bar_widget.dart

@@ -285,40 +285,40 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
       if (isArchived || widget.collection!.type != CollectionType.favorites) {
         items.add(
           PopupMenuItem(
-            value: 2,
+            value: 6,
             child: Row(
               children: [
-                Icon(isArchived ? Icons.unarchive : Icons.archive_outlined),
+                const Icon(Icons.sort_outlined),
                 const Padding(
                   padding: EdgeInsets.all(8),
                 ),
                 Text(
-                  isArchived
-                      ? S.of(context).unarchiveAlbum
-                      : S.of(context).archiveAlbum,
+                  S.of(context).sortAlbumsBy,
                 ),
               ],
             ),
           ),
         );
-      }
-      if (widget.collection!.type != CollectionType.favorites) {
         items.add(
           PopupMenuItem(
-            value: 6,
+            value: 2,
             child: Row(
               children: [
-                const Icon(Icons.sort_outlined),
+                Icon(isArchived ? Icons.unarchive : Icons.archive_outlined),
                 const Padding(
                   padding: EdgeInsets.all(8),
                 ),
                 Text(
-                  S.of(context).sortAlbumsBy,
+                  isArchived
+                      ? S.of(context).unarchiveAlbum
+                      : S.of(context).archiveAlbum,
                 ),
               ],
             ),
           ),
         );
+      }
+      if (widget.collection!.type != CollectionType.favorites) {
         items.add(
           PopupMenuItem(
             value: 3,