Skip to content

fix(mobile): prevent video freezing/restarting when toggling favorite #26448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
irisfield wants to merge 2 commits into from
Closed

fix(mobile): prevent video freezing/restarting when toggling favorite #26448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e7614b
fix(mobile): prevent video freezing or restarting when toggling favor…
irisfield Feb 22, 2026
cbc9549
stabilized video viewer keys
irisfield Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
}

return PhotoView.customChild(
key: ValueKey(displayAsset),
key: ValueKey((displayAsset.heroTag, '_video_gesture_layer')),
onDragStart: _onDragStart,
onDragUpdate: _onDragUpdate,
onDragEnd: _onDragEnd,
Expand All @@ -359,7 +359,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
enablePanAlways: true,
backgroundDecoration: backgroundDecoration,
child: NativeVideoViewer(
key: ValueKey(displayAsset),
key: ValueKey((displayAsset.heroTag, '_video_platform_view')),
asset: displayAsset,
scaleStateNotifier: _videoScaleStateNotifier,
disableScaleGestures: showingDetails,
Expand Down
19 changes: 15 additions & 4 deletions mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,21 @@ class NativeVideoViewer extends HookConsumerWidget {
}

ref.listen(currentAssetNotifier, (_, value) {
final isCurrent = _isCurrentAsset(asset, value);
// This is the same asset with different metadata (e.g. isFavorite changed), update the ref
if (value != null && value != asset && isCurrent) {
currentAsset.value = value;
isVisible.value = isCurrent;
return;
}

final playerController = controller.value;
if (playerController != null && value != asset) {
removeListeners(playerController);
}

if (value != null) {
isVisible.value = _isCurrentAsset(value, asset);
isVisible.value = isCurrent;
}
final curAsset = currentAsset.value;
if (curAsset == asset) {
Expand Down Expand Up @@ -423,17 +431,20 @@ class NativeVideoViewer extends HookConsumerWidget {
if (!isVisible.value || controller.value == null) Center(key: ValueKey(asset.heroTag), child: image),
if (aspectRatio.value != null && !isCasting && isCurrent)
Visibility.maintain(
key: ValueKey(asset),
key: ValueKey((asset.heroTag, '_video_layer')),
visible: isVisible.value,
child: PhotoView.customChild(
key: ValueKey(asset),
key: ValueKey((asset.heroTag, '_video_gesture_layer')),
enableRotation: false,
disableScaleGestures: disableScaleGestures,
// Transparent to avoid a black flash when viewer becomes visible but video isn't loaded yet.
backgroundDecoration: const BoxDecoration(color: Colors.transparent),
scaleStateChangedCallback: (state) => scaleStateNotifier?.value = state,
childSize: videoContextSize(aspectRatio.value, context),
child: NativeVideoPlayerView(key: ValueKey(asset), onViewReady: initController),
child: NativeVideoPlayerView(
key: ValueKey((asset.heroTag, '_video_platform_view')),
onViewReady: initController,
),
),
),
if (showControls) const Center(child: VideoViewerControls()),
Expand Down
Loading