Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Lock tab swipes while selecting photos

r4khul5aeab8d6b304
diff --git a/mobile/apps/photos/changes/unified-selection-sheets.md b/mobile/apps/photos/changes/unified-selection-sheets.md
index 8c67c3d514..62d32a750e 100644
--- a/mobile/apps/photos/changes/unified-selection-sheets.md
+++ b/mobile/apps/photos/changes/unified-selection-sheets.md
@@ -1 +1,2 @@
- Unified album and people selection sheets with photo selection and consistent action labels.
+- Prevented swiping between tabs while selecting photos.
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index ffea168179..2e704a7bd4 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -101,6 +101,7 @@ class _HomeWidgetState extends State<HomeWidget> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
final _selectedAlbums = SelectedAlbums();
final _selectedFiles = SelectedFiles();
+ final _hasSelectedFilesNotifier = ValueNotifier<bool>(false);
final PageController _pageController = PageController();
int _selectedTabIndex = 0;
@@ -181,6 +182,7 @@ class _HomeWidgetState extends State<HomeWidget> {
void initState() {
_logger.info("initstate");
super.initState();
+ _selectedFiles.addListener(_selectedFilesListener);
NotificationService.instance
.initialize(_onDidReceiveNotificationResponse)
@@ -581,8 +583,14 @@ class _HomeWidgetState extends State<HomeWidget> {
);
}
+ void _selectedFilesListener() {
+ _hasSelectedFilesNotifier.value = _selectedFiles.files.isNotEmpty;
+ }
+
@override
void dispose() {
+ _selectedFiles.removeListener(_selectedFilesListener);
+ _hasSelectedFilesNotifier.dispose();
_tabChangedEventSubscription.cancel();
_subscriptionPurchaseEvent.cancel();
_triggerLogoutEvent.cancel();
@@ -1069,11 +1077,13 @@ class _HomeWidgetState extends State<HomeWidget> {
listenable: Listenable.merge([
_swipeToSelectInProgressNotifier,
_selectedAlbums,
+ _hasSelectedFilesNotifier,
]),
builder: (context, child) {
final isPageScrollLocked =
_swipeToSelectInProgressNotifier.value ||
- _selectedAlbums.albums.isNotEmpty;
+ _selectedAlbums.albums.isNotEmpty ||
+ _hasSelectedFilesNotifier.value;
return ValueListenableBuilder<int>(
valueListenable: _selectedTabIndexNotifier,
builder: (context, selectedTabIndex, _) {