Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

feat(photos): add music to memories

ashilkn038703cb3d30
diff --git a/mobile/apps/photos/assets/memory-music/puddles-instrumental-01.mp3 b/mobile/apps/photos/assets/memory-music/puddles-instrumental-01.mp3
new file mode 100644
index 0000000000..f6ce0ecf67
Binary files /dev/null and b/mobile/apps/photos/assets/memory-music/puddles-instrumental-01.mp3 differ
diff --git a/mobile/apps/photos/assets/memory-music/puddles-instrumental-02.mp3 b/mobile/apps/photos/assets/memory-music/puddles-instrumental-02.mp3
new file mode 100644
index 0000000000..0fa1c6b995
Binary files /dev/null and b/mobile/apps/photos/assets/memory-music/puddles-instrumental-02.mp3 differ
diff --git a/mobile/apps/photos/assets/memory-music/puddles-instrumental-03.mp3 b/mobile/apps/photos/assets/memory-music/puddles-instrumental-03.mp3
new file mode 100644
index 0000000000..87cef4d144
Binary files /dev/null and b/mobile/apps/photos/assets/memory-music/puddles-instrumental-03.mp3 differ
diff --git a/mobile/apps/photos/changes/memories-music.md b/mobile/apps/photos/changes/memories-music.md
new file mode 100644
index 0000000000..0a305aefa2
--- /dev/null
+++ b/mobile/apps/photos/changes/memories-music.md
@@ -0,0 +1 @@
+- Added music and audio controls to memories.
diff --git a/mobile/apps/photos/lib/models/memories/clip_memory.dart b/mobile/apps/photos/lib/models/memories/clip_memory.dart
index 586b0e06a4..f00b636b93 100644
--- a/mobile/apps/photos/lib/models/memories/clip_memory.dart
+++ b/mobile/apps/photos/lib/models/memories/clip_memory.dart
@@ -366,9 +366,17 @@ class ClipMemory extends SmartMemory {
int firstDateToShow,
int lastDateToShow,
this.clipMemoryType, {
+ String? id,
super.firstCreationTime,
super.lastCreationTime,
- }) : super(memories, MemoryType.clip, '', firstDateToShow, lastDateToShow);
+ }) : super(
+ memories,
+ MemoryType.clip,
+ '',
+ firstDateToShow,
+ lastDateToShow,
+ id: id,
+ );
@override
String createTitle(StringsLocalizations locals, String languageCode) {
diff --git a/mobile/apps/photos/lib/models/memories/memory_music_track.dart b/mobile/apps/photos/lib/models/memories/memory_music_track.dart
new file mode 100644
index 0000000000..c87caa2976
--- /dev/null
+++ b/mobile/apps/photos/lib/models/memories/memory_music_track.dart
@@ -0,0 +1,23 @@
+class MemoryMusicTrack {
+ final String id;
+ final MemoryMusicSource source;
+ final String? title;
+ final String? artist;
+
+ const MemoryMusicTrack({
+ required this.id,
+ required this.source,
+ this.title,
+ this.artist,
+ });
+}
+
+sealed class MemoryMusicSource {
+ const MemoryMusicSource();
+}
+
+class AssetMemoryMusicSource extends MemoryMusicSource {
+ final String assetPath;
+
+ const AssetMemoryMusicSource(this.assetPath);
+}
diff --git a/mobile/apps/photos/lib/models/memories/memory_spec.dart b/mobile/apps/photos/lib/models/memories/memory_spec.dart
index 69e1487d79..85db7a30cb 100644
--- a/mobile/apps/photos/lib/models/memories/memory_spec.dart
+++ b/mobile/apps/photos/lib/models/memories/memory_spec.dart
@@ -272,6 +272,7 @@ class ClipMemorySpec extends MemorySpec {
firstDateToShow,
lastDateToShow,
clipMemoryType,
+ id: id,
);
clipMemory.title = title;
return clipMemory;
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart b/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart
new file mode 100644
index 0000000000..9cf2c820fc
--- /dev/null
+++ b/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart
@@ -0,0 +1,54 @@
+import "package:photos/models/memories/memory_music_track.dart";
+
+class MemoryMusicCatalog {
+ final List<MemoryMusicTrack> tracks;
+ late final Map<String, MemoryMusicTrack> _tracksByID;
+
+ MemoryMusicCatalog(Iterable<MemoryMusicTrack> tracks)
+ : tracks = List.unmodifiable(tracks) {
+ _tracksByID = <String, MemoryMusicTrack>{};
+ for (final track in this.tracks) {
+ if (track.id.isEmpty) {
+ throw ArgumentError.value(track.id, "track.id", "Must not be empty");
+ }
+ if (_tracksByID.containsKey(track.id)) {
+ throw ArgumentError.value(
+ track.id,
+ "track.id",
+ "Memory music track IDs must be unique",
+ );
+ }
+ _tracksByID[track.id] = track;
+ }
+ }
+
+ MemoryMusicTrack? trackForID(String id) => _tracksByID[id];
+
+ static final MemoryMusicCatalog bundled =
+ MemoryMusicCatalog(const <MemoryMusicTrack>[
+ MemoryMusicTrack(
+ id: "puddles-instrumental-segment-1",
+ source: AssetMemoryMusicSource(
+ "assets/memory-music/puddles-instrumental-01.mp3",
+ ),
+ title: "Puddles (Zero 7 Remix)",
+ artist: "Not for Radio",
+ ),
+ MemoryMusicTrack(
+ id: "puddles-instrumental-segment-2",
+ source: AssetMemoryMusicSource(
+ "assets/memory-music/puddles-instrumental-02.mp3",
+ ),
+ title: "Puddles (Zero 7 Remix)",
+ artist: "Not for Radio",
+ ),
+ MemoryMusicTrack(
+ id: "puddles-instrumental-segment-3",
+ source: AssetMemoryMusicSource(
+ "assets/memory-music/puddles-instrumental-03.mp3",
+ ),
+ title: "Puddles (Zero 7 Remix)",
+ artist: "Not for Radio",
+ ),
+ ]);
+}
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
new file mode 100644
index 0000000000..7555b490ee
--- /dev/null
+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
@@ -0,0 +1,196 @@
+import "dart:async";
+
+import "package:flutter/foundation.dart";
+import "package:logging/logging.dart";
+import "package:photos/services/memories/memory_music_catalog.dart";
+import "package:photos/services/memories/memory_music_source_loader.dart";
+
+enum _MemoryMusicPlaybackStatus { idle, loading, ready, failed }
+
+enum _MemoryMusicPauseReason { appBackground, viewerAction, videoItem }
+
+class MemoryMusicController extends ChangeNotifier {
+ final MemoryMusicCatalog _catalog;
+ final Map<String, String> _assignments;
+ final MemoryMusicPlayer _player;
+ final Future<void> Function(bool isMuted) _persistMuted;
+ final Logger _logger = Logger("MemoryMusicController");
+ final Set<_MemoryMusicPauseReason> _pauseReasons =
+ <_MemoryMusicPauseReason>{};
+
+ Future<void>? _audioSessionInitialization;
+
+ _MemoryMusicPlaybackStatus _status = _MemoryMusicPlaybackStatus.idle;
+ String? _activeMemoryID;
+ bool _isMuted;
+ bool _isDisposed = false;
+ int _loadGeneration = 0;
+
+ MemoryMusicController({
+ required MemoryMusicCatalog catalog,
+ required Map<String, String> assignments,
+ required bool initiallyMuted,
+ required Future<void> Function(bool isMuted) persistMuted,
+ MemoryMusicPlayer? player,
+ }) : _catalog = catalog,
+ _assignments = assignments,
+ _isMuted = initiallyMuted,
+ _persistMuted = persistMuted,
+ _player = player ?? JustAudioMemoryMusicPlayer();
+
+ bool get isMuted => _isMuted;
+
+ Future<void> activateMemory(
+ String memoryID, {
+ required bool currentItemIsVideo,
+ }) async {
+ if (_isDisposed) return;
+
+ final sameMemory = _activeMemoryID == memoryID;
+ _activeMemoryID = memoryID;
+ _setPauseReason(_MemoryMusicPauseReason.videoItem, currentItemIsVideo);
+ if (sameMemory &&
+ (_status == _MemoryMusicPlaybackStatus.ready ||
+ _status == _MemoryMusicPlaybackStatus.loading)) {
+ await _synchronizePlayback();
+ return;
+ }
+
+ final trackID = _assignments[memoryID];
+ final track = trackID == null ? null : _catalog.trackForID(trackID);
+ final generation = ++_loadGeneration;
+ if (track == null) {
+ _status = _MemoryMusicPlaybackStatus.idle;
+ await _player.stop();
+ return;
+ }
+
+ _status = _MemoryMusicPlaybackStatus.loading;
+ try {
+ await _ensureAudioSessionInitialized();
+ if (!_isCurrentLoad(generation)) return;
+ await _player.stop();
+ if (!_isCurrentLoad(generation)) return;
+ await const MemoryMusicSourceLoader().load(_player, track.source);
+ if (!_isCurrentLoad(generation)) return;
+ await _player.setLooping();
+ await _player.setVolume(_isMuted ? 0.0 : 1.0);
+ if (!_isCurrentLoad(generation)) return;
+ _status = _MemoryMusicPlaybackStatus.ready;
+ await _synchronizePlayback();
+ } catch (error, stackTrace) {
+ if (!_isCurrentLoad(generation)) return;
+ _status = _MemoryMusicPlaybackStatus.failed;
+ _logger.warning(
+ "Failed to load memory music track ${track.id}",
+ error,
+ stackTrace,
+ );
+ }
+ }
+
+ Future<void> setCurrentItem({
+ required String memoryID,
+ required bool isVideo,
+ }) async {
+ if (_isDisposed || memoryID != _activeMemoryID) return;
+ if (_setPauseReason(_MemoryMusicPauseReason.videoItem, isVideo)) {
+ await _synchronizePlayback();
+ }
+ }
+
+ Future<void> setMuted(bool value) async {
+ if (_isDisposed || _isMuted == value) return;
+ _isMuted = value;
+ notifyListeners();
+ try {
+ await _player.setVolume(value ? 0.0 : 1.0);
+ } catch (error, stackTrace) {
+ _logger.fine("Failed to update memories music volume", error, stackTrace);
+ }
+ try {
+ await _persistMuted(value);
+ } catch (error, stackTrace) {
+ _logger.warning(
+ "Failed to persist memories audio mute state",
+ error,
+ stackTrace,
+ );
+ }
+ }
+
+ Future<void> toggleMuted() => setMuted(!_isMuted);
+
+ Future<void> setAppActive(bool isActive) async {
+ if (_setPauseReason(_MemoryMusicPauseReason.appBackground, !isActive)) {
+ await _synchronizePlayback();
+ }
+ }
+
+ Future<void> setViewerActionPaused(bool isPaused) async {
+ if (_setPauseReason(_MemoryMusicPauseReason.viewerAction, isPaused)) {
+ await _synchronizePlayback();
+ }
+ }
+
+ bool _setPauseReason(_MemoryMusicPauseReason reason, bool shouldPause) {
+ return shouldPause
+ ? _pauseReasons.add(reason)
+ : _pauseReasons.remove(reason);
+ }
+
+ Future<void> _synchronizePlayback() async {
+ if (_isDisposed) return;
+ final shouldPlay =
+ _status == _MemoryMusicPlaybackStatus.ready && _pauseReasons.isEmpty;
+ try {
+ if (shouldPlay) {
+ unawaited(
+ _player.play().catchError((Object error, StackTrace stackTrace) {
+ if (_isDisposed) return;
+ _logger.fine(
+ "Failed to start memory music playback",
+ error,
+ stackTrace,
+ );
+ }),
+ );
+ } else {
+ await _player.pause();
+ }
+ } catch (error, stackTrace) {
+ if (_isDisposed) return;
+ _logger.fine(
+ "Failed to synchronize memory music playback",
+ error,
+ stackTrace,
+ );
+ }
+ }
+
+ Future<void> _ensureAudioSessionInitialized() =>
+ _audioSessionInitialization ??= _initializeAudioSession();
+
+ Future<void> _initializeAudioSession() async {
+ try {
+ await _player.configureAudioSession();
+ } catch (error, stackTrace) {
+ _logger.fine(
+ "Failed to configure the memory music audio session",
+ error,
+ stackTrace,
+ );
+ }
+ }
+
+ bool _isCurrentLoad(int generation) =>
+ !_isDisposed && generation == _loadGeneration;
+
+ @override
+ void dispose() {
+ _isDisposed = true;
+ _loadGeneration++;
+ unawaited(_player.dispose());
+ super.dispose();
+ }
+}
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_selector.dart b/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
new file mode 100644
index 0000000000..1f8b0719c0
--- /dev/null
+++ b/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
@@ -0,0 +1,37 @@
+import "dart:convert";
+
+import "package:crypto/crypto.dart";
+import "package:photos/models/memories/memory_music_track.dart";
+
+class MemoryMusicSelector {
+ const MemoryMusicSelector();
+
+ Map<String, String> assignTracks({
+ required Iterable<String> memoryIDs,
+ required List<MemoryMusicTrack> tracks,
+ }) {
+ if (tracks.isEmpty) return const <String, String>{};
+
+ final assignments = <String, String>{};
+ String? previousTrackID;
+ for (final memoryID in memoryIDs) {
+ var trackIndex = _stableTrackIndex(memoryID, tracks.length);
+ if (tracks.length > 1 && tracks[trackIndex].id == previousTrackID) {
+ trackIndex = (trackIndex + 1) % tracks.length;
+ }
+ final trackID = tracks[trackIndex].id;
+ assignments[memoryID] = trackID;
+ previousTrackID = trackID;
+ }
+ return Map.unmodifiable(assignments);
+ }
+
+ int _stableTrackIndex(String memoryID, int trackCount) {
+ final bytes = sha256.convert(utf8.encode(memoryID)).bytes;
+ var value = 0;
+ for (var i = 0; i < 8; i++) {
+ value = (value << 8) | bytes[i];
+ }
+ return value % trackCount;
+ }
+}
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_source_loader.dart b/mobile/apps/photos/lib/services/memories/memory_music_source_loader.dart
new file mode 100644
index 0000000000..0d3a82e069
--- /dev/null
+++ b/mobile/apps/photos/lib/services/memories/memory_music_source_loader.dart
@@ -0,0 +1,67 @@
+import "package:audio_session/audio_session.dart";
+import "package:just_audio/just_audio.dart";
+import "package:photos/models/memories/memory_music_track.dart";
+
+abstract interface class MemoryMusicPlayer {
+ Future<void> configureAudioSession();
+
+ Future<void> loadAsset(String assetPath);
+
+ Future<void> setLooping();
+
+ Future<void> setVolume(double volume);
+
+ Future<void> play();
+
+ Future<void> pause();
+
+ Future<void> stop();
+
+ Future<void> dispose();
+}
+
+class MemoryMusicSourceLoader {
+ const MemoryMusicSourceLoader();
+
+ Future<void> load(MemoryMusicPlayer player, MemoryMusicSource source) async {
+ switch (source) {
+ case AssetMemoryMusicSource(:final assetPath):
+ await player.loadAsset(assetPath);
+ }
+ }
+}
+
+class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
+ final AudioPlayer _player;
+
+ JustAudioMemoryMusicPlayer() : _player = AudioPlayer();
+
+ @override
+ Future<void> configureAudioSession() async {
+ final session = await AudioSession.instance;
+ await session.configure(const AudioSessionConfiguration.music());
+ }
+
+ @override
+ Future<void> loadAsset(String assetPath) async {
+ await _player.setAsset(assetPath, preload: true);
+ }
+
+ @override
+ Future<void> setLooping() => _player.setLoopMode(LoopMode.one);
+
+ @override
+ Future<void> setVolume(double volume) => _player.setVolume(volume);
+
+ @override
+ Future<void> play() => _player.play();
+
+ @override
+ Future<void> pause() => _player.pause();
+
+ @override
+ Future<void> stop() => _player.stop();
+
+ @override
+ Future<void> dispose() => _player.dispose();
+}
diff --git a/mobile/apps/photos/lib/services/memories/photo_selector.dart b/mobile/apps/photos/lib/services/memories/photo_selector.dart
index 03f85ef7c4..3aff76dfa0 100644
--- a/mobile/apps/photos/lib/services/memories/photo_selector.dart
+++ b/mobile/apps/photos/lib/services/memories/photo_selector.dart
@@ -5,6 +5,7 @@ import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:flutter/foundation.dart" show kDebugMode;
import "package:ml_linalg/vector.dart";
import "package:photos/models/file/file.dart";
+import "package:photos/models/file/file_type.dart";
import "package:photos/models/memories/memory.dart";
import "package:photos/models/ml/face/face_with_embedding.dart";
import "package:photos/models/ml/vector.dart";
@@ -102,15 +103,18 @@ class PhotoSelector {
/// Selects up to [config.targetSize] memories from [memories], applying the
/// distribution, filtering, picking and sorting strategies in [config].
///
- /// Returns [memories] unchanged if the list is already small enough.
+ /// Skips scoring when [memories] is already small enough.
static Future<List<Memory>> select(
List<Memory> memories,
SelectionConfig config,
) async {
- if (memories.length < config.targetSize) return memories;
+ final candidates = List<Memory>.from(memories);
+ if (memories.length < config.targetSize) {
+ return includeVideos(memories, candidates, config.targetSize);
+ }
if (memories.length == config.targetSize &&
config.distribution != SelectionDistribution.yearRoundRobin) {
- return memories;
+ return includeVideos(memories, candidates, config.targetSize);
}
final List<Memory> result;
@@ -123,7 +127,11 @@ class PhotoSelector {
result = _selectYearRoundRobin(memories, config);
}
- return _sortResult(result, config.sort);
+ return includeVideos(
+ _sortResult(result, config.sort),
+ candidates,
+ config.targetSize,
+ );
}
// -----------------------------------------------------------------------
@@ -539,6 +547,50 @@ class PhotoSelector {
return memories;
}
+ /// Adds videos from [candidates] to [selected] while retaining a photo.
+ /// Two videos are placed together so video-to-video playback is exercised.
+ static List<Memory> includeVideos(
+ List<Memory> selected,
+ List<Memory> candidates,
+ int targetSize,
+ ) {
+ bool isPhoto(Memory memory) =>
+ memory.file.fileType == FileType.image ||
+ memory.file.fileType == FileType.livePhoto;
+
+ final videos =
+ candidates.where((m) => m.file.fileType == FileType.video).toList()
+ ..shuffle();
+ final photos = candidates.where(isPhoto);
+ if (videos.isEmpty || photos.isEmpty || targetSize < 2) return selected;
+
+ final requiredVideoCount = videos.length > 1 && targetSize > 2 ? 2 : 1;
+ final requiredVideos = videos.take(requiredVideoCount).toList();
+ final requiredPhoto = selected.firstWhere(
+ isPhoto,
+ orElse: () => photos.first,
+ );
+ final required = [...requiredVideos, requiredPhoto];
+ final result = List<Memory>.from(selected);
+
+ for (final memory in required) {
+ if (result.contains(memory)) continue;
+ if (result.length >= targetSize) {
+ result.removeAt(result.lastIndexWhere((m) => !required.contains(m)));
+ }
+ result.add(memory);
+ }
+
+ if (requiredVideos.length == 2) {
+ result.remove(requiredVideos.last);
+ result.insert(
+ result.indexOf(requiredVideos.first) + 1,
+ requiredVideos.last,
+ );
+ }
+ return result;
+ }
+
// -----------------------------------------------------------------------
// Legacy entry points (delegate to select())
// -----------------------------------------------------------------------
@@ -554,7 +606,9 @@ class PhotoSelector {
try {
final w = (kDebugMode ? EnteWatch('getPeopleResults') : null)?..start();
final int targetSize = prefferedSize ?? 10;
- if (memories.length <= targetSize) return memories;
+ if (memories.length <= targetSize) {
+ return includeVideos(memories, memories, targetSize);
+ }
// Pre-compute nostalgia scores.
final Map<int, double> scores = {};
@@ -615,15 +669,18 @@ class PhotoSelector {
}) async {
final fileCount = memories.length;
int targetSize = prefferedSize ?? 10;
- if (fileCount <= targetSize) return memories;
+ if (fileCount <= targetSize) {
+ return includeVideos(memories, memories, targetSize);
+ }
if (!mlEnabled) {
- return _bestSelectionNoMl(
+ final result = _bestSelectionNoMl(
memories,
targetSize: targetSize,
isLocalGalleryMode: isLocalGalleryMode,
distributionOverride: distributionOverride,
);
+ return includeVideos(result, memories, targetSize);
}
// Pre-compute combined score: face count * 1000 + CLIP nostalgia.
@@ -695,7 +752,9 @@ class PhotoSelector {
// Multiple years: adjust target size for many years.
if (prefferedSize == null && (allYears.length * 2) > 10) {
targetSize = allYears.length * 3;
- if (fileCount < targetSize) return memories;
+ if (fileCount < targetSize) {
+ return includeVideos(memories, memories, targetSize);
+ }
}
return select(
diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dart
index 8bc184bbba..5503dc2311 100644
--- a/mobile/apps/photos/lib/services/memories_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart
@@ -19,6 +19,7 @@ import "package:photos/events/memory_seen_event.dart";
import "package:photos/events/sync_status_update_event.dart";
import "package:photos/locale.dart";
import "package:photos/models/file/file.dart";
+import "package:photos/models/file/file_type.dart";
import "package:photos/models/memories/memories_cache.dart";
import "package:photos/models/memories/memory.dart";
import "package:photos/models/memories/people_memory.dart";
@@ -37,6 +38,7 @@ import "package:photos/services/sync/local_sync_service.dart";
import "package:photos/theme/colors.dart";
import "package:photos/ui/home/memories/all_memories_page.dart";
import "package:photos/ui/home/memories/full_screen_memory.dart";
+import "package:photos/ui/home/memories/memory_music_session.dart";
import "package:photos/ui/viewer/file/detail_page.dart";
import "package:photos/ui/viewer/people/people_page.dart";
import "package:photos/utils/cache_util.dart";
@@ -1387,16 +1389,34 @@ class MemoriesCacheService {
);
return;
}
+ final selectedPersonMemory = personMemory;
if (context != null && !context.mounted) return;
await _routeToPage(
- FullScreenMemoryDataUpdater(
- initialIndex: 0,
- memories: personMemory.memories,
- child: Container(
- color: backgroundColorDark,
- width: double.infinity,
- height: double.infinity,
- child: FullScreenMemory(personMemory.title, 0),
+ MemoryMusicSession(
+ memories: <SmartMemory>[selectedPersonMemory],
+ initialMemoryID: selectedPersonMemory.id,
+ initialItemIsVideo:
+ selectedPersonMemory.memories.first.file.fileType == FileType.video,
+ builder: (context, musicController) => FullScreenMemoryDataUpdater(
+ initialIndex: 0,
+ memories: selectedPersonMemory.memories,
+ child: Container(
+ color: backgroundColorDark,
+ width: double.infinity,
+ height: double.infinity,
+ child: FullScreenMemory(
+ selectedPersonMemory.title,
+ 0,
+ onCurrentItemChanged: (file) {
+ unawaited(
+ musicController.setCurrentItem(
+ memoryID: selectedPersonMemory.id,
+ isVideo: file.fileType == FileType.video,
+ ),
+ );
+ },
+ ),
+ ),
),
),
context: context,
diff --git a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
index 9c64d029a9..02f8dd7925 100644
--- a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
+++ b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
@@ -471,7 +471,7 @@ class TimeMemoriesCalculator {
(a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),
);
final fillerMemory = FillerMemory(
- memories,
+ PhotoSelector.includeVideos(memories, memories, memories.length),
yearAgo,
nowInMicroseconds,
windowEnd,
@@ -606,7 +606,7 @@ class TimeMemoriesCalculator {
(a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),
);
final onThisDayMemory = OnThisDayMemory(
- filteredMemories,
+ PhotoSelector.includeVideos(filteredMemories, memories, 20),
startPoint.add(Duration(days: day)).microsecondsSinceEpoch,
startPoint.add(Duration(days: day + 1)).microsecondsSinceEpoch,
);
diff --git a/mobile/apps/photos/lib/settings/local_settings.dart b/mobile/apps/photos/lib/settings/local_settings.dart
index 76f407839d..eb931b6cc9 100644
--- a/mobile/apps/photos/lib/settings/local_settings.dart
+++ b/mobile/apps/photos/lib/settings/local_settings.dart
@@ -73,6 +73,7 @@ class LocalSettings {
static const kRateUsPromptThreshold = 2;
static const shouldLoopVideoKey = "video.should_loop";
static const isMutedKey = "video.is_muted";
+ static const _memoriesAudioMutedKey = "memories.audio_muted";
static const onGuestViewKey = "on_guest_view";
static const _hasConfiguredLinksInAppPermissionKey =
"has_configured_links_in_app_permission";
@@ -475,6 +476,14 @@ class LocalSettings {
return _prefs.getBool(isMutedKey) ?? false;
}
+ Future<void> setMemoriesAudioMuted(bool value) async {
+ await _prefs.setBool(_memoriesAudioMutedKey, value);
+ }
+
+ bool isMemoriesAudioMuted() {
+ return _prefs.getBool(_memoriesAudioMutedKey) ?? false;
+ }
+
Future<void> setOnGuestView(bool value) {
return _prefs.setBool(onGuestViewKey, value);
}
diff --git a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
index fb8e5a1ee0..f35536eab0 100644
--- a/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/all_memories_page.dart
@@ -1,8 +1,12 @@
+import "dart:async";
+
import 'package:flutter/material.dart';
+import "package:photos/models/file/file_type.dart";
import "package:photos/models/memories/smart_memory.dart";
import "package:photos/theme/colors.dart";
import "package:photos/ui/home/memories/full_screen_memory.dart";
import "package:photos/ui/home/memories/memory_cover_util.dart";
+import "package:photos/ui/home/memories/memory_music_session.dart";
class AllMemoriesPage extends StatefulWidget {
final int initialPageIndex;
@@ -25,7 +29,7 @@ class AllMemoriesPage extends StatefulWidget {
class _AllMemoriesPageState extends State<AllMemoriesPage>
with SingleTickerProviderStateMixin {
late PageController pageController;
- bool isFirstLoad = true;
+ final Map<String, FileType> _currentItemTypes = <String, FileType>{};
@override
void initState() {
@@ -41,44 +45,82 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
@override
Widget build(BuildContext context) {
- return Container(
- width: double.infinity,
- height: double.infinity,
- color: backgroundColorDark,
- child: PageView.builder(
- controller: pageController,
- physics: const BouncingScrollPhysics(),
- hitTestBehavior: HitTestBehavior.translucent,
- itemCount: widget.allMemories.length,
- itemBuilder: (context, index) {
- final smartMemory = widget.allMemories[index];
- final initialMemoryIndex =
- widget.isFromWidgetOrNotifications && isFirstLoad
- ? widget.inititalFileIndex
- : getNextMemoryIndex(smartMemory.memories);
- isFirstLoad = false;
- return FullScreenMemoryDataUpdater(
- initialIndex: initialMemoryIndex,
- memories: smartMemory.memories,
- child: FullScreenMemory(
- smartMemory.title,
- initialMemoryIndex,
- onNextMemory: index < widget.allMemories.length - 1
- ? () => pageController.nextPage(
- duration: const Duration(milliseconds: 675),
- curve: Curves.easeOutQuart,
- )
- : null,
- onPreviousMemory: index > 0
- ? () => pageController.previousPage(
- duration: const Duration(milliseconds: 675),
- curve: Curves.easeOutQuart,
- )
- : null,
- ),
- );
- },
+ final initialPageIndex = widget.initialPageIndex;
+ final initialMemory = widget.allMemories[initialPageIndex];
+ final initialItemIndex = _initialItemIndexForPage(initialPageIndex);
+ return MemoryMusicSession(
+ memories: widget.allMemories,
+ initialMemoryID: initialMemory.id,
+ initialItemIsVideo:
+ initialMemory.memories[initialItemIndex].file.fileType ==
+ FileType.video,
+ builder: (context, musicController) => Container(
+ width: double.infinity,
+ height: double.infinity,
+ color: backgroundColorDark,
+ child: PageView.builder(
+ controller: pageController,
+ physics: const BouncingScrollPhysics(),
+ hitTestBehavior: HitTestBehavior.translucent,
+ itemCount: widget.allMemories.length,
+ onPageChanged: (index) {
+ final smartMemory = widget.allMemories[index];
+ final currentItemType =
+ _currentItemTypes[smartMemory.id] ??
+ smartMemory
+ .memories[_initialItemIndexForPage(index)]
+ .file
+ .fileType;
+ unawaited(
+ musicController.activateMemory(
+ smartMemory.id,
+ currentItemIsVideo: currentItemType == FileType.video,
+ ),
+ );
+ },
+ itemBuilder: (context, index) {
+ final smartMemory = widget.allMemories[index];
+ final initialMemoryIndex = _initialItemIndexForPage(index);
+ return FullScreenMemoryDataUpdater(
+ initialIndex: initialMemoryIndex,
+ memories: smartMemory.memories,
+ child: FullScreenMemory(
+ smartMemory.title,
+ initialMemoryIndex,
+ onCurrentItemChanged: (file) {
+ _currentItemTypes[smartMemory.id] = file.fileType;
+ unawaited(
+ musicController.setCurrentItem(
+ memoryID: smartMemory.id,
+ isVideo: file.fileType == FileType.video,
+ ),
+ );
+ },
+ onNextMemory: index < widget.allMemories.length - 1
+ ? () => pageController.nextPage(
+ duration: const Duration(milliseconds: 675),
+ curve: Curves.easeOutQuart,
+ )
+ : null,
+ onPreviousMemory: index > 0
+ ? () => pageController.previousPage(
+ duration: const Duration(milliseconds: 675),
+ curve: Curves.easeOutQuart,
+ )
+ : null,
+ ),
+ );
+ },
+ ),
),
);
}
+
+ int _initialItemIndexForPage(int pageIndex) {
+ final memories = widget.allMemories[pageIndex].memories;
+ return widget.isFromWidgetOrNotifications &&
+ pageIndex == widget.initialPageIndex
+ ? widget.inititalFileIndex
+ : getNextMemoryIndex(memories);
+ }
}
diff --git a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index 820c02a56f..f41101e204 100644
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@ -31,6 +31,7 @@ import "package:photos/services/smart_memories_service.dart";
import "package:photos/ui/actions/file/file_actions.dart";
import "package:photos/ui/collections/collection_action_sheet.dart";
import "package:photos/ui/home/memories/custom_listener.dart";
+import "package:photos/ui/home/memories/memory_music_session.dart";
import "package:photos/ui/home/memories/memory_progress_indicator.dart";
import "package:photos/ui/home/memories/memory_share_sheet.dart";
import "package:photos/ui/home/memories/memory_video_prefetcher.dart";
@@ -328,12 +329,14 @@ class FullScreenMemoryData extends InheritedWidget {
class FullScreenMemory extends StatefulWidget {
final String title;
final int initialIndex;
+ final ValueChanged<EnteFile>? onCurrentItemChanged;
final VoidCallback? onNextMemory;
final VoidCallback? onPreviousMemory;
const FullScreenMemory(
this.title,
this.initialIndex, {
+ this.onCurrentItemChanged,
this.onNextMemory,
this.onPreviousMemory,
super.key,
@@ -369,6 +372,8 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
bool get _isAnimationPaused => _isViewerPaused || _isPlaybackPaused;
bool _isMediaZoomed = false;
final _socialControlsVisible = ValueNotifier<bool>(false);
+ FullScreenMemoryData? _memoryData;
+ ValueNotifier<int>? _itemIndexNotifier;
/// Used to check if any pointer is on the screen.
final hasPointerOnScreenNotifier = ValueNotifier<bool>(false);
@@ -424,8 +429,32 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
});
}
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ final memoryData = FullScreenMemoryData.of(context);
+ final previousMemoryData = _memoryData;
+ _memoryData = memoryData;
+ final nextNotifier = memoryData?.indexNotifier;
+ if (identical(nextNotifier, _itemIndexNotifier)) {
+ if (!identical(previousMemoryData, memoryData)) {
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (mounted) _reportCurrentItem();
+ });
+ }
+ return;
+ }
+ _itemIndexNotifier?.removeListener(_reportCurrentItem);
+ _itemIndexNotifier = nextNotifier;
+ _itemIndexNotifier?.addListener(_reportCurrentItem);
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (mounted) _reportCurrentItem();
+ });
+ }
+
@override
void dispose() {
+ _itemIndexNotifier?.removeListener(_reportCurrentItem);
hasPointerOnScreenNotifier.removeListener(_hasPointerListener);
_detailSheetEventSubscription.cancel();
_captionUpdatedSubscription.cancel();
@@ -433,6 +462,18 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
super.dispose();
}
+ void _reportCurrentItem() {
+ if (!mounted) return;
+ final inheritedData = _memoryData;
+ if (inheritedData == null) return;
+ final index = _clampedMemoryIndex(
+ inheritedData.indexNotifier.value,
+ inheritedData.memories.length,
+ );
+ if (index == null) return;
+ widget.onCurrentItemChanged?.call(inheritedData.memories[index].file);
+ }
+
/// Used to check if user has touched the screen and then to pause animation
/// and once the pointer is removed from the screen, it resumes the animation
/// It also resets the zoom of the photo view to default for better user
@@ -629,6 +670,9 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
void _pauseViewer() {
if (!mounted) return;
+ unawaited(
+ MemoryMusicScope.of(context, listen: false).setViewerActionPaused(true),
+ );
_toggleAnimation(pause: true);
Bus.instance.fire(PauseVideoEvent());
}
@@ -637,11 +681,15 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
if (!mounted) return;
Bus.instance.fire(ResumeVideoEvent());
_toggleAnimation(pause: false);
+ unawaited(
+ MemoryMusicScope.of(context, listen: false).setViewerActionPaused(false),
+ );
}
@override
Widget build(BuildContext context) {
final inheritedData = FullScreenMemoryData.of(context);
+ final memoryMusicController = MemoryMusicScope.of(context);
if (inheritedData == null || inheritedData.memories.isEmpty) {
return const SizedBox.shrink();
}
@@ -739,6 +787,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
color: Colors.transparent,
),
isFromMemories: true,
+ isAudioMutedOverride: memoryMusicController.isMuted,
shouldDisableScroll: (isZoomed) {
_isMediaZoomed = isZoomed;
},
@@ -999,6 +1048,39 @@ class _MemoryActionButton extends StatelessWidget {
}
}
+class _MemoryMusicMuteButton extends StatelessWidget {
+ const _MemoryMusicMuteButton();
+
+ @override
+ Widget build(BuildContext context) {
+ final controller = MemoryMusicScope.of(context);
+ final isMuted = controller.isMuted;
+ return SizedBox.square(
+ dimension: 48,
+ child: IconButton(
+ tooltip: isMuted
+ ? pendingTranslation("Unmute audio")
+ : pendingTranslation("Mute audio"),
+ padding: const EdgeInsets.all(8),
+ style: IconButton.styleFrom(
+ minimumSize: const Size.square(48),
+ maximumSize: const Size.square(48),
+ tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+ overlayColor: Colors.white.withValues(alpha: 0.08),
+ ),
+ onPressed: () => unawaited(controller.toggleMuted()),
+ icon: HugeIcon(
+ icon: isMuted
+ ? HugeIcons.strokeRoundedVolumeOff
+ : HugeIcons.strokeRoundedVolumeHigh,
+ color: Colors.white,
+ size: 24,
+ ),
+ ),
+ );
+ }
+}
+
class _MemoryTopOverlay extends StatelessWidget {
final String title;
final VoidCallback onClose;
@@ -1140,6 +1222,8 @@ class _MemoryTopOverlay extends StatelessWidget {
),
),
),
+ const SizedBox(width: 8),
+ const _MemoryMusicMuteButton(),
if (showFavorite) ...[
const SizedBox(width: 8),
FavoriteWidget(
diff --git a/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart b/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart
new file mode 100644
index 0000000000..c63fec42f7
--- /dev/null
+++ b/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart
@@ -0,0 +1,92 @@
+import "dart:async";
+
+import "package:flutter/material.dart";
+import "package:photos/models/memories/smart_memory.dart";
+import "package:photos/service_locator.dart";
+import "package:photos/services/memories/memory_music_catalog.dart";
+import "package:photos/services/memories/memory_music_controller.dart";
+import "package:photos/services/memories/memory_music_selector.dart";
+
+class MemoryMusicSession extends StatefulWidget {
+ final List<SmartMemory> memories;
+ final String initialMemoryID;
+ final bool initialItemIsVideo;
+ final Widget Function(BuildContext context, MemoryMusicController controller)
+ builder;
+
+ const MemoryMusicSession({
+ required this.memories,
+ required this.initialMemoryID,
+ required this.initialItemIsVideo,
+ required this.builder,
+ super.key,
+ });
+
+ @override
+ State<MemoryMusicSession> createState() => _MemoryMusicSessionState();
+}
+
+class _MemoryMusicSessionState extends State<MemoryMusicSession>
+ with WidgetsBindingObserver {
+ late final MemoryMusicController _controller;
+
+ @override
+ void initState() {
+ super.initState();
+ WidgetsBinding.instance.addObserver(this);
+ final catalog = MemoryMusicCatalog.bundled;
+ final assignments = const MemoryMusicSelector().assignTracks(
+ memoryIDs: widget.memories.map((memory) => memory.id),
+ tracks: catalog.tracks,
+ );
+ _controller = MemoryMusicController(
+ catalog: catalog,
+ assignments: assignments,
+ initiallyMuted: localSettings.isMemoriesAudioMuted(),
+ persistMuted: localSettings.setMemoriesAudioMuted,
+ );
+ unawaited(
+ _controller.activateMemory(
+ widget.initialMemoryID,
+ currentItemIsVideo: widget.initialItemIsVideo,
+ ),
+ );
+ }
+
+ @override
+ void didChangeAppLifecycleState(AppLifecycleState state) {
+ unawaited(_controller.setAppActive(state == AppLifecycleState.resumed));
+ }
+
+ @override
+ void dispose() {
+ WidgetsBinding.instance.removeObserver(this);
+ _controller.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return MemoryMusicScope(
+ controller: _controller,
+ child: Builder(
+ builder: (context) => widget.builder(context, _controller),
+ ),
+ );
+ }
+}
+
+class MemoryMusicScope extends InheritedNotifier<MemoryMusicController> {
+ const MemoryMusicScope({
+ required MemoryMusicController controller,
+ required super.child,
+ super.key,
+ }) : super(notifier: controller);
+
+ static MemoryMusicController of(BuildContext context, {bool listen = true}) {
+ final scope = listen
+ ? context.dependOnInheritedWidgetOfExactType<MemoryMusicScope>()
+ : context.getInheritedWidgetOfExactType<MemoryMusicScope>();
+ return scope!.notifier!;
+ }
+}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
index c764a4180b..f757d77a30 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
@@ -17,6 +17,7 @@ class FileWidget extends StatelessWidget {
final BoxDecoration? backgroundDecoration;
final bool? autoPlay;
final bool? isFromMemories;
+ final bool? isAudioMutedOverride;
final Function({required int memoryDuration})? onFinalFileLoad;
final ValueChanged<File>? onFinalImageLoaded;
final ValueNotifier<QrCodeDetectionResult?>? qrDetectionsNotifier;
@@ -30,6 +31,7 @@ class FileWidget extends StatelessWidget {
required this.tagPrefix,
this.backgroundDecoration,
this.isFromMemories = false,
+ this.isAudioMutedOverride,
this.onFinalFileLoad,
this.onFinalImageLoaded,
this.qrDetectionsNotifier,
@@ -75,6 +77,7 @@ class FileWidget extends StatelessWidget {
shouldDisableScroll: shouldDisableScroll,
onFinalFileLoad: onFinalFileLoad,
isFromMemories: isFromMemories ?? false,
+ isAudioMutedOverride: isAudioMutedOverride,
key: key ?? ValueKey(fileKey),
);
} else {
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
index 20dae85349..7d9ff6cb5f 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
@@ -28,6 +28,7 @@ class VideoWidget extends StatefulWidget {
final Function(bool)? shouldDisableScroll;
final Function({required int memoryDuration})? onFinalFileLoad;
final bool isFromMemories;
+ final bool? isAudioMutedOverride;
const VideoWidget(
this.file, {
@@ -36,6 +37,7 @@ class VideoWidget extends StatefulWidget {
this.shouldDisableScroll,
this.onFinalFileLoad,
this.isFromMemories = false,
+ this.isAudioMutedOverride,
super.key,
});
@@ -175,6 +177,7 @@ class _VideoWidgetState extends State<VideoWidget> {
playlistData: playlistData,
selectedPreview: playPreview,
isFromMemories: widget.isFromMemories,
+ isAudioMutedOverride: widget.isAudioMutedOverride,
onStreamChange: () {
setState(() {
selectPreviewForPlay = !selectPreviewForPlay;
@@ -200,6 +203,7 @@ class _VideoWidgetState extends State<VideoWidget> {
preview: playlistData?.preview,
selectedPreview: playPreview,
isFromMemories: widget.isFromMemories,
+ isAudioMutedOverride: widget.isAudioMutedOverride,
onStreamChange: () {
setState(() {
selectPreviewForPlay = !selectPreviewForPlay;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
index 05c9b42dff..2456221138 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
@@ -36,6 +36,7 @@ class VideoWidgetMediaKit extends StatefulWidget {
final FullScreenRequestCallback? playbackCallback;
final Function(bool)? shouldDisableScroll;
final bool isFromMemories;
+ final bool? isAudioMutedOverride;
final void Function() onStreamChange;
final File? preview;
final bool selectedPreview;
@@ -47,6 +48,7 @@ class VideoWidgetMediaKit extends StatefulWidget {
this.playbackCallback,
this.shouldDisableScroll,
this.isFromMemories = false,
+ this.isAudioMutedOverride,
required this.onStreamChange,
this.preview,
required this.selectedPreview,
@@ -141,6 +143,14 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
);
}
+ @override
+ void didUpdateWidget(covariant VideoWidgetMediaKit oldWidget) {
+ super.didUpdateWidget(oldWidget);
+ if (oldWidget.isAudioMutedOverride != widget.isAudioMutedOverride) {
+ _applyVolume();
+ }
+ }
+
void loadPreview() {
_setVideoController(widget.preview!.path);
}
@@ -341,9 +351,7 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
);
controller = VideoController(player);
}
- if (!widget.isFromMemories) {
- player.setVolume(localSettings.isMuted() ? 0.0 : 100.0);
- }
+ _applyVolume();
player.open(Media(url), play: _isAppInFG);
});
int duration = controller!.player.state.duration.inSeconds;
@@ -353,4 +361,13 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
widget.onFinalFileLoad?.call(memoryDuration: duration);
}
}
+
+ void _applyVolume() {
+ final mutedOverride = widget.isAudioMutedOverride;
+ if (mutedOverride != null) {
+ player.setVolume(mutedOverride ? 0.0 : 100.0);
+ } else if (!widget.isFromMemories) {
+ player.setVolume(localSettings.isMuted() ? 0.0 : 100.0);
+ }
+ }
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
index 47e1ec4449..fe047a19a3 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
@@ -46,6 +46,7 @@ class VideoWidgetNative extends StatefulWidget {
final FullScreenRequestCallback? playbackCallback;
final Function(bool)? shouldDisableScroll;
final bool isFromMemories;
+ final bool? isAudioMutedOverride;
final void Function()? onStreamChange;
final PlaylistData? playlistData;
final bool selectedPreview;
@@ -57,6 +58,7 @@ class VideoWidgetNative extends StatefulWidget {
this.playbackCallback,
this.shouldDisableScroll,
this.isFromMemories = false,
+ this.isAudioMutedOverride,
required this.onStreamChange,
super.key,
this.playlistData,
@@ -158,6 +160,14 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
);
}
+ @override
+ void didUpdateWidget(covariant VideoWidgetNative oldWidget) {
+ super.didUpdateWidget(oldWidget);
+ if (oldWidget.isAudioMutedOverride != widget.isAudioMutedOverride) {
+ unawaited(_applyVolume());
+ }
+ }
+
Future<void> setVideoSource() async {
if (_filePath == null) {
_logger.info('Stop video player, file path is null');
@@ -169,9 +179,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
type: VideoSourceType.file,
);
await _controller?.loadVideo(videoSource);
- if (!widget.isFromMemories) {
- await _controller?.setVolume(localSettings.isMuted() ? 0.0 : 1.0);
- }
+ await _applyVolume();
await _controller?.play();
Bus.instance.fire(SeekbarTriggeredEvent(position: 0));
@@ -591,9 +599,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
Future<void> _onPlaybackReady() async {
if (_isPlaybackReady.value) return;
- if (!widget.isFromMemories) {
- await _controller!.setVolume(localSettings.isMuted() ? 0.0 : 1.0);
- }
+ await _applyVolume();
await _controller!.play();
final durationInSeconds = durationToSeconds(duration) ?? 10;
widget.onFinalFileLoad?.call(memoryDuration: durationInSeconds);
@@ -608,6 +614,17 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
}
}
+ Future<void> _applyVolume() async {
+ final controller = _controller;
+ if (controller == null) return;
+ final mutedOverride = widget.isAudioMutedOverride;
+ if (mutedOverride != null) {
+ await controller.setVolume(mutedOverride ? 0.0 : 1.0);
+ } else if (!widget.isFromMemories) {
+ await controller.setVolume(localSettings.isMuted() ? 0.0 : 1.0);
+ }
+ }
+
void _loadNetworkVideo(bool update) {
getFileFromServer(
widget.file,
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index ba94299a3e..873dee96ee 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -312,6 +312,7 @@ flutter:
assets:
- assets/
- assets/rituals/
+ - assets/memory-music/
- assets/rewind_badges/
- assets/video-editor/
- assets/image-editor/
diff --git a/mobile/apps/photos/test/models/memories/memories_cache_validation_test.dart b/mobile/apps/photos/test/models/memories/memories_cache_validation_test.dart
index 14ef4cf534..b7c831079e 100644
--- a/mobile/apps/photos/test/models/memories/memories_cache_validation_test.dart
+++ b/mobile/apps/photos/test/models/memories/memories_cache_validation_test.dart
@@ -1,10 +1,11 @@
+import "package:ente_strings/ente_strings.dart";
import "package:flutter/widgets.dart";
import "package:flutter_test/flutter_test.dart";
import "package:intl/date_symbol_data_local.dart";
-import "package:ente_strings/ente_strings.dart";
import "package:photos/models/file/file.dart";
import "package:photos/models/file/file_type.dart";
import "package:photos/models/location/location.dart";
+import "package:photos/models/memories/clip_memory.dart";
import "package:photos/models/memories/filler_memory.dart";
import "package:photos/models/memories/memories_cache.dart";
import "package:photos/models/memories/memory.dart";
@@ -158,6 +159,14 @@ void main() {
activity: PeopleActivity.hiking,
)..title = "Stored people title";
+ final clipMemory = ClipMemory(
+ buildMemories([711, 712]),
+ 110,
+ 120,
+ ClipMemoryType.goldenHourPortraits,
+ id: "clip-typed",
+ )..title = "Stored clip title";
+
final originals = <SmartMemory>[
tripMemory,
timeMemory,
@@ -166,6 +175,7 @@ void main() {
fillerMemory,
onThisDayMemory,
peopleMemory,
+ clipMemory,
];
for (final original in originals) {
diff --git a/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart b/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart
new file mode 100644
index 0000000000..ffbbed7259
--- /dev/null
+++ b/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart
@@ -0,0 +1,32 @@
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/models/memories/memory_music_track.dart";
+import "package:photos/services/memories/memory_music_catalog.dart";
+
+void main() {
+ test("catalog looks up tracks by their stable IDs", () {
+ const track = MemoryMusicTrack(
+ id: "track-1",
+ source: AssetMemoryMusicSource("assets/track-1.mp3"),
+ );
+ final catalog = MemoryMusicCatalog(const <MemoryMusicTrack>[track]);
+
+ expect(catalog.trackForID("track-1"), same(track));
+ expect(catalog.trackForID("missing"), isNull);
+ });
+
+ test("catalog rejects duplicate track IDs", () {
+ expect(
+ () => MemoryMusicCatalog(const <MemoryMusicTrack>[
+ MemoryMusicTrack(
+ id: "duplicate",
+ source: AssetMemoryMusicSource("assets/track-1.mp3"),
+ ),
+ MemoryMusicTrack(
+ id: "duplicate",
+ source: AssetMemoryMusicSource("assets/track-2.mp3"),
+ ),
+ ]),
+ throwsArgumentError,
+ );
+ });
+}
diff --git a/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
new file mode 100644
index 0000000000..7ee9a4d8ae
--- /dev/null
+++ b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
@@ -0,0 +1,136 @@
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/models/memories/memory_music_track.dart";
+import "package:photos/services/memories/memory_music_catalog.dart";
+import "package:photos/services/memories/memory_music_controller.dart";
+import "package:photos/services/memories/memory_music_source_loader.dart";
+
+void main() {
+ late _FakeMemoryMusicPlayer player;
+ late List<bool> persistedMuteValues;
+ late MemoryMusicController controller;
+
+ setUp(() {
+ player = _FakeMemoryMusicPlayer();
+ persistedMuteValues = <bool>[];
+ controller = MemoryMusicController(
+ catalog: MemoryMusicCatalog(const <MemoryMusicTrack>[
+ MemoryMusicTrack(
+ id: "track-1",
+ source: AssetMemoryMusicSource("assets/track-1.mp3"),
+ ),
+ MemoryMusicTrack(
+ id: "track-2",
+ source: AssetMemoryMusicSource("assets/track-2.mp3"),
+ ),
+ ]),
+ assignments: const <String, String>{
+ "memory-1": "track-1",
+ "memory-2": "track-2",
+ },
+ initiallyMuted: false,
+ persistMuted: (value) async => persistedMuteValues.add(value),
+ player: player,
+ );
+ });
+
+ tearDown(() {
+ controller.dispose();
+ });
+
+ test("activating a photo memory loads, loops, and plays its track", () async {
+ await controller.activateMemory("memory-1", currentItemIsVideo: false);
+
+ expect(player.loadedAssets, <String>["assets/track-1.mp3"]);
+ expect(player.looping, isTrue);
+ expect(player.position, Duration.zero);
+ expect(player.playing, isTrue);
+ expect(player.volume, 1.0);
+ });
+
+ test("video items pause music and photos resume it", () async {
+ await controller.activateMemory("memory-1", currentItemIsVideo: false);
+
+ await controller.setCurrentItem(memoryID: "memory-1", isVideo: true);
+ expect(player.playing, isFalse);
+
+ await controller.setCurrentItem(memoryID: "memory-1", isVideo: false);
+ expect(player.playing, isTrue);
+ });
+
+ test("item reports from inactive memories are ignored", () async {
+ await controller.activateMemory("memory-1", currentItemIsVideo: false);
+
+ await controller.setCurrentItem(memoryID: "memory-2", isVideo: true);
+
+ expect(player.playing, isTrue);
+ });
+
+ test("mute persists and changes volume without pausing", () async {
+ await controller.activateMemory("memory-1", currentItemIsVideo: false);
+
+ await controller.setMuted(true);
+ expect(player.playing, isTrue);
+ expect(player.volume, 0.0);
+ expect(persistedMuteValues, <bool>[true]);
+
+ await controller.setMuted(false);
+ expect(player.playing, isTrue);
+ expect(player.volume, 1.0);
+ expect(persistedMuteValues, <bool>[true, false]);
+ });
+
+ test("changing memories restarts the assigned track", () async {
+ await controller.activateMemory("memory-1", currentItemIsVideo: false);
+ player.position = const Duration(seconds: 4);
+
+ await controller.activateMemory("memory-2", currentItemIsVideo: false);
+
+ expect(player.loadedAssets.last, "assets/track-2.mp3");
+ expect(player.position, Duration.zero);
+ });
+}
+
+class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
+ final List<String> loadedAssets = <String>[];
+ bool looping = false;
+ bool playing = false;
+ double volume = 1.0;
+ Duration position = Duration.zero;
+
+ @override
+ Future<void> configureAudioSession() async {}
+
+ @override
+ Future<void> loadAsset(String assetPath) async {
+ loadedAssets.add(assetPath);
+ position = Duration.zero;
+ }
+
+ @override
+ Future<void> setLooping() async {
+ looping = true;
+ }
+
+ @override
+ Future<void> setVolume(double value) async {
+ volume = value;
+ }
+
+ @override
+ Future<void> play() async {
+ playing = true;
+ }
+
+ @override
+ Future<void> pause() async {
+ playing = false;
+ }
+
+ @override
+ Future<void> stop() async {
+ playing = false;
+ }
+
+ @override
+ Future<void> dispose() async {}
+}
diff --git a/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart b/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
new file mode 100644
index 0000000000..91a6099236
--- /dev/null
+++ b/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
@@ -0,0 +1,67 @@
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/models/memories/memory_music_track.dart";
+import "package:photos/services/memories/memory_music_selector.dart";
+
+void main() {
+ const tracks = <MemoryMusicTrack>[
+ MemoryMusicTrack(
+ id: "track-1",
+ source: AssetMemoryMusicSource("assets/track-1.mp3"),
+ ),
+ MemoryMusicTrack(
+ id: "track-2",
+ source: AssetMemoryMusicSource("assets/track-2.mp3"),
+ ),
+ MemoryMusicTrack(
+ id: "track-3",
+ source: AssetMemoryMusicSource("assets/track-3.mp3"),
+ ),
+ ];
+ const selector = MemoryMusicSelector();
+ const memoryIDs = <String>["memory-a", "memory-b", "memory-c", "memory-d"];
+
+ test("assignments are deterministic", () {
+ final first = selector.assignTracks(memoryIDs: memoryIDs, tracks: tracks);
+ final second = selector.assignTracks(memoryIDs: memoryIDs, tracks: tracks);
+
+ expect(second, first);
+ });
+
+ test("adjacent memories do not receive the same track", () {
+ final assignments = selector.assignTracks(
+ memoryIDs: memoryIDs,
+ tracks: tracks,
+ );
+ final assignedTracks = memoryIDs
+ .map((memoryID) => assignments[memoryID])
+ .toList();
+
+ for (var index = 1; index < assignedTracks.length; index++) {
+ expect(assignedTracks[index], isNot(assignedTracks[index - 1]));
+ }
+ });
+
+ test("one-track catalog reuses its only track", () {
+ final assignments = selector.assignTracks(
+ memoryIDs: memoryIDs,
+ tracks: const <MemoryMusicTrack>[
+ MemoryMusicTrack(
+ id: "track-1",
+ source: AssetMemoryMusicSource("assets/track-1.mp3"),
+ ),
+ ],
+ );
+
+ expect(assignments.values, everyElement("track-1"));
+ });
+
+ test("empty catalog produces no assignments", () {
+ expect(
+ selector.assignTracks(
+ memoryIDs: memoryIDs,
+ tracks: const <MemoryMusicTrack>[],
+ ),
+ isEmpty,
+ );
+ });
+}
diff --git a/mobile/apps/photos/test/services/memories/photo_selector_test.dart b/mobile/apps/photos/test/services/memories/photo_selector_test.dart
index 8ce2b2fae1..ea51997be2 100644
--- a/mobile/apps/photos/test/services/memories/photo_selector_test.dart
+++ b/mobile/apps/photos/test/services/memories/photo_selector_test.dart
@@ -24,12 +24,13 @@ EnteFile _file({
required int creationTime,
Location? location,
int? generatedID,
+ FileType fileType = FileType.image,
}) {
final f = EnteFile()
..uploadedFileID = uploadedFileID
..generatedID = generatedID ?? uploadedFileID
..creationTime = creationTime
- ..fileType = FileType.image;
+ ..fileType = fileType;
if (location != null) f.location = location;
return f;
}
@@ -1051,6 +1052,45 @@ void main() {
expect(result.length, equals(5));
});
+ test('includes an adjacent video pair while retaining photos', () async {
+ final memories = [
+ for (var i = 0; i < 6; i++)
+ _mem(_file(uploadedFileID: i, creationTime: _baseTime + i * _hour)),
+ for (var i = 6; i < 9; i++)
+ _mem(
+ _file(
+ uploadedFileID: i,
+ creationTime: _baseTime + i * _hour,
+ fileType: FileType.video,
+ ),
+ ),
+ ];
+ final result = await PhotoSelector.select(
+ memories,
+ SelectionConfig(
+ targetSize: 5,
+ isLocalGalleryMode: false,
+ fileIDToImageEmbedding: const {},
+ scores: {for (var i = 0; i < 6; i++) i: 100 - i.toDouble()},
+ distribution: SelectionDistribution.none,
+ pick: SelectionPick.ranked,
+ sort: SelectionSort.chronological,
+ ),
+ );
+
+ final videoIndexes = [
+ for (var i = 0; i < result.length; i++)
+ if (result[i].file.fileType == FileType.video) i,
+ ];
+ expect(result, hasLength(5));
+ expect(videoIndexes, hasLength(2));
+ expect(videoIndexes.last, videoIndexes.first + 1);
+ expect(
+ result.any((memory) => memory.file.fileType != FileType.video),
+ isTrue,
+ );
+ });
+
test(
'flat distribution selects by score and respects targetSize',
() async {