TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Update all files in GalleryFilesState when filters are added in hierarchical search in a gallery

Browse Source
This commit is contained in:
ashilkn
2024-09-30 16:02:27 +05:30
parent 79e49d49d4
commit c27451f46b
1 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
mobile/lib/ui/viewer/gallery/gallery.dart
View File

@@ -117,8 +117,7 @@ class GalleryState extends State<Gallery> {
final _forceReloadEventSubscriptions = <StreamSubscription<Event>>[];
late String _logTag;
bool _sortOrderAsc = false;
List<EnteFile> _allFiles = [];
List<EnteFile> _filteredFiles = [];
List<EnteFile> _allGalleryFiles = [];
late SearchFilterDataProvider? _searchFilterDataProvider;
@override
@@ -252,6 +251,20 @@ class GalleryState extends State<Gallery> {
curateAlbumFilters(_searchFilterDataProvider!, filterdFiles);
}
void _setFilteredFilesAndReload(List<EnteFile> files) {
_allGalleryFiles = files;
final updatedGroupedFiles =
widget.enableFileGrouping && widget.groupType.timeGrouping()
? _groupBasedOnTime(files)
: _genericGroupForPerf(files);
if (mounted) {
setState(() {
currentGroupedFiles = updatedGroupedFiles;
});
}
}
void _setFilesAndReload(List<EnteFile> files) {
final hasReloaded = _onFilesLoaded(files);
if (!hasReloaded && mounted) {
@@ -259,6 +272,30 @@ class GalleryState extends State<Gallery> {
}
}
// group files into multiple groups and returns `true` if it resulted in a
// gallery reload
bool _onFilesLoaded(List<EnteFile> files) {
_allGalleryFiles = files;
final updatedGroupedFiles =
widget.enableFileGrouping && widget.groupType.timeGrouping()
? _groupBasedOnTime(files)
: _genericGroupForPerf(files);
if (currentGroupedFiles.length != updatedGroupedFiles.length ||
currentGroupedFiles.isEmpty) {
if (mounted) {
setState(() {
_hasLoadedFiles = true;
currentGroupedFiles = updatedGroupedFiles;
});
}
return true;
} else {
currentGroupedFiles = updatedGroupedFiles;
return false;
}
}
Future<FileLoadResult> _loadFiles({int? limit}) async {
_logger.info("Loading ${limit ?? "all"} files");
try {
@@ -296,44 +333,6 @@ class GalleryState extends State<Gallery> {
}
}
void _setFilteredFilesAndReload(List<EnteFile> files) {
_filteredFiles = files;
final updatedGroupedFiles =
widget.enableFileGrouping && widget.groupType.timeGrouping()
? _groupBasedOnTime(files)
: _genericGroupForPerf(files);
if (mounted) {
setState(() {
currentGroupedFiles = updatedGroupedFiles;
});
}
}
// group files into multiple groups and returns `true` if it resulted in a
// gallery reload
bool _onFilesLoaded(List<EnteFile> files) {
_allFiles = files;
final updatedGroupedFiles =
widget.enableFileGrouping && widget.groupType.timeGrouping()
? _groupBasedOnTime(files)
: _genericGroupForPerf(files);
if (currentGroupedFiles.length != updatedGroupedFiles.length ||
currentGroupedFiles.isEmpty) {
if (mounted) {
setState(() {
_hasLoadedFiles = true;
currentGroupedFiles = updatedGroupedFiles;
});
}
return true;
} else {
currentGroupedFiles = updatedGroupedFiles;
return false;
}
}
@override
void dispose() {
_reloadEventSubscription?.cancel();
@@ -352,7 +351,7 @@ class GalleryState extends State<Gallery> {
@override
Widget build(BuildContext context) {
_logger.finest("Building Gallery ${widget.tagPrefix}");
GalleryFilesState.of(context).setGalleryFiles = _allFiles;
GalleryFilesState.of(context).setGalleryFiles = _allGalleryFiles;
if (!_hasLoadedFiles) {
return widget.loadingWidget;
}