π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Memory lane v2 music support and always-visible dots
aspizu6262fa943fa4
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 4431446be3..5b5ca90e02 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@@ -462,17 +462,10 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {);if (index == null) return;final file = inheritedData.memories[index].file;- final controller = MemoryAudioScope.maybeOf(- context,- listen: false,- )?.controller;- if (controller == null) return;- unawaited(controller.setViewerActionPaused(_isMusicViewerActionPaused));- unawaited(- controller.activateMemory(- widget.memoryID,- currentItemIsVideo: file.fileType == FileType.video,- ),+ MemoryAudioScope.maybeOf(context, listen: false)?.activateMusic(+ widget.memoryID,+ currentItemIsVideo: file.fileType == FileType.video,+ viewerActionPaused: _isMusicViewerActionPaused,);}@@ -678,13 +671,10 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {void _pauseViewer() {if (!mounted) return;_isMusicViewerActionPaused = true;- final controller = MemoryAudioScope.maybeOf(+ MemoryAudioScope.maybeOf(context,listen: false,- )?.controller;- if (controller != null) {- unawaited(controller.setViewerActionPaused(true));- }+ )?.setMusicViewerActionPaused(true);_toggleAnimation(pause: true);Bus.instance.fire(PauseVideoEvent());}@@ -694,13 +684,10 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {_isMusicViewerActionPaused = false;Bus.instance.fire(ResumeVideoEvent());_toggleAnimation(pause: false);- final controller = MemoryAudioScope.maybeOf(+ MemoryAudioScope.maybeOf(context,listen: false,- )?.controller;- if (controller != null) {- unawaited(controller.setViewerActionPaused(false));- }+ )?.setMusicViewerActionPaused(false);}@override@@ -864,9 +851,9 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {inheritedData.memories.length,);if (safeIndex == null) return const SizedBox.shrink();- return _MemoryAudioMuteButton(+ return MemoryAudioMuteButton(memoryAudio,- isVideo:+ mutesVideoAudio:inheritedData.memories[safeIndex].file.fileType ==FileType.video,);@@ -1092,59 +1079,6 @@ class _MemoryActionButton extends StatelessWidget {}}-class _MemoryAudioMuteButton extends StatelessWidget {- final MemoryAudioScope memoryAudio;- final bool isVideo;-- const _MemoryAudioMuteButton(this.memoryAudio, {required this.isVideo});-- @override- Widget build(BuildContext context) {- final isMuted = isVideo- ? memoryAudio.isVideoMuted- : memoryAudio.isMusicMuted;- return SizedBox.square(- dimension: 48,- child: IconButton(- tooltip: isMuted- ? context.strings.unmuteAudio- : context.strings.muteAudio,- padding: const EdgeInsets.all(7),- style: IconButton.styleFrom(- shape: const CircleBorder(),- minimumSize: const Size.square(48),- maximumSize: const Size.square(48),- tapTargetSize: MaterialTapTargetSize.shrinkWrap,- overlayColor: Colors.transparent,- ),- onPressed: () => unawaited(- isVideo- ? memoryAudio.toggleVideoMuted()- : memoryAudio.toggleMusicMuted(),- ),- icon: DecoratedBox(- decoration: const BoxDecoration(- color: Color(0x66000000),- shape: BoxShape.circle,- ),- child: SizedBox.square(- dimension: 34,- child: Center(- child: HugeIcon(- icon: isMuted- ? HugeIcons.strokeRoundedVolumeOff- : HugeIcons.strokeRoundedVolumeHigh,- color: Colors.white,- size: 18,- ),- ),- ),- ),- ),- );- }-}-class _MemoryTopOverlay extends StatelessWidget {final String title;final VoidCallback onClose;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.dartindex 72eb7aacf3..aef2d8be69 100644--- a/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart+++ b/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart@@ -1,6 +1,8 @@import "dart:async";+import "package:ente_strings/ente_strings.dart";import "package:flutter/material.dart";+import "package:hugeicons/hugeicons.dart";import "package:logging/logging.dart";import "package:photos/service_locator.dart";import "package:photos/services/memories/just_audio_memory_music_player.dart";@@ -143,6 +145,26 @@ class MemoryAudioScope extends InheritedNotifier<MemoryMusicController> {bool get isMusicMuted => notifier?.isMuted ?? _isMusicMuted;+ void activateMusic(+ String memoryID, {+ required bool currentItemIsVideo,+ bool viewerActionPaused = false,+ }) {+ final controller = this.controller;+ if (controller == null) return;+ unawaited(controller.setViewerActionPaused(viewerActionPaused));+ unawaited(+ controller.activateMemory(+ memoryID,+ currentItemIsVideo: currentItemIsVideo,+ ),+ );+ }++ void setMusicViewerActionPaused(bool paused) {+ unawaited(controller?.setViewerActionPaused(paused));+ }+static MemoryAudioScope? maybeOf(BuildContext context, {bool listen = true}) {return listen? context.dependOnInheritedWidgetOfExactType<MemoryAudioScope>()@@ -155,3 +177,60 @@ class MemoryAudioScope extends InheritedNotifier<MemoryMusicController> {isVideoMuted != oldWidget.isVideoMuted ||super.updateShouldNotify(oldWidget);}++class MemoryAudioMuteButton extends StatelessWidget {+ final MemoryAudioScope memoryAudio;+ final bool mutesVideoAudio;++ const MemoryAudioMuteButton(+ this.memoryAudio, {+ this.mutesVideoAudio = false,+ super.key,+ });++ @override+ Widget build(BuildContext context) {+ final isMuted = mutesVideoAudio+ ? memoryAudio.isVideoMuted+ : memoryAudio.isMusicMuted;+ return SizedBox.square(+ dimension: 48,+ child: IconButton(+ tooltip: isMuted+ ? context.strings.unmuteAudio+ : context.strings.muteAudio,+ padding: const EdgeInsets.all(7),+ style: IconButton.styleFrom(+ shape: const CircleBorder(),+ minimumSize: const Size.square(48),+ maximumSize: const Size.square(48),+ tapTargetSize: MaterialTapTargetSize.shrinkWrap,+ overlayColor: Colors.transparent,+ ),+ onPressed: () => unawaited(+ mutesVideoAudio+ ? memoryAudio.toggleVideoMuted()+ : memoryAudio.toggleMusicMuted(),+ ),+ icon: DecoratedBox(+ decoration: const BoxDecoration(+ color: Color(0x66000000),+ shape: BoxShape.circle,+ ),+ child: SizedBox.square(+ dimension: 34,+ child: Center(+ child: HugeIcon(+ icon: isMuted+ ? HugeIcons.strokeRoundedVolumeOff+ : HugeIcons.strokeRoundedVolumeHigh,+ color: Colors.white,+ size: 18,+ ),+ ),+ ),+ ),+ ),+ );+ }+}diff --git a/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page_v2.dart b/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page_v2.dartindex 14aa9b7300..7b4df9a01f 100644--- a/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page_v2.dart+++ b/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page_v2.dart@@ -101,6 +101,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {int i = 0;bool _hasMarkedScheduleSeen = false;MemoryLaneSchedule? _schedule;+ bool _isMusicViewerActionPaused = false;@overridevoid initState() {@@ -111,12 +112,37 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {@overridevoid didChangeDependencies() {super.didChangeDependencies();- final musicController = MemoryAudioScope.maybeOf(context)?.controller;if (widget.isActive) {- unawaited(musicController?.setViewerActionPaused(true));+ _syncMusic();}}+ void _syncMusic() {+ if (!widget.isActive) return;+ final scope = MemoryAudioScope.maybeOf(context, listen: false);+ if (scope == null) return;+ if (_entries.isEmpty) {+ scope.setMusicViewerActionPaused(true);+ return;+ }+ scope.activateMusic(+ "memoryLane_${widget.personId}",+ currentItemIsVideo: false,+ viewerActionPaused: _isMusicViewerActionPaused,+ );+ }++ void _setMusicViewerActionPaused(bool paused) {+ _isMusicViewerActionPaused = paused;+ if (!mounted || !widget.isActive) return;+ MemoryAudioScope.maybeOf(+ context,+ listen: false,+ )?.setMusicViewerActionPaused(+ _isMusicViewerActionPaused || _entries.isEmpty,+ );+ }+@overridevoid didUpdateWidget(covariant MemoryLanePageV2 oldWidget) {super.didUpdateWidget(oldWidget);@@ -126,12 +152,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {return;}unawaited(_play(0));- unawaited(- MemoryAudioScope.maybeOf(- context,- listen: false,- )?.controller?.setViewerActionPaused(true),- );+ _syncMusic();}@override@@ -183,6 +204,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {return _loadEntry(entry, files[entry.fileId]!);},);+ _syncMusic();unawaited(_play(0));} catch (error) {if (!mounted ||@@ -247,6 +269,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {void _onPhotoPointerEnd(PointerEvent event) {if (event.pointer != _photoPointer) return;_photoPointer = null;+ _setMusicViewerActionPaused(false);unawaited(_play(i, fastTransition: true));}@@ -348,6 +371,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {Widget build(BuildContext context) {final screenSize = MediaQuery.sizeOf(context);final safePadding = MediaQuery.paddingOf(context);+ final memoryAudio = MemoryAudioScope.maybeOf(context);final toolbarTopPadding = widget.isFromMemoriesStrip? math.max(40.0 - safePadding.top, 0.0) + 16: 16.0;@@ -604,6 +628,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {if (_photoPointer != null || !widget.isActive) return;_photoPointer = event.pointer;_pause();+ _setMusicViewerActionPaused(true);},onPointerUp: _onPhotoPointerEnd,onPointerCancel: _onPhotoPointerEnd,@@ -794,8 +819,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {),SizedBox(height: screenSize.height * 0.01),],- if (_entries.isNotEmpty &&- !widget.isFromMemoriesStrip)+ if (_entries.isNotEmpty)ConstrainedBox(constraints: const BoxConstraints(minHeight: 32),child: Padding(@@ -914,12 +938,32 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {),),),+ if (memoryAudio != null && _entries.isNotEmpty)+ Positioned(+ left: safePadding.left + 16,+ bottom: safePadding.bottom + screenSize.height * 0.055 - 8,+ child: MemoryAudioMuteButton(memoryAudio),+ ),],);},);}+ Future<void> _runWithViewerPaused(Future<void> Function() action) async {+ final wasPlaying = _playbackToken != null;+ _pause();+ _setMusicViewerActionPaused(true);+ try {+ await action();+ } finally {+ _setMusicViewerActionPaused(false);+ if (mounted && wasPlaying && ModalRoute.of(context)?.isCurrent == true) {+ unawaited(_play(i));+ }+ }+ }+Future<void> _onShareTap() async {final timeline = _timeline;final person = widget.person;@@ -941,46 +985,35 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {);}final dialog = createProgressDialog(context, l10n.creatingLink);- final wasPlaying = _playbackToken != null;- _pause();-- try {- await dialog.show();- final shareLinkData = await MemoryShareService.instance- .getOrCreateMemoryLaneLink(- entries: timeline.entries,- title: title,- personId: person.remoteID,- personName: person.data.name,- birthDate: person.data.birthDate,- );- await dialog.hide();- if (!mounted) return;- await shareText(- formatMemoryShareText(title, shareLinkData.$1),- context: context,- );- } catch (e) {- await dialog.hide();- if (!mounted) return;- await showGenericErrorBottomSheet(context: context, error: e);- } finally {- if (mounted && wasPlaying && ModalRoute.of(context)?.isCurrent == true) {- unawaited(_play(i));+ await _runWithViewerPaused(() async {+ try {+ await dialog.show();+ final shareLinkData = await MemoryShareService.instance+ .getOrCreateMemoryLaneLink(+ entries: timeline.entries,+ title: title,+ personId: person.remoteID,+ personName: person.data.name,+ birthDate: person.data.birthDate,+ );+ await dialog.hide();+ if (!mounted) return;+ await shareText(+ formatMemoryShareText(title, shareLinkData.$1),+ context: context,+ );+ } catch (e) {+ await dialog.hide();+ if (!mounted) return;+ await showGenericErrorBottomSheet(context: context, error: e);}- }+ });}Future<void> _onDateTap(EnteFile file) async {- final wasPlaying = _playbackToken != null;- _pause();- try {- await routeToPage(context, JumpToDateGallery(fileToJumpTo: file));- } finally {- if (mounted && wasPlaying && ModalRoute.of(context)?.isCurrent == true) {- unawaited(_play(i));- }- }+ await _runWithViewerPaused(+ () => routeToPage(context, JumpToDateGallery(fileToJumpTo: file)),+ );}}