Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Separate memory audio mute settings

ashil-pilote7ef9d237254
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 d21bca33e0..07c9271ed9 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
@@ -97,7 +97,7 @@ class MemoryMusicController extends ChangeNotifier {
await _persistMuted(isMuted);
} catch (error, stackTrace) {
_logger.warning(
- "Failed to persist memories audio mute state",
+ "Failed to persist memories music mute state",
error,
stackTrace,
);
diff --git a/mobile/apps/photos/lib/settings/local_settings.dart b/mobile/apps/photos/lib/settings/local_settings.dart
index 66d979a42f..aac7f3e09b 100644
--- a/mobile/apps/photos/lib/settings/local_settings.dart
+++ b/mobile/apps/photos/lib/settings/local_settings.dart
@@ -88,7 +88,8 @@ 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 _memoriesMusicMutedKey = "memories.audio_muted";
+ static const _memoriesVideoMutedKey = "memories.video_muted";
static const _albumSlideshowDurationSecondsKey =
"album_slideshow.duration_seconds";
static const _albumSlideshowBlurredBackgroundKey =
@@ -641,12 +642,20 @@ class LocalSettings {
return _prefs.getBool(isMutedKey) ?? false;
}
- Future<void> setMemoriesAudioMuted(bool value) async {
- await _prefs.setBool(_memoriesAudioMutedKey, value);
+ Future<void> setMemoriesMusicMuted(bool value) async {
+ await _prefs.setBool(_memoriesMusicMutedKey, value);
}
- bool isMemoriesAudioMuted() {
- return _prefs.getBool(_memoriesAudioMutedKey) ?? false;
+ bool isMemoriesMusicMuted() {
+ return _prefs.getBool(_memoriesMusicMutedKey) ?? false;
+ }
+
+ Future<void> setMemoriesVideoMuted(bool value) async {
+ await _prefs.setBool(_memoriesVideoMutedKey, value);
+ }
+
+ bool isMemoriesVideoMuted() {
+ return _prefs.getBool(_memoriesVideoMutedKey) ?? false;
}
int get albumSlideshowDurationSeconds =>
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 654b6bdfb7..c7a9e03768 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,7 +462,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
);
if (index == null) return;
final file = inheritedData.memories[index].file;
- final controller = MemoryMusicScope.maybeOf(
+ final controller = MemoryAudioScope.maybeOf(
context,
listen: false,
)?.controller;
@@ -678,7 +678,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
void _pauseViewer() {
if (!mounted) return;
_isMusicViewerActionPaused = true;
- final controller = MemoryMusicScope.maybeOf(
+ final controller = MemoryAudioScope.maybeOf(
context,
listen: false,
)?.controller;
@@ -694,7 +694,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
_isMusicViewerActionPaused = false;
Bus.instance.fire(ResumeVideoEvent());
_toggleAnimation(pause: false);
- final controller = MemoryMusicScope.maybeOf(
+ final controller = MemoryAudioScope.maybeOf(
context,
listen: false,
)?.controller;
@@ -706,7 +706,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
@override
Widget build(BuildContext context) {
final inheritedData = FullScreenMemoryData.of(context);
- final memoryMusic = MemoryMusicScope.maybeOf(context);
+ final memoryAudio = MemoryAudioScope.maybeOf(context);
if (inheritedData == null || inheritedData.memories.isEmpty) {
return const SizedBox.shrink();
}
@@ -806,7 +806,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
color: Colors.transparent,
),
isFromMemories: true,
- isAudioMutedOverride: memoryMusic?.isMuted,
+ isAudioMutedOverride: memoryAudio?.isVideoMuted,
shouldDisableScroll: (isLocked) {
_isMediaInteractionLocked = isLocked;
widget.onMediaInteractionLockChanged?.call(
@@ -847,7 +847,7 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
_MemoryViewerScrimsAndCaption(
socialControlsVisible: _socialControlsVisible,
),
- if (memoryMusic != null)
+ if (memoryAudio != null)
Positioned(
left:
MediaQuery.paddingOf(context).left +
@@ -856,7 +856,22 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
MediaQuery.paddingOf(context).bottom +
kMemoryBottomActionBarHeight +
_socialToActionBarGap,
- child: _MemoryMusicMuteButton(memoryMusic),
+ child: ValueListenableBuilder<int>(
+ valueListenable: inheritedData.indexNotifier,
+ builder: (context, index, _) {
+ final safeIndex = _clampedMemoryIndex(
+ index,
+ inheritedData.memories.length,
+ );
+ if (safeIndex == null) return const SizedBox.shrink();
+ return _MemoryAudioMuteButton(
+ memoryAudio,
+ isVideo:
+ inheritedData.memories[safeIndex].file.fileType ==
+ FileType.video,
+ );
+ },
+ ),
),
ValueListenableBuilder<int>(
valueListenable: inheritedData.indexNotifier,
@@ -1077,14 +1092,17 @@ class _MemoryActionButton extends StatelessWidget {
}
}
-class _MemoryMusicMuteButton extends StatelessWidget {
- final MemoryMusicScope memoryMusic;
+class _MemoryAudioMuteButton extends StatelessWidget {
+ final MemoryAudioScope memoryAudio;
+ final bool isVideo;
- const _MemoryMusicMuteButton(this.memoryMusic);
+ const _MemoryAudioMuteButton(this.memoryAudio, {required this.isVideo});
@override
Widget build(BuildContext context) {
- final isMuted = memoryMusic.isMuted;
+ final isMuted = isVideo
+ ? memoryAudio.isVideoMuted
+ : memoryAudio.isMusicMuted;
return SizedBox.square(
dimension: 48,
child: IconButton(
@@ -1099,7 +1117,11 @@ class _MemoryMusicMuteButton extends StatelessWidget {
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
overlayColor: Colors.transparent,
),
- onPressed: () => unawaited(memoryMusic.toggleMuted()),
+ onPressed: () => unawaited(
+ isVideo
+ ? memoryAudio.toggleVideoMuted()
+ : memoryAudio.toggleMusicMuted(),
+ ),
icon: DecoratedBox(
decoration: const BoxDecoration(
color: Color(0x66000000),
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
index ef4dbd214e..72eb7aacf3 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
@@ -27,12 +27,14 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
static final _logger = Logger("MemoryMusicSession");
MemoryMusicController? _controller;
- late bool _isMuted;
+ late bool _isMusicMuted;
+ late bool _isVideoMuted;
@override
void initState() {
super.initState();
- _isMuted = localSettings.isMemoriesAudioMuted();
+ _isMusicMuted = localSettings.isMemoriesMusicMuted();
+ _isVideoMuted = localSettings.isMemoriesVideoMuted();
WidgetsBinding.instance.addObserver(this);
unawaited(_initialize());
}
@@ -46,8 +48,8 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
);
final controller = MemoryMusicController(
assignments: assignments,
- initiallyMuted: _isMuted,
- persistMuted: localSettings.setMemoriesAudioMuted,
+ initiallyMuted: _isMusicMuted,
+ persistMuted: localSettings.setMemoriesMusicMuted,
player: JustAudioMemoryMusicPlayer(),
tracks: tracks,
);
@@ -58,20 +60,34 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
setState(() => _controller = controller);
}
- Future<void> _toggleMuted() async {
+ Future<void> _toggleMusicMuted() async {
final controller = _controller;
if (controller != null) {
await controller.toggleMuted();
return;
}
- final isMuted = !_isMuted;
- setState(() => _isMuted = isMuted);
+ final isMuted = !_isMusicMuted;
+ setState(() => _isMusicMuted = isMuted);
try {
- await localSettings.setMemoriesAudioMuted(isMuted);
+ await localSettings.setMemoriesMusicMuted(isMuted);
} catch (error, stackTrace) {
_logger.warning(
- "Failed to persist memories audio mute state",
+ "Failed to persist memories music mute state",
+ error,
+ stackTrace,
+ );
+ }
+ }
+
+ Future<void> _toggleVideoMuted() async {
+ final isMuted = !_isVideoMuted;
+ setState(() => _isVideoMuted = isMuted);
+ try {
+ await localSettings.setMemoriesVideoMuted(isMuted);
+ } catch (error, stackTrace) {
+ _logger.warning(
+ "Failed to persist memories video mute state",
error,
stackTrace,
);
@@ -95,39 +111,47 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
@override
Widget build(BuildContext context) {
- return MemoryMusicScope(
+ return MemoryAudioScope(
controller: _controller,
- isMuted: _isMuted,
- toggleMuted: _toggleMuted,
+ isMusicMuted: _isMusicMuted,
+ isVideoMuted: _isVideoMuted,
+ toggleMusicMuted: _toggleMusicMuted,
+ toggleVideoMuted: _toggleVideoMuted,
child: widget.child,
);
}
}
-class MemoryMusicScope extends InheritedNotifier<MemoryMusicController> {
- final bool _isMuted;
- final Future<void> Function() toggleMuted;
+class MemoryAudioScope extends InheritedNotifier<MemoryMusicController> {
+ final bool _isMusicMuted;
+ final bool isVideoMuted;
+ final Future<void> Function() toggleMusicMuted;
+ final Future<void> Function() toggleVideoMuted;
- const MemoryMusicScope({
+ const MemoryAudioScope({
required MemoryMusicController? controller,
- required bool isMuted,
- required this.toggleMuted,
+ required bool isMusicMuted,
+ required this.isVideoMuted,
+ required this.toggleMusicMuted,
+ required this.toggleVideoMuted,
required super.child,
super.key,
- }) : _isMuted = isMuted,
+ }) : _isMusicMuted = isMusicMuted,
super(notifier: controller);
MemoryMusicController? get controller => notifier;
- bool get isMuted => notifier?.isMuted ?? _isMuted;
+ bool get isMusicMuted => notifier?.isMuted ?? _isMusicMuted;
- static MemoryMusicScope? maybeOf(BuildContext context, {bool listen = true}) {
+ static MemoryAudioScope? maybeOf(BuildContext context, {bool listen = true}) {
return listen
- ? context.dependOnInheritedWidgetOfExactType<MemoryMusicScope>()
- : context.getInheritedWidgetOfExactType<MemoryMusicScope>();
+ ? context.dependOnInheritedWidgetOfExactType<MemoryAudioScope>()
+ : context.getInheritedWidgetOfExactType<MemoryAudioScope>();
}
@override
- bool updateShouldNotify(MemoryMusicScope oldWidget) =>
- _isMuted != oldWidget._isMuted || super.updateShouldNotify(oldWidget);
+ bool updateShouldNotify(MemoryAudioScope oldWidget) =>
+ _isMusicMuted != oldWidget._isMusicMuted ||
+ isVideoMuted != oldWidget.isVideoMuted ||
+ super.updateShouldNotify(oldWidget);
}
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.dart
index 6cfe8fdbea..98ab7c6f8d 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
@@ -108,7 +108,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {
@override
void didChangeDependencies() {
super.didChangeDependencies();
- final musicController = MemoryMusicScope.maybeOf(context)?.controller;
+ final musicController = MemoryAudioScope.maybeOf(context)?.controller;
if (widget.isActive) {
unawaited(musicController?.setViewerActionPaused(true));
}
@@ -124,7 +124,7 @@ class _MemoryLanePageV2State extends State<MemoryLanePageV2> {
}
unawaited(_play(0));
unawaited(
- MemoryMusicScope.maybeOf(
+ MemoryAudioScope.maybeOf(
context,
listen: false,
)?.controller?.setViewerActionPaused(true),
diff --git a/mobile/apps/photos/test/settings/local_settings_memories_audio_test.dart b/mobile/apps/photos/test/settings/local_settings_memories_audio_test.dart
new file mode 100644
index 0000000000..d5c7c6a5ac
--- /dev/null
+++ b/mobile/apps/photos/test/settings/local_settings_memories_audio_test.dart
@@ -0,0 +1,42 @@
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/settings/local_settings.dart";
+import "package:shared_preferences/shared_preferences.dart";
+
+void main() {
+ TestWidgetsFlutterBinding.ensureInitialized();
+
+ test(
+ "existing memories audio preference remains the music preference",
+ () async {
+ SharedPreferences.setMockInitialValues({"memories.audio_muted": true});
+ final settings = LocalSettings(await SharedPreferences.getInstance());
+
+ expect(settings.isMemoriesMusicMuted(), isTrue);
+ expect(settings.isMemoriesVideoMuted(), isFalse);
+ },
+ );
+
+ test(
+ "memories video mute is independent from music and file videos",
+ () async {
+ SharedPreferences.setMockInitialValues({});
+ final settings = LocalSettings(await SharedPreferences.getInstance());
+
+ await settings.setMemoriesMusicMuted(true);
+ expect(settings.isMemoriesMusicMuted(), isTrue);
+ expect(settings.isMemoriesVideoMuted(), isFalse);
+ expect(settings.isMuted(), isFalse);
+
+ await settings.setMemoriesVideoMuted(true);
+ expect(settings.isMemoriesMusicMuted(), isTrue);
+ expect(settings.isMemoriesVideoMuted(), isTrue);
+ expect(settings.isMuted(), isFalse);
+
+ await settings.setIsMuted(true);
+ await settings.setMemoriesVideoMuted(false);
+ expect(settings.isMemoriesMusicMuted(), isTrue);
+ expect(settings.isMemoriesVideoMuted(), isFalse);
+ expect(settings.isMuted(), isTrue);
+ },
+ );
+}
diff --git a/mobile/apps/photos/test/ui/home/memories/memory_music_session_test.dart b/mobile/apps/photos/test/ui/home/memories/memory_music_session_test.dart
index 027aa136d8..741a6f54fa 100644
--- a/mobile/apps/photos/test/ui/home/memories/memory_music_session_test.dart
+++ b/mobile/apps/photos/test/ui/home/memories/memory_music_session_test.dart
@@ -3,46 +3,71 @@ import "package:flutter_test/flutter_test.dart";
import "package:photos/ui/home/memories/memory_music_session.dart";
void main() {
- testWidgets("updates mute state before the controller is ready", (
- tester,
- ) async {
- var isMuted = true;
+ testWidgets("keeps music and video mute states independent", (tester) async {
+ var isMusicMuted = true;
+ var isVideoMuted = false;
await tester.pumpWidget(
MaterialApp(
home: StatefulBuilder(
builder: (context, setState) {
- return MemoryMusicScope(
+ return MemoryAudioScope(
controller: null,
- isMuted: isMuted,
- toggleMuted: () async {
- setState(() => isMuted = !isMuted);
+ isMusicMuted: isMusicMuted,
+ isVideoMuted: isVideoMuted,
+ toggleMusicMuted: () async {
+ setState(() => isMusicMuted = !isMusicMuted);
},
- child: const _MuteButton(),
+ toggleVideoMuted: () async {
+ setState(() => isVideoMuted = !isVideoMuted);
+ },
+ child: const _MuteButtons(),
);
},
),
),
);
- expect(find.text("muted"), findsOneWidget);
+ expect(find.text("music muted"), findsOneWidget);
+ expect(find.text("video unmuted"), findsOneWidget);
+
+ await tester.tap(find.byKey(const ValueKey("music-mute")));
+ await tester.pump();
+
+ expect(find.text("music unmuted"), findsOneWidget);
+ expect(find.text("video unmuted"), findsOneWidget);
- await tester.tap(find.byType(TextButton));
+ await tester.tap(find.byKey(const ValueKey("video-mute")));
await tester.pump();
- expect(find.text("unmuted"), findsOneWidget);
+ expect(find.text("music unmuted"), findsOneWidget);
+ expect(find.text("video muted"), findsOneWidget);
});
}
-class _MuteButton extends StatelessWidget {
- const _MuteButton();
+class _MuteButtons extends StatelessWidget {
+ const _MuteButtons();
@override
Widget build(BuildContext context) {
- final memoryMusic = MemoryMusicScope.maybeOf(context)!;
- return TextButton(
- onPressed: memoryMusic.toggleMuted,
- child: Text(memoryMusic.isMuted ? "muted" : "unmuted"),
+ final memoryAudio = MemoryAudioScope.maybeOf(context)!;
+ return Column(
+ children: [
+ TextButton(
+ key: const ValueKey("music-mute"),
+ onPressed: memoryAudio.toggleMusicMuted,
+ child: Text(
+ memoryAudio.isMusicMuted ? "music muted" : "music unmuted",
+ ),
+ ),
+ TextButton(
+ key: const ValueKey("video-mute"),
+ onPressed: memoryAudio.toggleVideoMuted,
+ child: Text(
+ memoryAudio.isVideoMuted ? "video muted" : "video unmuted",
+ ),
+ ),
+ ],
);
}
}