From af36eaa61bfffe5f83b47877c5a66feb66dd2492 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 22 Apr 2025 10:51:20 -0500
Subject: [PATCH] fix(mobile): video player initialization (#17778)
* fix(mobile): video player initialization
* nit
---
mobile/lib/pages/common/gallery_viewer.page.dart | 11 +++++++----
mobile/lib/widgets/common/immich_logo.dart | 13 +++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mobile/lib/pages/common/gallery_viewer.page.dart b/mobile/lib/pages/common/gallery_viewer.page.dart
index 7392a4d340..420b699730 100644
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -63,9 +63,12 @@ class GalleryViewerPage extends HookConsumerWidget {
final loadAsset = renderList.loadAsset;
final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);
- // This key is to prevent the video player from being re-initialized during
- // hero animation or device rotation.
- final videoPlayerKey = useMemoized(() => GlobalKey());
+ final videoPlayerKeys = useRef<Map<int, GlobalKey>>({});
+
+ GlobalKey getVideoPlayerKey(int id) {
+ videoPlayerKeys.value.putIfAbsent(id, () => GlobalKey());
+ return videoPlayerKeys.value[id]!;
+ }
Future<void> precacheNextImage(int index) async {
if (!context.mounted) {
@@ -243,7 +246,7 @@ class GalleryViewerPage extends HookConsumerWidget {
width: context.width,
height: context.height,
child: NativeVideoViewerPage(
- key: videoPlayerKey,
+ key: getVideoPlayerKey(asset.id),
asset: asset,
image: Image(
key: ValueKey(asset),
diff --git a/mobile/lib/widgets/common/immich_logo.dart b/mobile/lib/widgets/common/immich_logo.dart
index 9f7725aa12..43987878cb 100644
--- a/mobile/lib/widgets/common/immich_logo.dart
+++ b/mobile/lib/widgets/common/immich_logo.dart
@@ -12,14 +12,11 @@ class ImmichLogo extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return Hero(
- tag: heroTag,
- child: Image(
- image: const AssetImage('assets/immich-logo.png'),
- width: size,
- filterQuality: FilterQuality.high,
- isAntiAlias: true,
- ),
+ return Image(
+ image: const AssetImage('assets/immich-logo.png'),
+ width: size,
+ filterQuality: FilterQuality.high,
+ isAntiAlias: true,
);
}
}