Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Match library sharing album order

Neeraj Gupta60f9bc1a863c
diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dart
index 00482b433e..728ecf416c 100644
--- a/mobile/apps/photos/lib/services/collections_service.dart
+++ b/mobile/apps/photos/lib/services/collections_service.dart
@@ -433,6 +433,26 @@ class CollectionsService {
collections.sort(comparator);
}
+ Future<List<Collection>> orderCollectionsForAlbums(
+ Iterable<Collection> collections,
+ ) async {
+ final sorted = collections.toList();
+ await sortCollectionsByAlbumPreferences(sorted);
+ return [
+ ...sorted.where(
+ (collection) => collection.type == CollectionType.favorites,
+ ),
+ ...sorted.where(
+ (collection) =>
+ collection.type != CollectionType.favorites && collection.isPinned,
+ ),
+ ...sorted.where(
+ (collection) =>
+ collection.type != CollectionType.favorites && !collection.isPinned,
+ ),
+ ];
+ }
+
Future<Comparator<Collection>> _albumPreferenceComparator({
AlbumSortKey? sortKey,
AlbumSortDirection? sortDirection,
@@ -677,33 +697,17 @@ class CollectionsService {
}
Future<List<Collection>> getCollectionForOnEnteSection() async {
- final List<Collection> collections = CollectionsService.instance
- .getCollectionsForUI();
final bool hasFavorites = FavoritesService.instance.hasFavorites();
- await sortCollectionsByAlbumPreferences(collections);
- final List<Collection> favorites = [];
- final List<Collection> pinned = [];
- final List<Collection> rest = [];
- for (final collection in collections) {
- if (collection.type == CollectionType.uncategorized ||
- collection.isQuickLinkCollection() ||
- collection.isHidden() ||
- collection.isArchived()) {
- continue;
- }
- if (collection.type == CollectionType.favorites) {
- // Hide fav collection if it's empty
- if (hasFavorites) {
- favorites.add(collection);
- }
- } else if (collection.isPinned) {
- pinned.add(collection);
- } else {
- rest.add(collection);
- }
- }
-
- return favorites + pinned + rest;
+ return orderCollectionsForAlbums(
+ getCollectionsForUI().where(
+ (collection) =>
+ collection.type != CollectionType.uncategorized &&
+ !collection.isQuickLinkCollection() &&
+ !collection.isHidden() &&
+ !collection.isArchived() &&
+ (collection.type != CollectionType.favorites || hasFavorites),
+ ),
+ );
}
Future<List<Collection>> getCollectionForWidgetSelection() async {
diff --git a/mobile/apps/photos/lib/services/library_sharing_service.dart b/mobile/apps/photos/lib/services/library_sharing_service.dart
index f1528c2926..cb1d6757f5 100644
--- a/mobile/apps/photos/lib/services/library_sharing_service.dart
+++ b/mobile/apps/photos/lib/services/library_sharing_service.dart
@@ -103,11 +103,8 @@ class LibrarySharingService implements LibrarySharingRepository {
}
@override
- Future<List<Collection>> getEligibleAlbums() async {
- final albums = _eligibleAlbums().toList();
- await _collectionsService.sortCollectionsByAlbumPreferences(albums);
- return albums;
- }
+ Future<List<Collection>> getEligibleAlbums() =>
+ _collectionsService.orderCollectionsForAlbums(_eligibleAlbums());
@override
Future<Set<int>> shareAlbums({