KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): improve hero animation (#3636)

Browse Source
This commit is contained in:
X
2023-08-10 21:38:49 +08:00
committed by GitHub
parent a8b01dc21a
commit e9b0840f01
3 changed files with 73 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart
View File

@@ -62,11 +62,17 @@ class ThumbnailImage extends HookConsumerWidget {
}
Widget buildImage(Asset asset) {
var image = ImmichImage(
asset,
var image = SizedBox(
width: 300,
height: 300,
child: Hero(
tag: asset.id + heroOffset,
child: ImmichImage(
asset,
useGrayBoxPlaceholder: useGrayBoxPlaceholder,
fit: BoxFit.cover,
),
),
);
if (!multiselectEnabled || !isSelected) {
return image;
@@ -114,8 +120,6 @@ class ThumbnailImage extends HookConsumerWidget {
onSelect?.call();
HapticFeedback.heavyImpact();
},
child: Hero(
tag: asset.id + heroOffset,
child: Stack(
children: [
Container(
@@ -181,7 +185,6 @@ class ThumbnailImage extends HookConsumerWidget {
),
],
),
),
);
}
}

15
mobile/lib/shared/ui/photo_view/photo_view_gallery.dart
View File

@@ -276,6 +276,7 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
filterQuality: pageOption.filterQuality,
basePosition: pageOption.basePosition,
disableGestures: pageOption.disableGestures,
heroAttributes: pageOption.heroAttributes,
child: pageOption.child,
)
: PhotoView(
@@ -306,21 +307,9 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
basePosition: pageOption.basePosition,
disableGestures: pageOption.disableGestures,
errorBuilder: pageOption.errorBuilder,
heroAttributes: pageOption.heroAttributes,
);
if (pageOption.heroAttributes != null) {
return Hero(
tag: pageOption.heroAttributes!.tag,
createRectTween: pageOption.heroAttributes!.createRectTween,
flightShuttleBuilder: pageOption.heroAttributes!.flightShuttleBuilder,
placeholderBuilder: pageOption.heroAttributes!.placeholderBuilder,
transitionOnUserGestures: pageOption.heroAttributes!.transitionOnUserGestures,
child: ClipRect(
child: photoView,
),
);
}
return ClipRect(
child: photoView,
);

2
mobile/lib/shared/ui/photo_view/src/core/photo_view_core.dart
View File

@@ -405,7 +405,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
gaplessPlayback: widget.gaplessPlayback ?? false,
filterQuality: widget.filterQuality,
width: scaleBoundaries.childSize.width * scale,
fit: BoxFit.contain,
fit: BoxFit.cover,
);
}
}