Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] place memory lane card at position 2

Priyanshu Dangare9e671fe85a80
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 42ebcc467b..b970ae5eda 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
@@ -117,7 +117,10 @@ class _AllMemoriesPageState extends State<AllMemoriesPage> {
for (final smartMemory in widget.allMemories) {
if (smartMemory.memories.isEmpty) continue;
final index =
- pages.length + (memoryLane != null && !hasSeenMemoryLane ? 1 : 0);
+ pages.length +
+ (memoryLane != null && !hasSeenMemoryLane && pages.isNotEmpty
+ ? 1
+ : 0);
pages.add(
MemoryPageWrapper(
id: smartMemory.id,
@@ -153,7 +156,7 @@ class _AllMemoriesPageState extends State<AllMemoriesPage> {
}
if (memoryLane != null) {
pages.insert(
- hasSeenMemoryLane ? pages.length : 0,
+ hasSeenMemoryLane ? pages.length : 1,
MemoryPageWrapper(
id: "memoryLane_${memoryLane.personId}",
widget: ({onNextMemory, onPreviousMemory}) => MemoryLanePageV2(
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 e8777e7eb9..42ec0f7477 100644
--- a/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart
@@ -296,8 +296,9 @@ class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {
},
),
),
+ ...cards.skip(hasMemoryLane ? 1 : 0).take(1),
if (memoryLaneCard != null && !hasSeenMemoryLane) memoryLaneCard,
- ...cards.skip(hasMemoryLane ? 1 : 0),
+ ...cards.skip(hasMemoryLane ? 2 : 1),
if (memoryLaneCard != null && hasSeenMemoryLane) memoryLaneCard,
];
}