buttery hero animations

This commit is contained in:
mertalev 2025-08-01 18:35:40 -04:00
parent c48bd2091c
commit fa3a064099
No known key found for this signature in database
GPG Key ID: DF6ABC77AAD98C95
5 changed files with 45 additions and 14 deletions

View File

@ -1,3 +1,5 @@
import 'dart:ui';
const int noDbId = -9223372036854775808; // from Isar const int noDbId = -9223372036854775808; // from Isar
const double downloadCompleted = -1; const double downloadCompleted = -1;
const double downloadFailed = -2; const double downloadFailed = -2;
@ -28,8 +30,8 @@ const String kDownloadGroupLivePhoto = 'group_livephoto';
const int kTimelineNoneSegmentSize = 120; const int kTimelineNoneSegmentSize = 120;
const int kTimelineAssetLoadBatchSize = 1024; const int kTimelineAssetLoadBatchSize = 1024;
const int kTimelineAssetLoadOppositeSize = 64; const int kTimelineAssetLoadOppositeSize = 64;
const double kTimelineThumbnailTileSize = 256.0; const Size kTimelineThumbnailTileSize = Size.square(256.0);
const double kTimelineThumbnailSize = 384.0; const Size kTimelineThumbnailSize = Size.square(384.0);
const int kTimelineImageCacheMemory = 250 * 1024 * 1024; const int kTimelineImageCacheMemory = 250 * 1024 * 1024;
// Widget keys // Widget keys

View File

@ -472,10 +472,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
if (stackChildren != null && stackChildren.isNotEmpty) { if (stackChildren != null && stackChildren.isNotEmpty) {
asset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex))); asset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
} }
return Container( return Hero(
width: double.infinity, tag: '${asset.heroTag}_$heroOffset',
height: double.infinity,
color: backgroundColor,
child: Thumbnail.fromBaseAsset(asset: asset, fit: BoxFit.contain), child: Thumbnail.fromBaseAsset(asset: asset, fit: BoxFit.contain),
); );
} }

View File

@ -3,7 +3,9 @@ import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.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/infrastructure/repositories/asset_media.repository.dart';
import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
class LocalThumbProvider extends ImageProvider<LocalThumbProvider> { class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
static const _assetMediaRepository = AssetMediaRepository(); static const _assetMediaRepository = AssetMediaRepository();
@ -11,7 +13,7 @@ class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
final String id; final String id;
final Size size; final Size size;
const LocalThumbProvider({required this.id, required this.size}); const LocalThumbProvider({required this.id, this.size = kTimelineThumbnailSize});
@override @override
Future<LocalThumbProvider> obtainKey(ImageConfiguration configuration) { Future<LocalThumbProvider> obtainKey(ImageConfiguration configuration) {
@ -62,16 +64,45 @@ class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
@override @override
ImageStreamCompleter loadImage(LocalFullImageProvider key, ImageDecoderCallback decode) { ImageStreamCompleter loadImage(LocalFullImageProvider key, ImageDecoderCallback decode) {
return OneFrameImageStreamCompleter(_codec(key)); 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,
informationCollector: () => <DiagnosticsNode>[
DiagnosticsProperty<ImageProvider>('Image provider', this),
DiagnosticsProperty<String>('Id', key.id),
DiagnosticsProperty<Size>('Size', key.size),
],
);
} }
Future<ImageInfo> _codec(LocalFullImageProvider key) async { Future<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async {
final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio; final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
final codec = await _assetMediaRepository.getLocalThumbnail( final codec = await _assetMediaRepository.getLocalThumbnail(
key.id, key.id,
Size(size.width * devicePixelRatio, size.height * devicePixelRatio), Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
); );
return ImageInfo(image: (await codec.getNextFrame()).image, scale: 1.0); final frame = await codec.getNextFrame();
return ImageInfo(image: frame.image, scale: 1.0);
} }
@override @override

View File

@ -29,7 +29,7 @@ class Thumbnail extends StatefulWidget {
const Thumbnail({ const Thumbnail({
this.imageProvider, this.imageProvider,
this.fit = BoxFit.cover, this.fit = BoxFit.cover,
this.size = const ui.Size.square(kTimelineThumbnailSize), this.size = kTimelineThumbnailSize,
this.blurhash, this.blurhash,
this.thumbhashMode = ThumbhashMode.enabled, this.thumbhashMode = ThumbhashMode.enabled,
super.key, super.key,
@ -38,7 +38,7 @@ class Thumbnail extends StatefulWidget {
Thumbnail.fromAsset({ Thumbnail.fromAsset({
required Asset asset, required Asset asset,
this.fit = BoxFit.cover, this.fit = BoxFit.cover,
this.size = const ui.Size.square(kTimelineThumbnailSize), this.size = kTimelineThumbnailSize,
this.thumbhashMode = ThumbhashMode.enabled, this.thumbhashMode = ThumbhashMode.enabled,
super.key, super.key,
}) : blurhash = asset.thumbhash, }) : blurhash = asset.thumbhash,
@ -47,7 +47,7 @@ class Thumbnail extends StatefulWidget {
Thumbnail.fromBaseAsset({ Thumbnail.fromBaseAsset({
required BaseAsset? asset, required BaseAsset? asset,
this.fit = BoxFit.cover, this.fit = BoxFit.cover,
this.size = const ui.Size.square(kTimelineThumbnailSize), this.size = kTimelineThumbnailSize,
this.thumbhashMode = ThumbhashMode.enabled, this.thumbhashMode = ThumbhashMode.enabled,
super.key, super.key,
}) : blurhash = switch (asset) { }) : blurhash = switch (asset) {

View File

@ -15,7 +15,7 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
class ThumbnailTile extends ConsumerWidget { class ThumbnailTile extends ConsumerWidget {
const ThumbnailTile( const ThumbnailTile(
this.asset, { this.asset, {
this.size = const Size.square(kTimelineThumbnailTileSize), this.size = kTimelineThumbnailTileSize,
this.fit = BoxFit.cover, this.fit = BoxFit.cover,
this.showStorageIndicator, this.showStorageIndicator,
this.lockSelection = false, this.lockSelection = false,