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

Use new bottom bar for gallery folder page

Browse source
This commit is contained in:
Neeraj Gupta 2022-12-16 15:29:48 +05:30
parent b06fc72614
commit 66c5e0f24f
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/models/gallery_type.dart
View file

@ -46,6 +46,24 @@ extension GalleyTypeExtension on GalleryType {
}
}
// showDeleteTopOption indicates whether we should show
// delete icon as iconButton
bool showDeleteIconOption() {
switch (this) {
case GalleryType.ownedCollection:
case GalleryType.searchResults:
case GalleryType.homepage:
case GalleryType.favorite:
case GalleryType.localFolder:
return true;
case GalleryType.trash:
case GalleryType.archive:
case GalleryType.hidden:
case GalleryType.sharedCollection:
return false;
}
}
bool showDeleteOption() {
switch (this) {
case GalleryType.ownedCollection:
@ -54,8 +72,8 @@ extension GalleyTypeExtension on GalleryType {
case GalleryType.favorite:
case GalleryType.archive:
case GalleryType.hidden:
return true;
case GalleryType.localFolder:
return true;
case GalleryType.trash:
case GalleryType.sharedCollection:
return false;

4
lib/ui/viewer/actions/file_selection_overlay_bar.dart
View file

@ -40,9 +40,7 @@ class _FileSelectionOverlayBarState extends State<FileSelectionOverlayBar> {
@override
void initState() {
showDeleteOption = (widget.galleryType == GalleryType.homepage ||
widget.galleryType == GalleryType.ownedCollection ||
widget.galleryType == GalleryType.favorite);
showDeleteOption = widget.galleryType.showDeleteIconOption();
widget.selectedFiles.addListener(_selectedFilesListener);
super.initState();
}

4
lib/ui/viewer/gallery/device_folder_page.dart
View file

@ -12,9 +12,9 @@ import 'package:photos/models/device_collection.dart';
import 'package:photos/models/gallery_type.dart';
import 'package:photos/models/selected_files.dart';
import 'package:photos/services/remote_sync_service.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/gallery/gallery_app_bar_widget.dart';
import 'package:photos/ui/viewer/gallery/gallery_overlay_widget.dart';
class DeviceFolderPage extends StatelessWidget {
final DeviceCollection deviceCollection;
@ -61,7 +61,7 @@ class DeviceFolderPage extends StatelessWidget {
alignment: Alignment.bottomCenter,
children: [
gallery,
GalleryOverlayWidget(
FileSelectionOverlayBar(
GalleryType.localFolder,
_selectedFiles,
)