Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ class DriftMemoryRepository extends DriftDatabaseRepository {
..orderBy([OrderingTerm.desc(_db.memoryEntity.memoryAt), OrderingTerm.asc(_db.remoteAssetEntity.createdAt)]);

final rows = await query.get();
if (rows.isEmpty) {
return const [];
}

final Map<String, DriftMemory> memoriesMap = {};

Expand All @@ -46,7 +49,7 @@ class DriftMemoryRepository extends DriftDatabaseRepository {
}
}

return memoriesMap.values.toList();
return memoriesMap.values.toList(growable: false);
}

Future<DriftMemory?> get(String memoryId) async {
Expand Down
21 changes: 4 additions & 17 deletions mobile/lib/presentation/pages/dev/main_timeline.page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,17 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
import 'package:immich_mobile/providers/user.provider.dart';

@RoutePage()
class MainTimelinePage extends ConsumerWidget {
const MainTimelinePage({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
final memoriesEnabled = ref.watch(currentUserProvider.select((user) => user?.memoryEnabled ?? true));

return memoryLaneProvider.maybeWhen(
data: (memories) {
return memories.isEmpty || !memoriesEnabled
? const Timeline()
: Timeline(
topSliverWidget: SliverToBoxAdapter(
key: Key('memory-lane-${memories.first.assets.first.id}'),
child: DriftMemoryLane(memories: memories),
),
topSliverWidgetHeight: 200,
);
},
orElse: () => const Timeline(),
final hasMemories = ref.watch(driftMemoryFutureProvider.select((state) => state.value?.isNotEmpty ?? false));
return Timeline(
topSliverWidget: const SliverToBoxAdapter(child: DriftMemoryLane()),
topSliverWidgetHeight: hasMemories ? 200 : 0,
);
}
}
15 changes: 11 additions & 4 deletions mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,20 @@ import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart'
import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
import 'package:immich_mobile/routing/router.dart';

class DriftMemoryLane extends ConsumerWidget {
final List<DriftMemory> memories;

const DriftMemoryLane({super.key, required this.memories});
const DriftMemoryLane({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final memoryLaneProvider = ref.watch(driftMemoryFutureProvider);
final memories = memoryLaneProvider.value ?? const [];
if (memories.isEmpty) {
return const SizedBox.shrink();
}

return ConstrainedBox(
constraints: const BoxConstraints(maxHeight: 200),
child: CarouselView(
Expand All @@ -38,7 +43,9 @@ class DriftMemoryLane extends ConsumerWidget {

context.pushRoute(DriftMemoryRoute(memories: memories, memoryIndex: index));
},
children: memories.map((memory) => DriftMemoryCard(memory: memory)).toList(),
children: memories
.map((memory) => DriftMemoryCard(key: Key(memory.id), memory: memory))
.toList(growable: false),
),
);
}
Expand Down
11 changes: 5 additions & 6 deletions mobile/lib/providers/infrastructure/memory.provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ final driftMemoryServiceProvider = Provider<DriftMemoryService>(
(ref) => DriftMemoryService(ref.watch(driftMemoryRepositoryProvider)),
);

final driftMemoryFutureProvider = FutureProvider.autoDispose<List<DriftMemory>>((ref) async {
final user = ref.watch(currentUserProvider);
if (user == null) {
return [];
final driftMemoryFutureProvider = FutureProvider.autoDispose<List<DriftMemory>>((ref) {
final (userId, enabled) = ref.watch(currentUserProvider.select((user) => (user?.id, user?.memoryEnabled ?? true)));
if (userId == null || !enabled) {
return const [];
}

final service = ref.watch(driftMemoryServiceProvider);

return service.getMemoryLane(user.id);
return service.getMemoryLane(userId);
});