Skip to content

feat(mobile): enable local motion photo playback #27004

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
dnplkndll wants to merge 1 commit into from
Closed

feat(mobile): enable local motion photo playback #27004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions mobile/lib/domain/models/asset/base_asset.model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ sealed class BaseAsset {
bool get isImage => type == AssetType.image;
bool get isVideo => type == AssetType.video;

bool get isMotionPhoto => livePhotoVideoId != null;
/// True for remote assets with a paired live-photo video ([livePhotoVideoId] != null)
/// and for local assets whose playback style was resolved to [AssetPlaybackStyle.livePhoto].
bool get isMotionPhoto => playbackStyle == AssetPlaybackStyle.livePhoto;
bool get isAnimatedImage => playbackStyle == AssetPlaybackStyle.imageAnimated;

AssetPlaybackStyle get playbackStyle {
if (isVideo) return AssetPlaybackStyle.video;
if (isMotionPhoto) return AssetPlaybackStyle.livePhoto;
if (livePhotoVideoId != null) return AssetPlaybackStyle.livePhoto;
if (isImage && durationInSeconds != null && durationInSeconds! > 0) return AssetPlaybackStyle.imageAnimated;
if (isImage) return AssetPlaybackStyle.image;
return AssetPlaybackStyle.unknown;
Expand Down
24 changes: 8 additions & 16 deletions mobile/lib/infrastructure/repositories/storage.repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class StorageRepository {

Future<File?> getFileForAsset(String assetId) async {
File? file;
final log = Logger('StorageRepository');

try {
final entity = await AssetEntity.fromId(assetId);
Expand All @@ -34,37 +33,32 @@ class StorageRepository {
}

Future<File?> getMotionFileForAsset(LocalAsset asset) async {
return getMotionFileById(asset.id);
}

Future<File?> getMotionFileById(String assetId) async {
File? file;
final log = Logger('StorageRepository');

try {
final entity = await AssetEntity.fromId(asset.id);
final entity = await AssetEntity.fromId(assetId);
file = await entity?.originFileWithSubtype;
if (file == null) {
log.warning(
"Cannot get motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
);
log.warning("Cannot get motion file for asset $assetId");
return null;
}

final exists = await file.exists();
if (!exists) {
log.warning("Motion file for asset ${asset.id} does not exist");
log.warning("Motion file for asset $assetId does not exist");
return null;
}
} catch (error, stackTrace) {
log.warning(
"Error getting motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
error,
stackTrace,
);
log.warning("Error getting motion file for asset $assetId", error, stackTrace);
}
return file;
}

Future<AssetEntity?> getAssetEntityForAsset(LocalAsset asset) async {
final log = Logger('StorageRepository');

AssetEntity? entity;

try {
Expand Down Expand Up @@ -130,8 +124,6 @@ class StorageRepository {
}

Future<void> clearCache() async {
final log = Logger('StorageRepository');

try {
await PhotoManager.clearFileCache();
} catch (error, stackTrace) {
Expand Down
8 changes: 6 additions & 2 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
@@ -1,4 +1,5 @@
import 'dart:async';
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
Expand Down Expand Up @@ -100,9 +101,12 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
if (!mounted) return null;

try {
if (videoAsset.hasLocal && videoAsset.livePhotoVideoId == null) {
if (videoAsset.hasLocal) {
final id = videoAsset is LocalAsset ? videoAsset.id : (videoAsset as RemoteAsset).localId!;
final file = await StorageRepository().getFileForAsset(id);
File? file = videoAsset.isMotionPhoto
? await StorageRepository().getMotionFileById(id)
: await StorageRepository().getFileForAsset(id);

if (!mounted) return null;

if (file == null) {
Expand Down
4 changes: 1 addition & 3 deletions mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,6 @@ class _AssetTypeIcons extends StatelessWidget {
@override
Widget build(BuildContext context) {
final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
final isLivePhoto = asset is RemoteAsset && asset.livePhotoVideoId != null;

return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end,
Expand All @@ -300,7 +298,7 @@ class _AssetTypeIcons extends StatelessWidget {
padding: EdgeInsets.only(right: 10.0, top: 6.0),
child: _TileOverlayIcon(Icons.burst_mode_rounded),
),
if (isLivePhoto)
if (asset.isMotionPhoto)
const Padding(
padding: EdgeInsets.only(right: 10.0, top: 6.0),
child: _TileOverlayIcon(Icons.motion_photos_on_rounded),
Expand Down
Loading