Skip to content

armgit / ente

Public Imported from GitHub
0

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

Simplify memories music integration

ashilknbc067a3f54dd
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
index 2256b08102..1b87b1d1f5 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
@@ -56,22 +56,15 @@ class MemoryMusicController extends ChangeNotifier {
return;
}
- final track = _assignments[memoryID];
+ final track = _assignments[memoryID]!;
final generation = ++_loadGeneration;
_status = _MemoryMusicPlaybackStatus.loading;
await _synchronizePlayback();
if (!_isCurrentLoad(generation)) return;
- if (track == null) {
- _status = _MemoryMusicPlaybackStatus.idle;
- await _player.stop();
- return;
- }
try {
await _ensureAudioSessionInitialized();
if (!_isCurrentLoad(generation)) return;
- await _player.stop();
- if (!_isCurrentLoad(generation)) return;
await _player.loadAsset(track.assetPath);
if (!_isCurrentLoad(generation)) return;
await _player.setLooping();
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_player.dart b/mobile/apps/photos/lib/services/memories/memory_music_player.dart
index 78c8b85c85..e015224aff 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_player.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_player.dart
@@ -19,8 +19,6 @@ abstract interface class MemoryMusicPlayer {
Future<void> pauseImmediately();
- Future<void> stop();
-
Future<void> dispose();
}
@@ -88,12 +86,6 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
return _player.pause();
}
- @override
- Future<void> stop() {
- final generation = ++_fadeGeneration;
- return _enqueueFade(generation, _player.stop);
- }
-
@override
Future<void> dispose() async {
await pauseImmediately();
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_selector.dart b/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
index 400c62a26f..effd9c8592 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
@@ -7,8 +7,6 @@ Map<String, MemoryMusicTrack> assignMemoryMusicTracks({
required Iterable<String> memoryIDs,
required List<MemoryMusicTrack> tracks,
}) {
- if (tracks.isEmpty) return const <String, MemoryMusicTrack>{};
-
final assignments = <String, MemoryMusicTrack>{};
String? previousTrackID;
for (final memoryID in memoryIDs) {
diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dart
index 5e9865a3ab..ce55e569c2 100644
--- a/mobile/apps/photos/lib/services/memories_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart
@@ -1378,19 +1378,18 @@ class MemoriesCacheService {
);
return;
}
- final selectedPersonMemory = personMemory;
if (context != null && !context.mounted) return;
final page = FullScreenMemoryDataUpdater(
initialIndex: 0,
- memories: selectedPersonMemory.memories,
+ memories: personMemory.memories,
child: Container(
color: backgroundColorDark,
width: double.infinity,
height: double.infinity,
child: FullScreenMemory(
- selectedPersonMemory.title,
+ personMemory.title,
0,
- memoryID: selectedPersonMemory.id,
+ memoryID: personMemory.id,
isActive: true,
),
),
@@ -1398,7 +1397,7 @@ class MemoriesCacheService {
await _routeToPage(
flagService.internalUser
? MemoryMusicSession(
- memoryIDs: <String>[selectedPersonMemory.id],
+ memoryIDs: <String>[personMemory.id],
child: page,
)
: page,
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 0f925b4f45..5c80e17017 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
@@ -425,18 +425,14 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
final nextNotifier = memoryData?.indexNotifier;
if (identical(nextNotifier, _itemIndexNotifier)) {
if (!identical(previousMemoryData, memoryData)) {
- WidgetsBinding.instance.addPostFrameCallback((_) {
- if (mounted) _activateCurrentItemMusic();
- });
+ _activateCurrentItemMusic();
}
return;
}
_itemIndexNotifier?.removeListener(_activateCurrentItemMusic);
_itemIndexNotifier = nextNotifier;
_itemIndexNotifier?.addListener(_activateCurrentItemMusic);
- WidgetsBinding.instance.addPostFrameCallback((_) {
- if (mounted) _activateCurrentItemMusic();
- });
+ _activateCurrentItemMusic();
}
@override
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
index 04f2eb781a..c18ccaed9d 100644
--- a/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
+++ b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
@@ -212,11 +212,6 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
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
index 859e21d9de..d8df9c675e 100644
--- a/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
+++ b/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
@@ -37,14 +37,4 @@ void main() {
everyElement("track-1"),
);
});
-
- test("empty track list produces no assignments", () {
- expect(
- assignMemoryMusicTracks(
- memoryIDs: memoryIDs,
- tracks: const <MemoryMusicTrack>[],
- ),
- isEmpty,
- );
- });
}