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

Refactor colleciton_page & galleryType detection

Browse source
This commit is contained in:
Neeraj Gupta 2023-08-19 11:24:13 +05:30
parent 2ccc913662
commit 2b52aa74c1
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ui/collections/album/row_item.dart
View file

@ -195,11 +195,6 @@ class AlbumRowItemWidget extends StatelessWidget {
CollectionPage(
CollectionWithThumbnail(c, thumbnail),
tagPrefix: tagPrefix,
appBarType: isOwner
? (c.type == CollectionType.favorites
? GalleryType.favorite
: GalleryType.ownedCollection)
: GalleryType.sharedCollection,
hasVerifiedLock: hasVerifiedLock,
),
);

2
lib/ui/tabs/shared/quick_link_album_item.dart
View file

@ -121,7 +121,7 @@ class QuickLinkAlbumItem extends StatelessWidget {
c,
thumbnail,
),
appBarType: GalleryType.ownedCollection,
galleryType: GalleryType.ownedCollection,
tagPrefix: heroTagPrefix,
);
routeToPage(context, page);

3
lib/ui/viewer/file_details/albums_item_widget.dart
View file

@ -92,9 +92,6 @@ class AlbumsItemWidget extends StatelessWidget {
context,
CollectionPage(
CollectionWithThumbnail(c, null),
appBarType: c.isOwner(currentUserID)
? GalleryType.ownedCollection
: GalleryType.sharedCollection,
),
);
},

14
lib/ui/viewer/gallery/collection_page.dart
View file

@ -21,13 +21,11 @@ import 'package:photos/ui/viewer/gallery/gallery_app_bar_widget.dart';
class CollectionPage extends StatelessWidget {
final CollectionWithThumbnail c;
final String tagPrefix;
final GalleryType appBarType;
final bool? hasVerifiedLock;
CollectionPage(
this.c, {
this.tagPrefix = "collection",
this.appBarType = GalleryType.ownedCollection,
this.hasVerifiedLock = false,
Key? key,
}) : super(key: key);
@ -42,7 +40,8 @@ class CollectionPage extends StatelessWidget {
return const EmptyState();
}
final galleryType = _getGalleryType(c.collection);
final galleryType =
_getGalleryType(c.collection, Configuration.instance.getUserID()!);
final List<File>? initialFiles =
c.thumbnail != null ? [c.thumbnail!] : null;
final gallery = Gallery(
@ -113,9 +112,8 @@ class CollectionPage extends StatelessWidget {
);
}
GalleryType _getGalleryType(Collection c) {
final currentUserID = Configuration.instance.getUserID()!;
if (!c.isOwner(currentUserID)) {
GalleryType _getGalleryType(Collection c, int userID) {
if (!c.isOwner(userID)) {
return GalleryType.sharedCollection;
}
if (c.isDefaultHidden()) {
@ -127,6 +125,8 @@ class CollectionPage extends StatelessWidget {
} else if (c.isQuickLinkCollection()) {
return GalleryType.quickLink;
}
return appBarType;
debugPrint("Unknown gallery type for collection ${c.id}, falling back to "
"default");
return GalleryType.ownedCollection;
}
}