Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Connect device album cover transitions from search

r4khulbbed51118442
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart
index 8fcb35fa46..5d98cbf1ad 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/device/device_folder_page.dart
@@ -27,8 +27,9 @@ import "package:photos/ui/viewer/gallery/state/selection_state.dart";
class DeviceFolderPage extends StatefulWidget {
final DeviceCollection deviceCollection;
+ final String? coverHeroTag;
- const DeviceFolderPage(this.deviceCollection, {super.key});
+ const DeviceFolderPage(this.deviceCollection, {this.coverHeroTag, super.key});
@override
State<DeviceFolderPage> createState() => _DeviceFolderPageState();
@@ -89,7 +90,8 @@ class _DeviceFolderPageState extends State<DeviceFolderPage> {
subtitle: _shouldBackup ? l10n.backedUpAutomatically : l10n.notBackedUp,
deviceCollection: widget.deviceCollection,
cover: _cover,
- coverHeroTag: "device_folder:${widget.deviceCollection.id}",
+ coverHeroTag:
+ widget.coverHeroTag ?? "device_folder:${widget.deviceCollection.id}",
isDeviceFolderBackedUp: _shouldBackup,
onDisableDeviceFolderBackup: () async {
await _updateBackupStatus(false);
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 3c8d9c4b80..48d280d329 100644
--- a/mobile/apps/photos/lib/ui/viewer/search/search_suggestions.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/search_suggestions.dart
@@ -250,7 +250,12 @@ class SearchResultsWidgetGenerator extends StatelessWidget {
showTypeLabel: showTypeLabel,
onResultTap: () => routeToPage(
context,
- DeviceFolderPage(deviceResult.deviceCollection),
+ DeviceFolderPage(
+ deviceResult.deviceCollection,
+ coverHeroTag:
+ result.heroTag() + (result.previewThumbnail()?.tag ?? ""),
+ ),
+ useFadeTransition: true,
),
);
} else if (result is GenericSearchResult) {