beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added FileSelectionOverlayBar for location screen with GalleryType.locationTag which is the same as GalleryType.searchResults

Browse source
This commit is contained in:
ashilkn 2023-04-10 10:21:58 +05:30
parent 68e5c8defd
commit dcd7399873
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/models/gallery_type.dart
View file

@ -9,7 +9,8 @@ enum GalleryType {
// indicator for gallery view of collections shared with the user
sharedCollection,
ownedCollection,
searchResults
searchResults,
locationTag,
}
extension GalleyTypeExtension on GalleryType {
@ -21,6 +22,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.ownedCollection:
case GalleryType.searchResults:
case GalleryType.favorite:
case GalleryType.locationTag:
return true;
case GalleryType.hidden:
@ -45,6 +47,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.homepage:
case GalleryType.trash:
case GalleryType.sharedCollection:
case GalleryType.locationTag:
return false;
}
}
@ -59,6 +62,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.favorite:
case GalleryType.localFolder:
case GalleryType.uncategorized:
case GalleryType.locationTag:
return true;
case GalleryType.trash:
case GalleryType.archive:
@ -78,6 +82,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.archive:
case GalleryType.hidden:
case GalleryType.localFolder:
case GalleryType.locationTag:
return true;
case GalleryType.trash:
case GalleryType.sharedCollection:
@ -93,6 +98,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.favorite:
case GalleryType.archive:
case GalleryType.uncategorized:
case GalleryType.locationTag:
return true;
case GalleryType.hidden:
case GalleryType.localFolder:
@ -115,6 +121,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.archive:
case GalleryType.localFolder:
case GalleryType.trash:
case GalleryType.locationTag:
return false;
}
}
@ -133,6 +140,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.localFolder:
case GalleryType.trash:
case GalleryType.sharedCollection:
case GalleryType.locationTag:
return false;
}
}
@ -148,6 +156,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.searchResults:
case GalleryType.archive:
case GalleryType.uncategorized:
case GalleryType.locationTag:
return true;
case GalleryType.hidden:
@ -169,6 +178,7 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.homepage:
case GalleryType.searchResults:
case GalleryType.uncategorized:
case GalleryType.locationTag:
return true;
case GalleryType.hidden:

10
lib/ui/viewer/location/location_screen.dart
View file

@ -4,6 +4,7 @@ import "package:photos/core/constants.dart";
import "package:photos/db/files_db.dart";
import "package:photos/models/file.dart";
import "package:photos/models/file_load_result.dart";
import "package:photos/models/gallery_type.dart";
import "package:photos/models/selected_files.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/services/files_service.dart";
@ -15,6 +16,7 @@ import "package:photos/ui/common/loading_widget.dart";
import "package:photos/ui/components/buttons/icon_button_widget.dart";
import "package:photos/ui/components/title_bar_title_widget.dart";
import "package:photos/ui/components/title_bar_widget.dart";
import "package:photos/ui/viewer/actions/file_selection_overlay_bar.dart";
import "package:photos/ui/viewer/gallery/gallery.dart";
import "package:photos/ui/viewer/location/edit_location_sheet.dart";
import "package:photos/utils/dialog_util.dart";
@ -213,10 +215,10 @@ class _LocationGalleryWidgetState extends State<LocationGalleryWidget> {
selectedFiles: _selectedFiles,
tagPrefix: "location_gallery",
),
// FileSelectionOverlayBar(
// GalleryType.ownedCollection,
// _selectedFiles,
// )
FileSelectionOverlayBar(
GalleryType.locationTag,
_selectedFiles,
)
],
);
} else {