Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] add scheduled memory lane card

Priyanshu Dangare54ad297e8f27
diff --git a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
index 25964c82ae..20eb305013 100644
--- a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
+++ b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
@@ -988,6 +988,36 @@ class MemoryLaneService {
);
}
+ Future<(Uint8List, Uint8List)?> getOldestAndNewestFaceCrops(
+ MemoryLanePersonTimeline timeline,
+ ) async {
+ Future<Uint8List?> getCrop(MemoryLaneEntry entry, EnteFile file) async {
+ final faces = await _mlDataDB.getFacesForGivenFileID(entry.fileId);
+ final face = faces?.firstWhereOrNull((f) => f.faceID == entry.faceId);
+ if (face == null) return null;
+ return (await getCachedFaceCrops(
+ file,
+ [face],
+ useFullFile: true,
+ useTempCache: false,
+ ))?[entry.faceId];
+ }
+
+ final oldest = timeline.entries.first;
+ final newest = timeline.entries.last;
+ final filesById = await getTimelineFiles([oldest.fileId, newest.fileId]);
+ final oldestFile = filesById[oldest.fileId];
+ final newestFile = filesById[newest.fileId];
+ if (oldestFile == null || newestFile == null) return null;
+
+ final (oldestCrop, newestCrop) = await (
+ getCrop(oldest, oldestFile),
+ getCrop(newest, newestFile),
+ ).wait;
+ if (oldestCrop == null || newestCrop == null) return null;
+ return (oldestCrop, newestCrop);
+ }
+
Future<void> _scheduleTimelinesForMemoriesStrip(
List<PersonEntity> persons,
) async {
diff --git a/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart b/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart
index 805300564b..2106930fd6 100644
--- a/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart
@@ -1,5 +1,6 @@
import "dart:async";
import "dart:math";
+import "dart:typed_data";
import "package:collection/collection.dart";
import 'package:flutter/material.dart';
@@ -9,12 +10,17 @@ import "package:photos/events/event.dart";
import "package:photos/events/memories_changed_event.dart";
import "package:photos/events/memories_setting_changed.dart";
import "package:photos/events/memory_seen_event.dart";
+import "package:photos/events/ml_consent_changed_event.dart";
import "package:photos/models/memories/smart_memory.dart";
+import "package:photos/models/memory_lane/memory_lane_models.dart";
import "package:photos/service_locator.dart";
+import "package:photos/services/memory_lane/memory_lane_cache_service.dart";
+import "package:photos/services/memory_lane/memory_lane_service.dart";
import "package:photos/ui/home/memories/crafting_memories_card.dart";
import 'package:photos/ui/home/memories/memory_card.dart';
import "package:photos/ui/home/memories/memory_card_constants.dart";
import "package:photos/ui/home/memories/memory_cover_util.dart";
+import "package:photos/ui/home/memories/memory_lane_card.dart";
import "package:photos/ui/home/memories/memory_video_prefetcher.dart";
class MemoryCardWrapper {
@@ -35,17 +41,22 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
late StreamSubscription<MemoriesSettingChanged> _memoriesSettingSubscription;
late StreamSubscription<MemoriesChangedEvent> _memoriesChangedSubscription;
late StreamSubscription<MemorySeenEvent> _memorySeenSubscription;
+ late StreamSubscription<MLConsentChangedEvent> _mlConsentChangedSubscription;
late double _cardWidth;
// Delay cover warming past startup; generations invalidate stale work.
Timer? _warmTimer;
int _warmGeneration = 0;
- int _fetchGeneration = 0;
+ int _fetchMemoriesGeneration = 0;
String? _lastWarmSignature;
+ MemoryLanePersonTimeline? _memoryLane;
+ Uint8List? _oldestMemoryLaneFace;
+ Uint8List? _newestMemoryLaneFace;
final _videoPrefetcher = MemoryVideoPrefetcher();
final _scrollController = ScrollController();
bool _shouldShowCraftingMemories = false;
late Future<void> _shouldShowCraftingMemoriesLoaded;
+ late Future<void> _memoryLaneLoaded;
late List<SmartMemory> _initialMemories;
late Future<List<SmartMemory>> _memories;
@@ -69,6 +80,13 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
_memorySeenSubscription = Bus.instance.on<MemorySeenEvent>().listen(
_fetchMemories,
);
+ _mlConsentChangedSubscription = Bus.instance
+ .on<MLConsentChangedEvent>()
+ .listen(_onMLConsentChanged);
+ _memoryLaneLoaded = _loadScheduledMemoryLane();
+ MemoryLaneService.instance.readyPersonIds.addListener(
+ _onMemoryLaneReadyTimelinesChanged,
+ );
}
@override
@@ -76,9 +94,13 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
_memoriesSettingSubscription.cancel();
_memoriesChangedSubscription.cancel();
_memorySeenSubscription.cancel();
+ _mlConsentChangedSubscription.cancel();
_warmTimer?.cancel();
_videoPrefetcher.dispose();
_scrollController.dispose();
+ MemoryLaneService.instance.readyPersonIds.removeListener(
+ _onMemoryLaneReadyTimelinesChanged,
+ );
super.dispose();
}
@@ -109,41 +131,41 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
initialData: _initialMemories,
builder: (context, snapshot) {
final memories = snapshot.data ?? [];
- if (memories.isEmpty) {
- return const SizedBox.shrink();
- }
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const SizedBox(height: 12),
- FutureBuilder(
- future: _shouldShowCraftingMemoriesLoaded,
+ return FutureBuilder(
+ future: _shouldShowCraftingMemoriesLoaded,
+ builder: (context, _) {
+ final cardHeight = _cardWidth / kMemoryCardAspectRatio;
+ return FutureBuilder(
+ future: _memoryLaneLoaded,
builder: (context, _) {
- final cardHeight = _cardWidth / kMemoryCardAspectRatio;
final cards = _buildCards(memories, cardHeight);
- return SizedBox(
- height: cardHeight + 2,
- child: ListView.builder(
- controller: _scrollController,
- padding: const EdgeInsets.symmetric(
- horizontal: kMemoryCardStripGap / 2.0,
- ),
- physics: const AlwaysScrollableScrollPhysics(
- parent: BouncingScrollPhysics(),
- ),
- scrollDirection: Axis.horizontal,
- itemCount: cards.length,
- itemBuilder: (context, i) => KeyedSubtree(
- key: ValueKey(cards[i].id),
- child: cards[i].widget(),
+ if (cards.isEmpty) {
+ return const SizedBox.shrink();
+ }
+ return Padding(
+ padding: const EdgeInsets.only(top: 12, bottom: 10),
+ child: SizedBox(
+ height: cardHeight + 2,
+ child: ListView.builder(
+ controller: _scrollController,
+ padding: const EdgeInsets.symmetric(
+ horizontal: kMemoryCardStripGap / 2.0,
+ ),
+ physics: const AlwaysScrollableScrollPhysics(
+ parent: BouncingScrollPhysics(),
+ ),
+ scrollDirection: Axis.horizontal,
+ itemCount: cards.length,
+ itemBuilder: (context, i) => KeyedSubtree(
+ key: ValueKey(cards[i].id),
+ child: cards[i].widget(),
+ ),
),
),
);
},
- ),
-
- const SizedBox(height: 10),
- ],
+ );
+ },
).animate().fadeIn(
duration: const Duration(milliseconds: 250),
curve: Curves.easeInOutCirc,
@@ -175,8 +197,12 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
List<SmartMemory> memories,
double cardHeight,
) {
+ final memoryLane = _memoryLane;
+ final oldestMemoryLaneFace = _oldestMemoryLaneFace;
+ final newestMemoryLaneFace = _newestMemoryLaneFace;
+ final hasContent = memories.isNotEmpty || memoryLane != null;
return [
- if (_shouldShowCraftingMemories)
+ if (_shouldShowCraftingMemories && hasContent)
MemoryCardWrapper(
id: "craftingMemories",
widget: () => CraftingMemoriesCardWidget(
@@ -192,6 +218,19 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
},
),
),
+ if (flagService.internalUser &&
+ MemoryLaneService.instance.isFeatureEnabled &&
+ memoryLane != null &&
+ oldestMemoryLaneFace != null &&
+ newestMemoryLaneFace != null)
+ MemoryCardWrapper(
+ id: "memoryLane_${memoryLane.personId}",
+ widget: () => MemoryLaneCardWidget(
+ memoryLane,
+ oldestMemoryLaneFace,
+ newestMemoryLaneFace,
+ ),
+ ),
...memories.indexed.map(
(entry) => MemoryCardWrapper(
id: entry.$2.id,
@@ -207,7 +246,7 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
}
void _fetchMemories(Event? event) {
- final fetchGeneration = ++_fetchGeneration;
+ final fetchGeneration = ++_fetchMemoriesGeneration;
setState(() {
if (event is MemoriesSettingChanged &&
memoriesCacheService.showAnyMemories) {
@@ -217,7 +256,7 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
.getMemories()
.then(_sortMemories)
.then((memories) {
- if (!mounted || fetchGeneration != _fetchGeneration) {
+ if (!mounted || fetchGeneration != _fetchMemoriesGeneration) {
return memories;
}
if (_scrollController.hasClients) {
@@ -232,7 +271,7 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
return memories;
})
.onError((_, _) {
- if (mounted && fetchGeneration == _fetchGeneration) {
+ if (mounted && fetchGeneration == _fetchMemoriesGeneration) {
_cancelPendingWarm();
}
return [];
@@ -290,4 +329,57 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
_lastWarmSignature = null;
_videoPrefetcher.clearPending();
}
+
+ Future<void> _loadScheduledMemoryLane() async {
+ if (!flagService.internalUser ||
+ !MemoryLaneService.instance.isFeatureEnabled) {
+ return;
+ }
+ final timeline = await MemoryLaneCacheService.instance
+ .getScheduledMemoriesStripTimeline();
+ if (timeline == null) {
+ return;
+ }
+ final faceCrops = await MemoryLaneService.instance
+ .getOldestAndNewestFaceCrops(timeline);
+ if (faceCrops == null ||
+ !hasGrantedMLConsent ||
+ !MemoryLaneService.instance.readyPersonIds.value.contains(
+ timeline.personId,
+ )) {
+ return;
+ }
+ _memoryLane = timeline;
+ _oldestMemoryLaneFace = faceCrops.$1;
+ _newestMemoryLaneFace = faceCrops.$2;
+ }
+
+ void _onMLConsentChanged(MLConsentChangedEvent event) {
+ if (event.enabled || !mounted || _memoryLane == null) {
+ return;
+ }
+ setState(() {
+ _memoryLane = null;
+ _oldestMemoryLaneFace = null;
+ _newestMemoryLaneFace = null;
+ });
+ }
+
+ void _onMemoryLaneReadyTimelinesChanged() {
+ final memoryLane = _memoryLane;
+ if (memoryLane == null ||
+ MemoryLaneService.instance.readyPersonIds.value.contains(
+ memoryLane.personId,
+ )) {
+ return;
+ }
+ if (!mounted) {
+ return;
+ }
+ setState(() {
+ _memoryLane = null;
+ _oldestMemoryLaneFace = null;
+ _newestMemoryLaneFace = null;
+ });
+ }
}
diff --git a/mobile/apps/photos/lib/ui/home/memories/memory_lane_card.dart b/mobile/apps/photos/lib/ui/home/memories/memory_lane_card.dart
new file mode 100644
index 0000000000..1586ebf48a
--- /dev/null
+++ b/mobile/apps/photos/lib/ui/home/memories/memory_lane_card.dart
@@ -0,0 +1,99 @@
+import "dart:convert";
+import "dart:typed_data";
+
+import "package:flutter/material.dart";
+import "package:photos/models/memory_lane/memory_lane_models.dart";
+import "package:photos/ui/home/memories/memory_card_constants.dart";
+
+class MemoryLaneCardWidget extends StatelessWidget {
+ final MemoryLanePersonTimeline timeline;
+ final Uint8List oldestFace;
+ final Uint8List newestFace;
+
+ const MemoryLaneCardWidget(
+ this.timeline,
+ this.oldestFace,
+ this.newestFace, {
+ super.key,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ final timelineDump = const JsonEncoder.withIndent(
+ " ",
+ ).convert(timeline.toJson());
+
+ return Padding(
+ padding: const EdgeInsets.symmetric(horizontal: kMemoryCardStripGap / 2),
+ child: Container(
+ width: 320,
+ clipBehavior: Clip.antiAlias,
+ decoration: BoxDecoration(
+ color: Colors.black,
+ borderRadius: BorderRadius.circular(kMemoryCardBorderRadius),
+ ),
+ child: Column(
+ children: [
+ SizedBox(
+ height: 96,
+ child: Row(
+ children: [
+ Expanded(child: _FaceDebugView("oldest", oldestFace)),
+ Expanded(child: _FaceDebugView("newest", newestFace)),
+ ],
+ ),
+ ),
+ Expanded(
+ child: SingleChildScrollView(
+ padding: const EdgeInsets.all(6),
+ child: Text(
+ timelineDump,
+ style: const TextStyle(
+ color: Colors.white,
+ fontFamily: "monospace",
+ fontSize: 8,
+ height: 1.1,
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
+
+class _FaceDebugView extends StatelessWidget {
+ final String label;
+ final Uint8List bytes;
+
+ const _FaceDebugView(this.label, this.bytes);
+
+ @override
+ Widget build(BuildContext context) {
+ return Stack(
+ fit: StackFit.expand,
+ children: [
+ Image(
+ image: MemoryImage(bytes),
+ fit: BoxFit.cover,
+ gaplessPlayback: true,
+ ),
+ Align(
+ alignment: Alignment.bottomLeft,
+ child: ColoredBox(
+ color: Colors.black54,
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
+ child: Text(
+ label,
+ style: const TextStyle(color: Colors.white, fontSize: 10),
+ ),
+ ),
+ ),
+ ),
+ ],
+ );
+ }
+}