π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Let thumbnail fallback replace the Hero snapshot
r4khul2de714a950a4
diff --git a/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dart b/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dartindex 756db8946f..950ac78562 100644--- a/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/image_zoom/image_zoom_viewer.dart@@ -92,6 +92,7 @@ class ImageZoomViewer extends StatefulWidget {final FilterQuality filterQuality;final bool gaplessPlayback;final bool gesturesEnabled;+ final bool useHeroImageAsPlaceholder;final ImageZoomLoadingBuilder? loadingBuilder;final ImageErrorWidgetBuilder? errorBuilder;final String? semanticLabel;@@ -111,6 +112,7 @@ class ImageZoomViewer extends StatefulWidget {this.filterQuality = FilterQuality.high,this.gaplessPlayback = true,this.gesturesEnabled = true,+ this.useHeroImageAsPlaceholder = true,this.loadingBuilder,this.errorBuilder,this.semanticLabel,@@ -726,7 +728,8 @@ class _ImageZoomViewerState extends State<ImageZoomViewer>semanticLabel: widget.semanticLabel,errorBuilder: widget.errorBuilder,);- } else if (_heroSource?.image != null) {+ } else if (widget.useHeroImageAsPlaceholder &&+ _heroSource?.image != null) {image = RawImage(image: _heroSource!.image, fit: BoxFit.fill);} else if (_imageError != null) {image =diff --git a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dartindex a6b60683b0..31958c057f 100644--- a/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/zoomable_image.dart@@ -229,6 +229,7 @@ class _ZoomableImageState extends State<ZoomableImage> {initialFit: widget.shouldCover ? BoxFit.cover : BoxFit.contain,// Collage already owns its transform with an outer InteractiveViewer.gesturesEnabled: !widget.shouldCover,+ useHeroImageAsPlaceholder: !_showingThumbnailFallback,onInteractionLockChanged: _onInteractionLockChanged,onImageFrameReady: () => _imageFrameReady.value = true,loadingBuilder: (context, event) {diff --git a/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dart b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dartindex 26a1050144..7e60fcbcd4 100644--- a/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dart+++ b/mobile/apps/photos/test/ui/viewer/file/image_zoom/image_zoom_viewer_test.dart@@ -175,6 +175,47 @@ void main() {);}+ testWidgets("an explicit thumbnail fallback replaces the Hero source", (+ tester,+ ) async {+ var showingThumbnailFallback = false;+ late StateSetter updateViewer;+ await tester.pumpWidget(+ MaterialApp(+ home: ImageHeroSource(+ tag: "photo",+ image: landscapeImage,+ child: StatefulBuilder(+ builder: (context, setState) {+ updateViewer = setState;+ return ImageZoomViewer(+ imageProvider: null,+ heroTag: "photo",+ useHeroImageAsPlaceholder: !showingThumbnailFallback,+ loadingBuilder: (_, _) =>+ const Text("Large thumbnail fallback"),+ );+ },+ ),+ ),+ ),+ );+ final heroState = tester.state(find.byType(Hero));+ expect(+ tester.widget<RawImage>(find.byType(RawImage)).image,+ landscapeImage,+ );+ expect(find.text("Large thumbnail fallback"), findsNothing);++ updateViewer(() => showingThumbnailFallback = true);+ await tester.pump();++ expect(find.text("Large thumbnail fallback"), findsOneWidget);+ expect(find.byType(RawImage), findsNothing);+ expect(tester.state(find.byType(Hero)), same(heroState));+ expect(tester.takeException(), isNull);+ });+testWidgets("a cold flight keeps its thumbnail mounted without duplicating it",(tester) async {