π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Keep Discover return transitions aligned
r4khuldab354452bb9
diff --git a/mobile/apps/photos/lib/ui/viewer/search/result/magic_result_screen.dart b/mobile/apps/photos/lib/ui/viewer/search/result/magic_result_screen.dartindex 51edf9dd08..26ecbf7e79 100644--- a/mobile/apps/photos/lib/ui/viewer/search/result/magic_result_screen.dart+++ b/mobile/apps/photos/lib/ui/viewer/search/result/magic_result_screen.dart@@ -53,7 +53,6 @@ class _MagicResultScreenState extends State<MagicResultScreen> {final _selectedFiles = SelectedFiles();final _coverAppBarKey = GlobalKey();late final List<EnteFile> files;- late final String? _coverHeroTag;late final StreamSubscription<LocalPhotosUpdatedEvent> _filesUpdatedEvent;late final StreamSubscription<MagicSortChangeEvent> _magicSortChangeEvent;late final Logger _logger = Logger("_MagicResultScreenState");@@ -67,7 +66,6 @@ class _MagicResultScreenState extends State<MagicResultScreen> {void initState() {super.initState();files = List.of(widget.files);- _coverHeroTag = files.isEmpty ? null : widget.heroTag + files.first.tag;_enableGrouping = widget.enableGrouping;fileIDToRelevantPos = getFileIDToRelevantPos();if (isLocalGalleryMode) {@@ -184,13 +182,14 @@ class _MagicResultScreenState extends State<MagicResultScreen> {@overrideWidget build(BuildContext context) {+ final cover = widget.files.firstOrNull;final appBar = GalleryAppBarWidget.sliverConfig(MagicResultScreen.appBarType,widget.name,_selectedFiles,coverAppBarKey: _coverAppBarKey,- cover: files.firstOrNull,- coverHeroTag: _coverHeroTag,+ cover: cover,+ coverHeroTag: cover == null ? null : widget.heroTag + cover.tag,files: files,magicSortType: _enableGrouping? MagicSortType.mostRecentdiff --git a/mobile/apps/photos/lib/ui/viewer/search/result/search_thumbnail_widget.dart b/mobile/apps/photos/lib/ui/viewer/search/result/search_thumbnail_widget.dartindex 8279ba638d..e30dfa5464 100644--- a/mobile/apps/photos/lib/ui/viewer/search/result/search_thumbnail_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/search/result/search_thumbnail_widget.dart@@ -1,4 +1,6 @@import "package:flutter/material.dart";+import "package:photos/core/event_bus.dart";+import "package:photos/events/local_photos_updated_event.dart";import 'package:photos/models/file/file.dart';import "package:photos/models/search/generic_search_result.dart";import "package:photos/models/search/search_constants.dart";@@ -27,6 +29,17 @@ class SearchThumbnailWidget extends StatelessWidget {@overrideWidget build(BuildContext context) {+ if (searchResult?.type() == ResultType.magic) {+ return StreamBuilder<LocalPhotosUpdatedEvent>(+ stream: Bus.instance.on<LocalPhotosUpdatedEvent>(),+ builder: (context, _) =>+ _buildThumbnail(context, searchResult!.previewThumbnail()),+ );+ }+ return _buildThumbnail(context, file);+ }++ Widget _buildThumbnail(BuildContext context, EnteFile? file) {return Hero(tag: tagPrefix + (file?.tag ?? ""),createRectTween: searchResult?.type() == ResultType.magic@@ -47,7 +60,7 @@ class SearchThumbnailWidget extends StatelessWidget {clusterID: (searchResult as GenericSearchResult).params[kClusterParamId],)- : ThumbnailWidget(file!)+ : ThumbnailWidget(file): const NoThumbnailWidget(addBorder: false),),),diff --git a/mobile/apps/photos/lib/ui/viewer/search_tab/magic_section.dart b/mobile/apps/photos/lib/ui/viewer/search_tab/magic_section.dartindex 754fc6ba0f..de04e8ded6 100644--- a/mobile/apps/photos/lib/ui/viewer/search_tab/magic_section.dart+++ b/mobile/apps/photos/lib/ui/viewer/search_tab/magic_section.dart@@ -3,7 +3,9 @@ import "dart:async";import "package:ente_components/ente_components.dart";import "package:figma_squircle/figma_squircle.dart";import "package:flutter/material.dart";+import "package:photos/core/event_bus.dart";import "package:photos/events/event.dart";+import "package:photos/events/local_photos_updated_event.dart";import "package:photos/models/search/generic_search_result.dart";import "package:photos/models/search/recent_searches.dart";import "package:photos/models/search/search_types.dart";@@ -111,6 +113,13 @@ class MagicRecommendation extends StatelessWidget {@overrideWidget build(BuildContext context) {+ return StreamBuilder<LocalPhotosUpdatedEvent>(+ stream: Bus.instance.on<LocalPhotosUpdatedEvent>(),+ builder: (context, _) => _buildCard(context),+ );+ }++ Widget _buildCard(BuildContext context) {final heroTag =magicSearchResult.heroTag() +(magicSearchResult.previewThumbnail()?.tag ?? "");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.dartindex ffced7af69..c055b3f58c 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@@ -1,7 +1,6 @@import "dart:async";import "dart:convert";import "dart:io";-import "dart:typed_data";import "dart:ui" as ui;import "package:dio/dio.dart";@@ -27,6 +26,7 @@ import "package:photos/ente_theme_data.dart";import "package:photos/events/collection_meta_event.dart";import "package:photos/events/collection_updated_event.dart";import "package:photos/events/files_updated_event.dart";+import "package:photos/events/local_photos_updated_event.dart";import "package:photos/gateways/entity/models/type.dart";import "package:photos/models/api/collection/user.dart";import "package:photos/models/collection/collection.dart";@@ -40,9 +40,11 @@ import "package:photos/models/metadata/collection_magic.dart";import "package:photos/models/metadata/common_keys.dart";import "package:photos/models/ml/face/face.dart";import "package:photos/models/ml/face/person.dart";+import "package:photos/models/search/generic_search_result.dart";import "package:photos/models/search/hierarchical/camera_filter.dart";import "package:photos/models/search/hierarchical/face_filter.dart";import "package:photos/models/search/hierarchical/magic_filter.dart";+import "package:photos/models/search/search_types.dart";import "package:photos/models/selected_files.dart";import "package:photos/module/download/thumbnail.dart";import "package:photos/service_locator.dart";@@ -73,6 +75,8 @@ import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart"import "package:photos/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart";import "package:photos/ui/viewer/people/person_face_widget.dart";import "package:photos/ui/viewer/search/result/magic_result_screen.dart";+import "package:photos/ui/viewer/search/result/search_result_widget.dart";+import "package:photos/ui/viewer/search_tab/magic_section.dart";import "package:photos/utils/face/face_thumbnail_cache.dart";import "package:shared_preferences/shared_preferences.dart";@@ -136,57 +140,101 @@ void main() {await tempDir.delete(recursive: true);});- testWidgets("keeps the discovery cover stable while switching sort order", (- tester,- ) async {- final files = [_file(1), _file(3), _file(2)];- final originalOrder = List<EnteFile>.of(files);- await tester.pumpWidget(- MaterialApp(- theme: lightThemeData,- localizationsDelegates: StringsLocalizations.localizationsDelegates,- supportedLocales: StringsLocalizations.supportedLocales,- home: MagicResultScreen(+ for (final carousel in [true, false]) {+ testWidgets("keeps Discover return flights aligned (carousel: $carousel)", (+ tester,+ ) async {+ final original = _file(1);+ final newest = _file(3);+ final files = [original, newest];+ final filter = MagicFilter(filterName: "Discovery", occurrence: 2);+ late GenericSearchResult result;+ void open(BuildContext context) => routeToPage(+ context,+ MagicResultScreen(files,name: "Discovery",- heroTag: "discovery",- magicFilter: MagicFilter(filterName: "Discovery", occurrence: 3),+ heroTag: result.heroTag(),+ magicFilter: filter,),- ),- );- await _expectCover(tester, files.first, count: 3);- final header = tester.element(find.byType(AlbumCoverAppBar));- for (final (current, next, expected) in [- ("Most relevant", "Most recent", [files[1], files[2], files[0]]),- ("Most recent", "Most relevant", originalOrder),- ]) {- await tester.tap(find.byTooltip("Sort"));- await tester.pumpAndSettle();- expect(find.text("Sort photos"), findsOneWidget);- expect(- tester- .widgetList<MenuComponent>(find.byType(MenuComponent))- .singleWhere((choice) => choice.trailing != null)- .title,- current,+ useFadeTransition: true,);- await tester.tap(find.text(next));- await _expectCover(tester, expected.first, count: 3);- expect(tester.element(find.byType(AlbumCoverAppBar)), same(header));- expect(- tester.widget<AlbumCoverAppBar>(find.byType(AlbumCoverAppBar)).heroTag,- "discovery${originalOrder.first.tag}",+ result = GenericSearchResult(+ ResultType.magic,+ "Discovery",+ files,+ hierarchicalSearchFilter: filter,+ onResultTap: open,);- expect(- tester- .widget<GalleryFilesState>(find.byType(GalleryFilesState))- .galleryFiles,- expected,+ await tester.pumpWidget(+ MaterialApp(+ theme: lightThemeData,+ localizationsDelegates: StringsLocalizations.localizationsDelegates,+ supportedLocales: StringsLocalizations.supportedLocales,+ home: Scaffold(+ body: Builder(+ builder: (context) => Align(+ alignment: Alignment.topLeft,+ child: carousel+ ? MagicRecommendation(result)+ : SearchResultWidget(+ result,+ onResultTap: () => open(context),+ ),+ ),+ ),+ ),+ ),);- expect(files, originalOrder);- }- await _disposeAlbum(tester);- });+ for (final removeOriginal in [false, true]) {+ await tester.pumpAndSettle();+ await tester.tap(find.byType(Hero));+ await tester.pumpAndSettle();+ await _expectCover(tester, original, count: 2);+ if (removeOriginal) {+ Bus.instance.fire(+ LocalPhotosUpdatedEvent(+ [original],+ type: carousel ? EventType.hide : EventType.deletedFromEverywhere,+ source: "test",+ ),+ );+ } else {+ await tester.tap(find.byTooltip("Sort"));+ await tester.pumpAndSettle();+ await tester.tap(find.text("Most recent"));+ }+ final cover = removeOriginal ? newest : original;+ await _expectCover(tester, cover, count: removeOriginal ? 1 : 2);+ expect(+ tester+ .widget<GalleryFilesState>(find.byType(GalleryFilesState))+ .galleryFiles,+ removeOriginal ? [newest] : [newest, original],+ );+ expect(+ find.byWidgetPredicate(+ (widget) =>+ widget is Hero && widget.tag == result.heroTag() + cover.tag,+ skipOffstage: false,+ ),+ findsNWidgets(2),+ );+ Navigator.of(tester.element(find.byType(MagicResultScreen))).pop();+ await tester.pump();+ await tester.pump(const Duration(milliseconds: 75));+ expect(+ find.byWidgetPredicate(+ (widget) => widget.runtimeType.toString() == "_CoverHeroFlight",+ ),+ findsOneWidget,+ );+ await tester.pumpAndSettle();+ }+ await tester.pump(const Duration(seconds: 4));+ await _disposeAlbum(tester);+ });+ }testWidgets("keeps interactive back when the album route fades", (tester,