Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

sort by path

Browse source
This commit is contained in:
Thibault Deckers 2020-02-07 19:01:36 +01:00
parent 32c5fcd41a
commit 0c0d3d3019
3 changed files with 55 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/model/image_collection.dart
View file

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

10
lib/widgets/album/all_collection_page.dart
View file

@ -53,6 +53,10 @@ class _AllCollectionAppBar extends SliverAppBar {
value: AlbumAction.sortBySize, value: AlbumAction.sortBySize,
child: MenuRow(text: 'Sort by size', checked: collection.sortFactor == SortFactor.size), 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(), const PopupMenuDivider(),
if (collection.sortFactor == SortFactor.date) ...[ if (collection.sortFactor == SortFactor.date) ...[
PopupMenuItem( PopupMenuItem(
@ -106,6 +110,10 @@ class _AllCollectionAppBar extends SliverAppBar {
settings.collectionSortFactor = SortFactor.size; settings.collectionSortFactor = SortFactor.size;
collection.sort(SortFactor.size); collection.sort(SortFactor.size);
break; 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 }

65
lib/widgets/album/collection_section.dart
View file

@ -95,36 +95,49 @@ class SectionHeader extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Widget header = const SizedBox.shrink(); Widget header = const SizedBox.shrink();
if (collection.sortFactor == SortFactor.date) { switch (collection.sortFactor) {
switch (collection.groupFactor) { case SortFactor.date:
case GroupFactor.album: if (collection.sortFactor == SortFactor.date) {
Widget albumIcon = IconUtils.getAlbumIcon(context, sectionKey as String); switch (collection.groupFactor) {
if (albumIcon != null) { case GroupFactor.album:
albumIcon = Material( header = _buildAlbumSectionHeader(context);
type: MaterialType.circle, break;
elevation: 3, case GroupFactor.month:
color: Colors.transparent, header = MonthSectionHeader(key: ValueKey(sectionKey), date: sectionKey as DateTime);
shadowColor: Colors.black, break;
child: albumIcon, case GroupFactor.day:
); header = DaySectionHeader(key: ValueKey(sectionKey), date: sectionKey as DateTime);
break;
} }
var title = collection.getUniqueAlbumName(sectionKey as String, sections.keys.cast<String>()); }
header = TitleSectionHeader( break;
key: ValueKey(title), case SortFactor.size:
leading: albumIcon, break;
title: title, case SortFactor.name:
); header = _buildAlbumSectionHeader(context);
break; 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( return IgnorePointer(
child: header, child: header,
); );
} }
Widget _buildAlbumSectionHeader(BuildContext context) {
Widget albumIcon = IconUtils.getAlbumIcon(context, sectionKey as String);
if (albumIcon != null) {
albumIcon = Material(
type: MaterialType.circle,
elevation: 3,
color: Colors.transparent,
shadowColor: Colors.black,
child: albumIcon,
);
}
var title = collection.getUniqueAlbumName(sectionKey as String, sections.keys.cast<String>());
return TitleSectionHeader(
key: ValueKey(title),
leading: albumIcon,
title: title,
);
}
} }