sort by path

lib/model/image_collection.dart

@@ -63,6 +63,9 @@ class ImageCollection with ChangeNotifier {
           MapEntry(null, _rawEntries),
         ]));
         break;
+      case SortFactor.name:
+        sections = Map.unmodifiable(groupBy(_rawEntries, (entry) => entry.directory));
+        break;
     }
     notifyListeners();
   }
@@ -75,6 +78,9 @@ class ImageCollection with ChangeNotifier {
       case SortFactor.size:
         _rawEntries.sort((a, b) => b.sizeBytes.compareTo(a.sizeBytes));
         break;
+      case SortFactor.name:
+        _rawEntries.sort((a, b) => a.path.compareTo(b.path));
+        break;
     }
   }
 
@@ -194,6 +200,6 @@ class ImageCollection with ChangeNotifier {
   }
 }
 
-enum SortFactor { date, size }
+enum SortFactor { date, size, name }
 
 enum GroupFactor { album, month, day }

lib/widgets/album/all_collection_page.dart

@@ -53,6 +53,10 @@ class _AllCollectionAppBar extends SliverAppBar {
                 value: AlbumAction.sortBySize,
                 child: MenuRow(text: 'Sort by size', checked: collection.sortFactor == SortFactor.size),
               ),
+              PopupMenuItem(
+                value: AlbumAction.sortByName,
+                child: MenuRow(text: 'Sort by name', checked: collection.sortFactor == SortFactor.name),
+              ),
               const PopupMenuDivider(),
               if (collection.sortFactor == SortFactor.date) ...[
                 PopupMenuItem(
@@ -106,6 +110,10 @@ class _AllCollectionAppBar extends SliverAppBar {
         settings.collectionSortFactor = SortFactor.size;
         collection.sort(SortFactor.size);
         break;
+      case AlbumAction.sortByName:
+        settings.collectionSortFactor = SortFactor.name;
+        collection.sort(SortFactor.name);
+        break;
     }
   }
 
@@ -121,4 +129,4 @@ class _AllCollectionAppBar extends SliverAppBar {
   }
 }
 
-enum AlbumAction { debug, groupByAlbum, groupByMonth, groupByDay, sortByDate, sortBySize }
+enum AlbumAction { debug, groupByAlbum, groupByMonth, groupByDay, sortByDate, sortBySize, sortByName }

lib/widgets/album/collection_section.dart

@@ -95,9 +95,34 @@ class SectionHeader extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Widget header = const SizedBox.shrink();
+    switch (collection.sortFactor) {
+      case SortFactor.date:
         if (collection.sortFactor == SortFactor.date) {
           switch (collection.groupFactor) {
             case GroupFactor.album:
+              header = _buildAlbumSectionHeader(context);
+              break;
+            case GroupFactor.month:
+              header = MonthSectionHeader(key: ValueKey(sectionKey), date: sectionKey as DateTime);
+              break;
+            case GroupFactor.day:
+              header = DaySectionHeader(key: ValueKey(sectionKey), date: sectionKey as DateTime);
+              break;
+          }
+        }
+        break;
+      case SortFactor.size:
+        break;
+      case SortFactor.name:
+        header = _buildAlbumSectionHeader(context);
+        break;
+    }
+    return IgnorePointer(
+      child: header,
+    );
+  }
+
+  Widget _buildAlbumSectionHeader(BuildContext context) {
     Widget albumIcon = IconUtils.getAlbumIcon(context, sectionKey as String);
     if (albumIcon != null) {
       albumIcon = Material(
@@ -109,22 +134,10 @@ class SectionHeader extends StatelessWidget {
       );
     }
     var title = collection.getUniqueAlbumName(sectionKey as String, sections.keys.cast<String>());
-          header = TitleSectionHeader(
+    return TitleSectionHeader(
       key: ValueKey(title),
       leading: albumIcon,
       title: title,
     );
-          break;
-        case GroupFactor.month:
-          header = MonthSectionHeader(key: ValueKey(sectionKey), date: sectionKey as DateTime);
-          break;
-        case GroupFactor.day:
-          header = DaySectionHeader(key: ValueKey(sectionKey), date: sectionKey as DateTime);
-          break;
-      }
-    }
-    return IgnorePointer(
-      child: header,
-    );
   }
 }