Skip to content

armgit / ente

Public Imported from GitHub
0

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

refactor(photos): simplify memory music controller access

ashilkn7883c6ca6f6b
diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dart
index 809523ea8c..83f7ccc795 100644
--- a/mobile/apps/photos/lib/services/memories_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart
@@ -19,7 +19,6 @@ 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";
@@ -1384,7 +1383,7 @@ class MemoriesCacheService {
await _routeToPage(
MemoryMusicSession(
memoryIDs: <String>[selectedPersonMemory.id],
- builder: (musicController) => FullScreenMemoryDataUpdater(
+ child: FullScreenMemoryDataUpdater(
initialIndex: 0,
memories: selectedPersonMemory.memories,
child: Container(
@@ -1394,15 +1393,8 @@ class MemoriesCacheService {
child: FullScreenMemory(
selectedPersonMemory.title,
0,
+ memoryID: selectedPersonMemory.id,
isActive: true,
- onCurrentItemChanged: (file) {
- unawaited(
- musicController.activateMemory(
- selectedPersonMemory.id,
- currentItemIsVideo: file.fileType == FileType.video,
- ),
- );
- },
),
),
),
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 d3253869e0..d96b367396 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,9 +1,6 @@
-import "dart:async";
-
import 'package:flutter/material.dart';
import "package:photos/core/event_bus.dart";
import "package:photos/events/pause_video_event.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";
@@ -57,7 +54,7 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
Widget build(BuildContext context) {
return MemoryMusicSession(
memoryIDs: _memories.map((memory) => memory.id).toList(),
- builder: (musicController) => Container(
+ child: Container(
width: double.infinity,
height: double.infinity,
color: backgroundColorDark,
@@ -79,15 +76,8 @@ class _AllMemoriesPageState extends State<AllMemoriesPage>
child: FullScreenMemory(
smartMemory.title,
initialMemoryIndex,
+ memoryID: smartMemory.id,
isActive: index == _activePageIndex,
- onCurrentItemChanged: (file) {
- unawaited(
- musicController.activateMemory(
- smartMemory.id,
- currentItemIsVideo: file.fileType == FileType.video,
- ),
- );
- },
onNextMemory: index < _memories.length - 1
? () => pageController.nextPage(
duration: const Duration(milliseconds: 675),
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 ac6f49e359..4e8f2eb87e 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
@@ -314,16 +314,16 @@ class FullScreenMemoryData extends InheritedWidget {
class FullScreenMemory extends StatefulWidget {
final String title;
final int initialIndex;
+ final String memoryID;
final bool isActive;
- final ValueChanged<EnteFile>? onCurrentItemChanged;
final VoidCallback? onNextMemory;
final VoidCallback? onPreviousMemory;
const FullScreenMemory(
this.title,
this.initialIndex, {
+ required this.memoryID,
required this.isActive,
- this.onCurrentItemChanged,
this.onNextMemory,
this.onPreviousMemory,
super.key,
@@ -425,16 +425,16 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
if (identical(nextNotifier, _itemIndexNotifier)) {
if (!identical(previousMemoryData, memoryData)) {
WidgetsBinding.instance.addPostFrameCallback((_) {
- if (mounted) _reportCurrentItem();
+ if (mounted) _activateCurrentItemMusic();
});
}
return;
}
- _itemIndexNotifier?.removeListener(_reportCurrentItem);
+ _itemIndexNotifier?.removeListener(_activateCurrentItemMusic);
_itemIndexNotifier = nextNotifier;
- _itemIndexNotifier?.addListener(_reportCurrentItem);
+ _itemIndexNotifier?.addListener(_activateCurrentItemMusic);
WidgetsBinding.instance.addPostFrameCallback((_) {
- if (mounted) _reportCurrentItem();
+ if (mounted) _activateCurrentItemMusic();
});
}
@@ -443,12 +443,12 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
super.didUpdateWidget(oldWidget);
if (oldWidget.isActive == widget.isActive) return;
_syncAnimationState();
- if (widget.isActive) _reportCurrentItem();
+ if (widget.isActive) _activateCurrentItemMusic();
}
@override
void dispose() {
- _itemIndexNotifier?.removeListener(_reportCurrentItem);
+ _itemIndexNotifier?.removeListener(_activateCurrentItemMusic);
hasPointerOnScreenNotifier.removeListener(_hasPointerListener);
_detailSheetEventSubscription.cancel();
_captionUpdatedSubscription.cancel();
@@ -456,8 +456,8 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
super.dispose();
}
- void _reportCurrentItem() {
- if (!mounted) return;
+ void _activateCurrentItemMusic() {
+ if (!mounted || !widget.isActive) return;
final inheritedData = _memoryData;
if (inheritedData == null) return;
final index = _clampedMemoryIndex(
@@ -466,7 +466,12 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
);
if (index == null) return;
final file = inheritedData.memories[index].file;
- if (widget.isActive) widget.onCurrentItemChanged?.call(file);
+ unawaited(
+ MemoryMusicScope.of(context, listen: false).activateMemory(
+ widget.memoryID,
+ currentItemIsVideo: file.fileType == FileType.video,
+ ),
+ );
}
/// Used to check if user has touched the screen and then to pause animation
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 85a52d9f78..fec346c956 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
@@ -8,11 +8,11 @@ import "package:photos/services/memories/memory_music_selector.dart";
class MemoryMusicSession extends StatefulWidget {
final List<String> memoryIDs;
- final Widget Function(MemoryMusicController controller) builder;
+ final Widget child;
const MemoryMusicSession({
required this.memoryIDs,
- required this.builder,
+ required this.child,
super.key,
});
@@ -53,10 +53,7 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
@override
Widget build(BuildContext context) {
- return MemoryMusicScope(
- controller: _controller,
- child: widget.builder(_controller),
- );
+ return MemoryMusicScope(controller: _controller, child: widget.child);
}
}