Skip to content

armgit / ente

Public Imported from GitHub
0

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

Merge remote-tracking branch 'origin/main' into music-in-memories

ashilkn8eab09407fcc
diff --cc mobile/apps/photos/lib/services/memories/photo_selector.dart
index 3aff76dfa0,86182eac3b..64827db64e
--- a/mobile/apps/photos/lib/services/memories/photo_selector.dart
+++ b/mobile/apps/photos/lib/services/memories/photo_selector.dart
@@@ -127,18 -69,9 +81,13 @@@ class PhotoSelector
result = _selectYearRoundRobin(memories, config);
}
- return _sortResult(result, config.sort);
+ return includeVideos(
+ _sortResult(result, config.sort),
+ candidates,
+ config.targetSize,
+ );
}
- // -----------------------------------------------------------------------
- // Distribution strategies
- // -----------------------------------------------------------------------
-
- /// Flat selection: sort by score descending, greedily iterate.
static List<Memory> _selectFlat(
List<Memory> memories,
SelectionConfig config,
@@@ -606,11 -467,8 +532,10 @@@
try {
final w = (kDebugMode ? EnteWatch('getPeopleResults') : null)?..start();
final int targetSize = prefferedSize ?? 10;
- if (memories.length <= targetSize) return memories;
+ if (memories.length <= targetSize) {
+ return includeVideos(memories, memories, targetSize);
+ }
- // Pre-compute nostalgia scores.
final Map<int, double> scores = {};
for (final mem in memories) {
final fileID = memoryFileIdFromMemory(
@@@ -749,12 -596,9 +666,11 @@@
),
);
} else {
- // Multiple years: adjust target size for many years.
if (prefferedSize == null && (allYears.length * 2) > 10) {
targetSize = allYears.length * 3;
- if (fileCount < targetSize) return memories;
+ if (fileCount < targetSize) {
+ return includeVideos(memories, memories, targetSize);
+ }
}
return select(
diff --cc mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index 07fca9537b,2663df952d..23e60ba187
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@@ -371,14 -350,10 +355,13 @@@ class _FullScreenMemoryState extends St
Object? _kenBurnsStartToken;
bool _isViewerPaused = false;
bool _isPlaybackPaused = false;
- bool get _isAnimationPaused => _isViewerPaused || _isPlaybackPaused;
+ bool get _isAnimationPaused =>
+ !widget.isActive || _isViewerPaused || _isPlaybackPaused;
bool _isMediaZoomed = false;
final _socialControlsVisible = ValueNotifier<bool>(false);
+ FullScreenMemoryData? _memoryData;
+ ValueNotifier<int>? _itemIndexNotifier;
- /// Used to check if any pointer is on the screen.
final hasPointerOnScreenNotifier = ValueNotifier<bool>(false);
bool hasFinalFileLoaded = false;
bool isAtFirstOrLastFile = false;