buttery hero animation for remote assets

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -473,10 +473,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     if (stackChildren != null && stackChildren.isNotEmpty) {
       asset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
     }
-    return Hero(
-      tag: '${asset.heroTag}_$heroOffset',
-      child: Thumbnail.fromBaseAsset(asset: asset, fit: BoxFit.contain),
-    );
+    return Thumbnail.fromBaseAsset(asset: asset, fit: BoxFit.contain);
   }
 
   void _onScaleStateChanged(PhotoViewScaleState scaleState) {

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -57,3 +57,25 @@ ImageProvider getThumbnailImageProvider({
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
     asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
+
+ImageInfo? getCachedImage(ImageProvider key) {
+  ImageInfo? thumbnail;
+  final ImageStreamCompleter? stream = PaintingBinding.instance.imageCache.putIfAbsent(
+    key,
+    () => throw Exception(), // don't bother loading if it isn't cacched
+  );
+
+  if (stream != null) {
+    void listener(ImageInfo info, bool synchronousCall) {
+      thumbnail = info;
+    }
+
+    try {
+      stream.addListener(ImageStreamListener(listener));
+    } finally {
+      stream.removeListener(ImageStreamListener(listener));
+    }
+  }
+
+  return thumbnail;
+}

mobile/lib/presentation/widgets/images/local_image_provider.dart

@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/infrastructure/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
 
 class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
@@ -65,29 +66,9 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
 
   @override
   ImageStreamCompleter loadImage(LocalFullImageProvider key, ImageDecoderCallback decode) {
-    ImageInfo? thumbnail;
-    final thumbnailProvider = LocalThumbProvider(id: key.id);
-
-    final ImageStreamCompleter? stream = PaintingBinding.instance.imageCache.putIfAbsent(
-      thumbnailProvider,
-      () => throw Exception(), // don't bother loading the thumbnail if it isn't cacched
-    );
-
-    if (stream != null) {
-      void listener(ImageInfo info, bool synchronousCall) {
-        thumbnail = info;
-      }
-
-      try {
-        stream.addListener(ImageStreamListener(listener));
-      } finally {
-        stream.removeListener(ImageStreamListener(listener));
-      }
-    }
-
     return OneFramePlaceholderImageStreamCompleter(
       _codec(key, decode),
-      initialImage: thumbnail,
+      initialImage: getCachedImage(LocalThumbProvider(id: key.id)),
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Id', key.id),
@@ -96,14 +77,14 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
     );
   }
 
-  Future<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async {
+  Stream<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
     final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
     final codec = await _assetMediaRepository.getLocalThumbnail(
       key.id,
       Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
     );
     final frame = await codec.getNextFrame();
-    return ImageInfo(image: frame.image, scale: 1.0);
+    yield ImageInfo(image: frame.image, scale: 1.0);
   }
 
   @override

mobile/lib/presentation/widgets/images/one_frame_multi_image_stream_completer.dart

@@ -15,12 +15,12 @@ class OneFramePlaceholderImageStreamCompleter extends ImageStreamCompleter {
   /// should be the primary image to display. The [initialImage] is an optional
   /// image that will be emitted synchronously, useful as a thumbnail or placeholder.
   OneFramePlaceholderImageStreamCompleter(
-    Future<ImageInfo> image, {
+    Stream<ImageInfo> image, {
     ImageInfo? initialImage,
     InformationCollector? informationCollector,
   }) {
     _initialImage = initialImage;
-    image.then<void>(
+    image.listen(
       setImage,
       onError: (Object error, StackTrace stack) {
         reportError(

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -1,12 +1,13 @@
 import 'dart:async';
 import 'dart:ui';
 
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
 import 'package:immich_mobile/providers/image/cache/image_loader.dart';
 import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
@@ -25,11 +26,9 @@ class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
   @override
   ImageStreamCompleter loadImage(RemoteThumbProvider key, ImageDecoderCallback decode) {
     final cache = cacheManager ?? RemoteImageCacheManager();
-    final chunkController = StreamController<ImageChunkEvent>();
     return MultiFrameImageStreamCompleter(
-      codec: _codec(key, cache, decode, chunkController),
+      codec: _codec(key, cache, decode),
       scale: 1.0,
-      chunkEvents: chunkController.stream,
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Asset Id', key.assetId),
@@ -37,20 +36,10 @@ class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
     );
   }
 
-  Future<Codec> _codec(
-    RemoteThumbProvider key,
-    CacheManager cache,
-    ImageDecoderCallback decode,
-    StreamController<ImageChunkEvent> chunkController,
-  ) async {
+  Future<Codec> _codec(RemoteThumbProvider key, CacheManager cache, ImageDecoderCallback decode) async {
     final preview = getThumbnailUrlForRemoteId(key.assetId);
 
-    return ImageLoader.loadImageFromCache(
-      preview,
-      cache: cache,
-      decode: decode,
-      chunkEvents: chunkController,
-    ).whenComplete(chunkController.close);
+    return ImageLoader.loadImageFromCache(preview, cache: cache, decode: decode);
   }
 
   @override
@@ -81,36 +70,39 @@ class RemoteFullImageProvider extends ImageProvider<RemoteFullImageProvider> {
   @override
   ImageStreamCompleter loadImage(RemoteFullImageProvider key, ImageDecoderCallback decode) {
     final cache = cacheManager ?? RemoteImageCacheManager();
-    final chunkEvents = StreamController<ImageChunkEvent>();
-    return MultiImageStreamCompleter(
-      codec: _codec(key, cache, decode, chunkEvents),
-      scale: 1.0,
-      chunkEvents: chunkEvents.stream,
+    return OneFramePlaceholderImageStreamCompleter(
+      _codec(key, cache, decode),
+      initialImage: getCachedImage(RemoteThumbProvider(assetId: assetId)),
+      informationCollector: () => <DiagnosticsNode>[
+        DiagnosticsProperty<ImageProvider>('Image provider', this),
+        DiagnosticsProperty<String>('Asset Id', key.assetId),
+      ],
     );
   }
 
-  Stream<Codec> _codec(
-    RemoteFullImageProvider key,
-    CacheManager cache,
-    ImageDecoderCallback decode,
-    StreamController<ImageChunkEvent> chunkController,
-  ) async* {
-    yield await ImageLoader.loadImageFromCache(
-      getPreviewUrlForRemoteId(key.assetId),
-      cache: cache,
-      decode: decode,
-      chunkEvents: chunkController,
-    );
+  Stream<ImageInfo> _codec(RemoteFullImageProvider key, CacheManager cache, ImageDecoderCallback decode) async* {
+    ImageInfo? imageInfo;
+    final originalImageFuture = AppSetting.get(Setting.loadOriginal)
+        ? ImageLoader.loadImageFromCache(
+            getOriginalUrlForRemoteId(key.assetId),
+            cache: cache,
+            decode: decode,
+          ).then((image) => image.getNextFrame()).then((frame) => imageInfo = ImageInfo(image: frame.image, scale: 1.0))
+        : null;
 
-    if (AppSetting.get(Setting.loadOriginal)) {
-      yield await ImageLoader.loadImageFromCache(
-        getOriginalUrlForRemoteId(key.assetId),
-        cache: cache,
-        decode: decode,
-        chunkEvents: chunkController,
-      );
+    final previewImageFuture =
+        ImageLoader.loadImageFromCache(getPreviewUrlForRemoteId(key.assetId), cache: cache, decode: decode)
+            .then((image) async => imageInfo == null ? await image.getNextFrame() : null)
+            .then((frame) => imageInfo == null ? ImageInfo(image: frame!.image, scale: 1.0) : null);
+
+    final previewImage = await previewImageFuture;
+    if (previewImage != null) {
+      yield previewImage;
+    }
+
+    if (originalImageFuture != null) {
+      yield await originalImageFuture;
     }
-    await chunkController.close();
   }
 
   @override