Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] Preserve iOS back gestures for album transitions

r4khul4a06eec60f4e
diff --git a/mobile/apps/photos/lib/models/search/search_types.dart b/mobile/apps/photos/lib/models/search/search_types.dart
index 5a1e957562..a12790e89d 100644
--- a/mobile/apps/photos/lib/models/search/search_types.dart
+++ b/mobile/apps/photos/lib/models/search/search_types.dart
@@ -225,7 +225,7 @@ extension SectionTypeExtensions on SectionType {
await routeToPage(
context,
CollectionPage(CollectionWithThumbnail(c, null)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
} catch (e, s) {
Logger(
diff --git a/mobile/apps/photos/lib/services/album_home_widget_service.dart b/mobile/apps/photos/lib/services/album_home_widget_service.dart
index d9cf9635a2..b30d7ec635 100644
--- a/mobile/apps/photos/lib/services/album_home_widget_service.dart
+++ b/mobile/apps/photos/lib/services/album_home_widget_service.dart
@@ -215,7 +215,7 @@ class AlbumHomeWidgetService {
AppNavigationService.instance
.pushPage(
CollectionPage(CollectionWithThumbnail(collection, thumbnail)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
)
.ignore();
final getAllFilesCollection = await FilesDB.instance.getAllFilesCollection(
diff --git a/mobile/apps/photos/lib/services/app_navigation_service.dart b/mobile/apps/photos/lib/services/app_navigation_service.dart
index 5f346c661b..3b003d95c1 100644
--- a/mobile/apps/photos/lib/services/app_navigation_service.dart
+++ b/mobile/apps/photos/lib/services/app_navigation_service.dart
@@ -26,6 +26,7 @@ class AppNavigationService {
Future<T?> pushPage<T extends Object>(
Widget page, {
bool forceCustomPageRoute = false,
+ bool useFadeTransition = false,
}) {
final pushResult = Completer<T?>();
final scheduledPush = _lastScheduledPush
@@ -47,6 +48,7 @@ class AppNavigationService {
navigator,
page,
forceCustomPageRoute: forceCustomPageRoute,
+ useFadeTransition: useFadeTransition,
);
unawaited(
routeFuture.then(
@@ -77,6 +79,7 @@ class AppNavigationService {
NavigatorState navigator,
Widget page, {
bool forceCustomPageRoute = false,
+ bool useFadeTransition = false,
}) {
if (Platform.isAndroid || forceCustomPageRoute) {
return navigator.push(_buildPageRoute(page));
@@ -84,6 +87,7 @@ class AppNavigationService {
return navigator.push(
SwipeableRouteBuilder(
+ useFadeTransition: useFadeTransition,
pageBuilder: (context, animation, secondaryAnimation) {
return page;
},
diff --git a/mobile/apps/photos/lib/ui/collections/album/row_item.dart b/mobile/apps/photos/lib/ui/collections/album/row_item.dart
index e19585b70b..57f29e177b 100644
--- a/mobile/apps/photos/lib/ui/collections/album/row_item.dart
+++ b/mobile/apps/photos/lib/ui/collections/album/row_item.dart
@@ -343,7 +343,7 @@ class AlbumRowItemWidget extends StatelessWidget {
coverHeroTag: tagPrefix,
hasVerifiedLock: hasVerifiedLock,
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
},
onLongPress: () {
diff --git a/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart b/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart
index 2bd3f85f2c..5019dce70e 100644
--- a/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart
+++ b/mobile/apps/photos/lib/ui/collections/album/vertical_list.dart
@@ -476,7 +476,7 @@ class _AlbumVerticalListWidgetState extends State<AlbumVerticalListWidget> {
CollectionWithThumbnail(collection, null),
hasVerifiedLock: hasVerifiedLock,
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
}
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 e00d5268d6..7adf29f82c 100644
--- a/mobile/apps/photos/lib/ui/collections/flex_grid_view.dart
+++ b/mobile/apps/photos/lib/ui/collections/flex_grid_view.dart
@@ -183,7 +183,7 @@ class _CollectionsFlexiGridViewWidgetState
CollectionWithThumbnail(c, thumbnail),
hasVerifiedLock: hasVerifiedLock,
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
}
@@ -200,7 +200,7 @@ class _CollectionsFlexiGridViewWidgetState
await routeToPage(
context,
CollectionPage(CollectionWithThumbnail(result, null)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
} else {
await showGenericErrorDialog(context: context, error: result);
diff --git a/mobile/apps/photos/lib/ui/rituals/ritual_page.dart b/mobile/apps/photos/lib/ui/rituals/ritual_page.dart
index 31efa2993b..da6bddadd6 100644
--- a/mobile/apps/photos/lib/ui/rituals/ritual_page.dart
+++ b/mobile/apps/photos/lib/ui/rituals/ritual_page.dart
@@ -1247,7 +1247,7 @@ Future<void> _openRitualAlbum(BuildContext context, Ritual ritual) async {
CollectionWithThumbnail(collection, thumbnail),
hasVerifiedLock: collection.isHidden(),
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
}
@@ -1279,7 +1279,7 @@ Future<void> _openRitualAlbumAndFile(
CollectionWithThumbnail(collection, thumbnail),
hasVerifiedLock: collection.isHidden(),
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
).ignore();
final files = await FilesDB.instance.getAllFilesCollection(collection.id);
diff --git a/mobile/apps/photos/lib/ui/social/feed_screen.dart b/mobile/apps/photos/lib/ui/social/feed_screen.dart
index cff20258f9..9e66833ef3 100644
--- a/mobile/apps/photos/lib/ui/social/feed_screen.dart
+++ b/mobile/apps/photos/lib/ui/social/feed_screen.dart
@@ -723,7 +723,7 @@ class _FeedScreenState extends State<FeedScreen> {
CollectionWithThumbnail(collection, null),
fileToJumpTo: fileToJumpTo,
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
),
);
}
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index d01ff13e05..0d24451f06 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -403,7 +403,7 @@ class _HomeWidgetState extends State<HomeWidget> {
await routeToPage(
context,
CollectionPage(CollectionWithThumbnail(collection, null)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
return;
}
@@ -1316,7 +1316,7 @@ class _HomeWidgetState extends State<HomeWidget> {
// ignore: unawaited_futures
AppNavigationService.instance.pushPage(
CollectionPage(CollectionWithThumbnail(collection, thumbnail)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
}
}
diff --git a/mobile/apps/photos/lib/ui/tabs/shared/all_links_page.dart b/mobile/apps/photos/lib/ui/tabs/shared/all_links_page.dart
index 889254dabd..f7e4bc147b 100644
--- a/mobile/apps/photos/lib/ui/tabs/shared/all_links_page.dart
+++ b/mobile/apps/photos/lib/ui/tabs/shared/all_links_page.dart
@@ -59,7 +59,7 @@ class _AllLinksPageState extends State<AllLinksPage> {
CollectionWithThumbnail(c, thumbnail),
tagPrefix: _quickLinkHeroTagPrefix,
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
),
);
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart
index fa6cfb5d2c..39fd9ca754 100644
--- a/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart
@@ -111,7 +111,7 @@ class _AlbumsItemWidgetState extends State<AlbumsItemWidget> {
CollectionWithThumbnail(c, null),
fileToJumpTo: widget.file,
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
},
onRemove: _canRemoveFrom(c)
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/shared_public_collection_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/shared_public_collection_page.dart
index f53b0f47e5..fa858b18ee 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/shared_public_collection_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/shared_public_collection_page.dart
@@ -101,7 +101,7 @@ class _SharedPublicCollectionPageState
await routeToPage(
context,
CollectionPage(CollectionWithThumbnail(c!, null)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
} catch (e, s) {
logger.severe("Failed to join public album", e, s);
@@ -250,7 +250,7 @@ class _SharedPublicCollectionPageState
await routeToPage(
context,
CollectionPage(CollectionWithThumbnail(c!, null)),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
} catch (e, s) {
logger.severe("Failed to join collection", e, s);
diff --git a/mobile/apps/photos/lib/ui/viewer/search/result/search_section_all_page.dart b/mobile/apps/photos/lib/ui/viewer/search/result/search_section_all_page.dart
index 062351fc21..6cec58f9fb 100644
--- a/mobile/apps/photos/lib/ui/viewer/search/result/search_section_all_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/result/search_section_all_page.dart
@@ -225,7 +225,7 @@ class _SearchSectionAllPageState extends State<SearchSectionAllPage> {
result.collectionWithThumbnail,
tagPrefix: "searchable_item" + result.heroTag(),
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
);
},
);
diff --git a/mobile/apps/photos/lib/ui/viewer/search/search_suggestions.dart b/mobile/apps/photos/lib/ui/viewer/search/search_suggestions.dart
index 6a7cd2a4fc..3c8d9c4b80 100644
--- a/mobile/apps/photos/lib/ui/viewer/search/search_suggestions.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/search_suggestions.dart
@@ -239,7 +239,7 @@ class SearchResultsWidgetGenerator extends StatelessWidget {
albumSearchResult.collectionWithThumbnail,
tagPrefix: result.heroTag(),
),
- forceCustomPageRoute: true,
+ useFadeTransition: true,
),
);
} else if (result is DeviceAlbumSearchResult) {
diff --git a/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart b/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart
index 9ef0045fe5..d0368d8843 100644
--- a/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart
+++ b/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart
@@ -2,6 +2,7 @@ import "dart:convert";
import "dart:io";
import "package:dio/dio.dart";
+import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:figma_squircle/figma_squircle.dart";
import "package:flutter/material.dart";
@@ -87,6 +88,43 @@ void main() {
await tempDir.delete(recursive: true);
});
+ testWidgets("keeps interactive back when the album route fades", (
+ tester,
+ ) async {
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: lightThemeData.copyWith(platform: TargetPlatform.iOS),
+ home: Builder(
+ builder: (context) => TextButton(
+ onPressed: () => routeToPage(
+ context,
+ const Scaffold(body: Center(child: Text("Album route"))),
+ useFadeTransition: true,
+ ),
+ child: const Text("Open album"),
+ ),
+ ),
+ ),
+ );
+ await tester.tap(find.text("Open album"));
+ await tester.pumpAndSettle();
+ await tester.timedDragFrom(
+ const Offset(1, 300),
+ const Offset(80, 0),
+ const Duration(seconds: 1),
+ );
+ await tester.pumpAndSettle();
+ expect(find.text("Album route"), findsOneWidget);
+ await tester.timedDragFrom(
+ const Offset(1, 300),
+ const Offset(700, 0),
+ const Duration(seconds: 1),
+ );
+ await tester.pumpAndSettle();
+ expect(find.text("Album route"), findsNothing);
+ expect(find.text("Open album"), findsOneWidget);
+ });
+
testWidgets("uses a pending local photo and excludes ignored photos", (
tester,
) async {
diff --git a/mobile/packages/ente_pure_utils/lib/src/navigation_util.dart b/mobile/packages/ente_pure_utils/lib/src/navigation_util.dart
index 5564429cc7..3b4de8943f 100644
--- a/mobile/packages/ente_pure_utils/lib/src/navigation_util.dart
+++ b/mobile/packages/ente_pure_utils/lib/src/navigation_util.dart
@@ -7,12 +7,14 @@ Future<T?> routeToPage<T extends Object>(
BuildContext context,
Widget page, {
bool forceCustomPageRoute = false,
+ bool useFadeTransition = false,
}) {
if (Platform.isAndroid || forceCustomPageRoute) {
return Navigator.of(context).push(_buildPageRoute(page));
} else {
return Navigator.of(context).push(
SwipeableRouteBuilder(
+ useFadeTransition: useFadeTransition,
pageBuilder: (context, animation, secondaryAnimation) {
return page;
},
@@ -53,11 +55,15 @@ PageRouteBuilder<T> _buildPageRoute<T extends Object>(Widget page) {
class SwipeableRouteBuilder<T> extends PageRoute<T> {
final RoutePageBuilder pageBuilder;
+ final bool useFadeTransition;
// Cupertino preserves the iOS back-swipe gesture.
final PageTransitionsBuilder matchingBuilder =
const CupertinoPageTransitionsBuilder();
- SwipeableRouteBuilder({required this.pageBuilder});
+ SwipeableRouteBuilder({
+ required this.pageBuilder,
+ this.useFadeTransition = false,
+ });
@override
Null get barrierColor => null;
@@ -78,7 +84,9 @@ class SwipeableRouteBuilder<T> extends PageRoute<T> {
bool get maintainState => true;
@override
- Duration get transitionDuration => const Duration(milliseconds: 300);
+ Duration get transitionDuration => useFadeTransition
+ ? const Duration(milliseconds: 200)
+ : const Duration(milliseconds: 300);
@override
Widget buildTransitions(
@@ -87,13 +95,16 @@ class SwipeableRouteBuilder<T> extends PageRoute<T> {
Animation<double> secondaryAnimation,
Widget child,
) {
- return matchingBuilder.buildTransitions<T>(
+ final transition = matchingBuilder.buildTransitions<T>(
this,
context,
- animation,
- secondaryAnimation,
+ useFadeTransition ? kAlwaysCompleteAnimation : animation,
+ useFadeTransition ? kAlwaysDismissedAnimation : secondaryAnimation,
child,
);
+ return useFadeTransition
+ ? FadeTransition(opacity: animation, child: transition)
+ : transition;
}
@override