Skip to content
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

fix(mobile): #15182 Video memories no longer play #15210

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+31 −4
Open

fix(mobile): #15182 Video memories no longer play #15210

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83fe986
Update current asset to play video.
tomgquest Jan 10, 2025
792e11b
Updated location of currentAssetProvider update per feedback.
tomgquest Jan 10, 2025
c8c4bde
Added a playbackDelayFactor to the video viewer to resolve an issue i…
tomgquest Jan 16, 2025
9a69ff6
Merge branch 'main' into fix/15182-video-memories-no-longer-play
alextran1502 Jan 31, 2025
ca7700b
Merge branch 'main' into fix/15182-video-memories-no-longer-play
alextran1502 Feb 2, 2025
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
19 changes: 18 additions & 1 deletion mobile/lib/pages/photos/memory.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/models/memories/memory.model.dart';
import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
import 'package:immich_mobile/widgets/common/immich_image.dart';
import 'package:immich_mobile/widgets/memories/memory_bottom_info.dart';
Expand All @@ -13,6 +15,7 @@ import 'package:immich_mobile/widgets/memories/memory_epilogue.dart';
import 'package:immich_mobile/widgets/memories/memory_progress_indicator.dart';

@RoutePage()
/// Expects [currentAssetProvider] to be set before navigating to this page
class MemoryPage extends HookConsumerWidget {
final List<Memory> memories;
final int memoryIndex;
Expand Down Expand Up @@ -125,8 +128,15 @@ class MemoryPage extends HookConsumerWidget {
);
}

// Precache the next page right away if we are on the first page
// Precache the next page and set the current asset right away if we are on the first page
if (currentAssetPage.value == 0) {
Future.delayed(const Duration(milliseconds: 1)).then((_) {
final asset = currentMemory.value.assets[0];
ref.read(currentAssetProvider.notifier).set(asset);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current asset should be set before this page is being built. Setting it in a future on the page itself is hacky.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but where would you recommend? This is really the earliest place it can be done that makes sense since we don't know the asset prior to this point (I believe - I'm still getting used to the code-base and Flutter).

I tried doing it in a useEffect, but Flutter doesn't like that. I used a future because we do the same already for caching the "next" asset (and Flutter actually suggested I use a Future when I tried it in useEffect).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can set it before pushing the route here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I like setting it before the asset is current in a tap action, but 🤷

Done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's what the Riverpod dev recommends; it avoids rebuilding the widget one frame after it's built and means the widget can assume the current asset is set without having to bootstrap itself.

if (asset.isVideo || asset.isMotionPhoto) {
ref.read(videoPlaybackValueProvider.notifier).reset();
}
});
Future.delayed(const Duration(milliseconds: 200))
.then((_) => precacheAsset(1));
}
Expand All @@ -135,6 +145,13 @@ class MemoryPage extends HookConsumerWidget {
ref.read(hapticFeedbackProvider.notifier).selectionClick();
currentAssetPage.value = otherIndex;
updateProgressText();

final asset = currentMemory.value.assets[otherIndex];
ref.read(currentAssetProvider.notifier).set(asset);
if (asset.isVideo || asset.isMotionPhoto) {
ref.read(videoPlaybackValueProvider.notifier).reset();
}

// Wait for page change animation to finish
await Future.delayed(const Duration(milliseconds: 400));
// And then precache the next asset
Expand Down
Loading