Skip to content

armgit / ente

Public Imported from GitHub
0

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

Open library sharing albums on tap

Neeraj Gupta4434095cbcad
diff --git a/mobile/apps/photos/lib/ui/collections/flex_grid_view.dart b/mobile/apps/photos/lib/ui/collections/flex_grid_view.dart
index e400351bb2..b395d0c413 100644
--- a/mobile/apps/photos/lib/ui/collections/flex_grid_view.dart
+++ b/mobile/apps/photos/lib/ui/collections/flex_grid_view.dart
@@ -52,6 +52,7 @@ class AlbumGridLayout {
}
typedef AlbumSelectionCallbacks = ({
+ bool isSelectionModeActive,
bool Function(Collection) isSelected,
ValueChanged<Collection> toggle,
});
@@ -145,7 +146,7 @@ class _CollectionsFlexiGridViewWidgetState
}
bool get _togglesSelectionOnTap =>
- widget.selectionCallbacks != null ||
+ (widget.selectionCallbacks?.isSelectionModeActive ?? false) ||
isAnyAlbumSelected ||
widget.onlyAllowSelection;
diff --git a/mobile/apps/photos/lib/ui/sharing/library_sharing/library_sharing_page.dart b/mobile/apps/photos/lib/ui/sharing/library_sharing/library_sharing_page.dart
index b57ffd4db5..544e995b7c 100644
--- a/mobile/apps/photos/lib/ui/sharing/library_sharing/library_sharing_page.dart
+++ b/mobile/apps/photos/lib/ui/sharing/library_sharing/library_sharing_page.dart
@@ -250,8 +250,9 @@ class _LibrarySharingPageState extends State<LibrarySharingPage> {
albums,
tag: 'library_sharing_${_recipient.userID}',
selectionCallbacks: (
+ isSelectionModeActive: _controller.isSelecting,
isSelected: _controller.isSelected,
- toggle: _handleAlbumTap,
+ toggle: _toggleAlbumSelection,
),
enableSelectionMode: true,
gridTopLeftOverlayBuilder: _roleOverlay,
@@ -298,7 +299,7 @@ class _LibrarySharingPageState extends State<LibrarySharingPage> {
return role == null ? null : LibrarySharingRoleBadge(role: role);
}
- void _handleAlbumTap(Collection album) {
+ void _toggleAlbumSelection(Collection album) {
if (_controller.isMutating) {
return;
}