π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos): refine memories music integration
ashilkn7a965873ab13
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart b/mobile/apps/photos/lib/services/memories/memory_music_catalog.dartindex 9cf2c820fc..0514a25129 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart@@ -2,12 +2,12 @@ import "package:photos/models/memories/memory_music_track.dart";class MemoryMusicCatalog {final List<MemoryMusicTrack> tracks;- late final Map<String, MemoryMusicTrack> _tracksByID;+ final Map<String, MemoryMusicTrack> _tracksByID =+ <String, MemoryMusicTrack>{};- MemoryMusicCatalog(Iterable<MemoryMusicTrack> tracks)- : tracks = List.unmodifiable(tracks) {- _tracksByID = <String, MemoryMusicTrack>{};- for (final track in this.tracks) {+ MemoryMusicCatalog(Iterable<MemoryMusicTrack> inputTracks)+ : tracks = List.unmodifiable(inputTracks) {+ for (final track in tracks) {if (track.id.isEmpty) {throw ArgumentError.value(track.id, "track.id", "Must not be empty");}diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dartindex 72c5df26fa..c44d5a82b2 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart@@ -3,7 +3,7 @@ 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";+import "package:photos/services/memories/memory_music_player.dart";enum _MemoryMusicPlaybackStatus { idle, loading, ready }@@ -71,7 +71,7 @@ class MemoryMusicController extends ChangeNotifier {if (!_isCurrentLoad(generation)) return;await _player.stop();if (!_isCurrentLoad(generation)) return;- await const MemoryMusicSourceLoader().load(_player, track.source);+ await _player.load(track.source);if (!_isCurrentLoad(generation)) return;await _player.setLooping();await _player.setVolume(_isMuted ? 0.0 : 1.0);diff --git a/mobile/apps/photos/lib/services/memories/memory_music_source_loader.dart b/mobile/apps/photos/lib/services/memories/memory_music_player.dartsimilarity index 78%rename from mobile/apps/photos/lib/services/memories/memory_music_source_loader.dartrename to mobile/apps/photos/lib/services/memories/memory_music_player.dartindex 0d3a82e069..e22dc7be47 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_source_loader.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_player.dart@@ -5,7 +5,7 @@ import "package:photos/models/memories/memory_music_track.dart";abstract interface class MemoryMusicPlayer {Future<void> configureAudioSession();- Future<void> loadAsset(String assetPath);+ Future<void> load(MemoryMusicSource source);Future<void> setLooping();@@ -20,17 +20,6 @@ abstract interface class MemoryMusicPlayer {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;@@ -43,8 +32,11 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {}@override- Future<void> loadAsset(String assetPath) async {- await _player.setAsset(assetPath, preload: true);+ Future<void> load(MemoryMusicSource source) async {+ switch (source) {+ case AssetMemoryMusicSource(:final assetPath):+ await _player.setAsset(assetPath, preload: true);+ }}@overridediff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dartindex 25f28c106d..4ebfcb47f9 100644--- a/mobile/apps/photos/lib/services/memories_cache_service.dart+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart@@ -1319,7 +1319,7 @@ class MemoriesCacheService {bool found = false;memoryLoop:for (final memory in allMemories) {- if (memory.type == MemoryType.onThisDay) {+ if (memory.type == MemoryType.onThisDay && memory.memories.isNotEmpty) {found = true;break memoryLoop;}@@ -1352,7 +1352,8 @@ class MemoriesCacheService {for (final memory in allMemories) {if (memory is PeopleMemory &&(memory.isBirthday ?? false) &&- memory.personID == personID) {+ memory.personID == personID &&+ memory.memories.isNotEmpty) {personMemories.add(memory);}}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.dartindex 4e988fb11f..c8908d6175 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@@ -31,14 +31,21 @@ class AllMemoriesPage extends StatefulWidget {class _AllMemoriesPageState extends State<AllMemoriesPage>with SingleTickerProviderStateMixin {late PageController pageController;+ late final List<SmartMemory> _memories;+ late final int _initialPageIndex;late int _activePageIndex;final Map<String, FileType> _currentItemTypes = <String, FileType>{};@overridevoid initState() {super.initState();- _activePageIndex = widget.initialPageIndex;- pageController = PageController(initialPage: widget.initialPageIndex);+ final initialMemory = widget.allMemories[widget.initialPageIndex];+ _memories = widget.allMemories+ .where((memory) => memory.memories.isNotEmpty)+ .toList();+ _initialPageIndex = _memories.indexOf(initialMemory);+ _activePageIndex = _initialPageIndex;+ pageController = PageController(initialPage: _initialPageIndex);}@override@@ -49,11 +56,10 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>@overrideWidget build(BuildContext context) {- final initialPageIndex = widget.initialPageIndex;- final initialMemory = widget.allMemories[initialPageIndex];- final initialItemIndex = _initialItemIndexForPage(initialPageIndex);+ final initialMemory = _memories[_initialPageIndex];+ final initialItemIndex = _initialItemIndexForPage(_initialPageIndex);return MemoryMusicSession(- memories: widget.allMemories,+ memories: _memories,initialMemoryID: initialMemory.id,initialItemIsVideo:initialMemory.memories[initialItemIndex].file.fileType ==@@ -66,11 +72,11 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>controller: pageController,physics: const BouncingScrollPhysics(),hitTestBehavior: HitTestBehavior.translucent,- itemCount: widget.allMemories.length,+ itemCount: _memories.length,onPageChanged: (index) {Bus.instance.fire(PauseVideoEvent());setState(() => _activePageIndex = index);- final smartMemory = widget.allMemories[index];+ final smartMemory = _memories[index];final currentItemType =_currentItemTypes[smartMemory.id] ??smartMemory@@ -85,7 +91,7 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>);},itemBuilder: (context, index) {- final smartMemory = widget.allMemories[index];+ final smartMemory = _memories[index];final initialMemoryIndex = _initialItemIndexForPage(index);return FullScreenMemoryDataUpdater(initialIndex: initialMemoryIndex,@@ -103,7 +109,7 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>),);},- onNextMemory: index < widget.allMemories.length - 1+ onNextMemory: index < _memories.length - 1? () => pageController.nextPage(duration: const Duration(milliseconds: 675),curve: Curves.easeOutQuart,@@ -124,9 +130,8 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>}int _initialItemIndexForPage(int pageIndex) {- final memories = widget.allMemories[pageIndex].memories;- return widget.isFromWidgetOrNotifications &&- pageIndex == widget.initialPageIndex+ final memories = _memories[pageIndex].memories;+ return widget.isFromWidgetOrNotifications && pageIndex == _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.dartindex fdb44e741b..07fca9537b 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@@ -44,7 +44,7 @@ import "package:photos/ui/viewer/gallery/jump_to_date_gallery.dart";import "package:photos/utils/dialog_util.dart";import "package:photos/utils/share_util.dart";-const _socialRightInset = 24.0;+const _memoryOverlayHorizontalInset = 24.0;const _socialToActionBarGap = 38.0;const _memoryCaptionHorizontalInset = 16.0;const _memoryCaptionActionBarGap = 4.0;@@ -851,6 +851,16 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {_MemoryViewerScrimsAndCaption(socialControlsVisible: _socialControlsVisible,),+ Positioned(+ left:+ MediaQuery.paddingOf(context).left ++ _memoryOverlayHorizontalInset,+ bottom:+ MediaQuery.paddingOf(context).bottom ++ kMemoryBottomActionBarHeight ++ _socialToActionBarGap,+ child: const _MemoryMusicMuteButton(),+ ),ValueListenableBuilder<int>(valueListenable: inheritedData.indexNotifier,builder: (context, index, _) {@@ -861,7 +871,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {if (safeIndex == null) return const SizedBox.shrink();final padding = MediaQuery.paddingOf(context);return Positioned(- right: padding.right + _socialRightInset,+ right: padding.right + _memoryOverlayHorizontalInset,bottom:padding.bottom +kMemoryBottomActionBarHeight +@@ -1081,26 +1091,34 @@ class _MemoryMusicMuteButton extends StatelessWidget {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,+ return SizedBox(+ width: 47,+ height: 34,+ child: Center(+ child: SizedBox.square(+ dimension: 34,+ child: IconButton(+ tooltip: isMuted+ ? pendingTranslation("Unmute audio")+ : pendingTranslation("Mute audio"),+ padding: const EdgeInsets.all(8),+ style: IconButton.styleFrom(+ backgroundColor: const Color(0x66000000),+ shape: const CircleBorder(),+ minimumSize: const Size.square(34),+ maximumSize: const Size.square(34),+ 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: 18,+ ),+ ),),),);@@ -1248,8 +1266,6 @@ class _MemoryTopOverlay extends StatelessWidget {),),),- const SizedBox(width: 8),- const _MemoryMusicMuteButton(),if (showFavorite) ...[const SizedBox(width: 8),FavoriteWidget(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.dartindex d5f5542011..a82bd0cb67 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@@ -2,7 +2,7 @@ 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";+import "package:photos/services/memories/memory_music_player.dart";void main() {late _FakeMemoryMusicPlayer player;@@ -113,13 +113,16 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {Future<void> configureAudioSession() async {}@override- Future<void> loadAsset(String assetPath) async {+ Future<void> load(MemoryMusicSource source) async {loadAttempts++;if (failNextLoad) {failNextLoad = false;throw StateError("load failed");}- loadedAssets.add(assetPath);+ switch (source) {+ case AssetMemoryMusicSource(:final assetPath):+ loadedAssets.add(assetPath);+ }position = Duration.zero;}