merge main

mobile/lib/presentation/pages/dev/drift_local_album.page.dart

@@ -0,0 +1,116 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/local_album_thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/local_album_sliver_app_bar.dart';
+
+@RoutePage()
+class DriftLocalAlbumsPage extends StatelessWidget {
+  const DriftLocalAlbumsPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          LocalAlbumsSliverAppBar(),
+          _AlbumList(),
+        ],
+      ),
+    );
+  }
+}
+
+class _AlbumList extends ConsumerWidget {
+  const _AlbumList();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final albums = ref.watch(localAlbumProvider);
+
+    return albums.when(
+      loading: () => const SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: EdgeInsets.all(20.0),
+            child: CircularProgressIndicator(),
+          ),
+        ),
+      ),
+      error: (error, stack) => SliverToBoxAdapter(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.all(20.0),
+            child: Text(
+              'Error loading albums: $error, stack: $stack',
+              style: TextStyle(
+                color: context.colorScheme.error,
+              ),
+            ),
+          ),
+        ),
+      ),
+      data: (albums) {
+        if (albums.isEmpty) {
+          return const SliverToBoxAdapter(
+            child: Center(
+              child: Padding(
+                padding: EdgeInsets.all(20.0),
+                child: Text('No albums found'),
+              ),
+            ),
+          );
+        }
+
+        return SliverPadding(
+          padding: const EdgeInsets.all(18.0),
+          sliver: SliverList.builder(
+            itemBuilder: (_, index) {
+              final album = albums[index];
+
+              return Padding(
+                padding: const EdgeInsets.only(bottom: 8.0),
+                child: LargeLeadingTile(
+                  leadingPadding: const EdgeInsets.only(
+                    right: 16,
+                  ),
+                  leading: SizedBox(
+                    width: 80,
+                    height: 80,
+                    child: LocalAlbumThumbnail(
+                      albumId: album.id,
+                    ),
+                  ),
+                  title: Text(
+                    album.name,
+                    style: context.textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                  subtitle: Text(
+                    'items_count'.t(
+                      context: context,
+                      args: {'count': album.assetCount},
+                    ),
+                    style: context.textTheme.bodyMedium?.copyWith(
+                      color: context.colorScheme.onSurfaceSecondary,
+                    ),
+                  ),
+                  onTap: () =>
+                      context.pushRoute(LocalTimelineRoute(albumId: album.id)),
+                ),
+              );
+            },
+            itemCount: albums.length,
+          ),
+        );
+      },
+    );
+  }
+}

mobile/lib/presentation/pages/dev/drift_partner_detail.page.dart

@@ -0,0 +1,29 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+
+@RoutePage()
+class DriftPartnerDetailPage extends StatelessWidget {
+  final String partnerId;
+
+  const DriftPartnerDetailPage({super.key, required this.partnerId});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(partnerId);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}

mobile/lib/presentation/pages/dev/drift_recently_taken.page.dart

@@ -0,0 +1,35 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+@RoutePage()
+class DriftRecentlyTakenPage extends StatelessWidget {
+  const DriftRecentlyTakenPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception(
+                'User must be logged in to access recently taken',
+              );
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}

mobile/lib/presentation/pages/dev/feat_in_development.page.dart

@@ -5,15 +5,43 @@ import 'package:drift/drift.dart' hide Column;
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 final _features = [
+  _Feature(
+    name: 'Selection Mode Timeline',
+    icon: Icons.developer_mode_rounded,
+    onTap: (ctx, ref) async {
+      final user = ref.watch(currentUserProvider);
+      if (user == null) {
+        return Future.value();
+      }
+
+      final assets =
+          await ref.read(remoteAssetRepositoryProvider).getSome(user.id);
+
+      final selectedAssets = await ctx.pushRoute<Set<BaseAsset>>(
+        DriftAssetSelectionTimelineRoute(
+          lockedSelectionAssets: assets.toSet(),
+        ),
+      );
+
+      DLog.log(
+        "Selected ${selectedAssets?.length ?? 0} assets",
+      );
+
+      return Future.value();
+    },
+  ),
   _Feature(
     name: 'Sync Local',
     icon: Icons.photo_album_rounded,
@@ -104,6 +132,11 @@ final _features = [
     icon: Icons.video_collection_outlined,
     onTap: (ctx, _) => ctx.pushRoute(const DriftVideoRoute()),
   ),
+  _Feature(
+    name: 'Recently Taken',
+    icon: Icons.schedule_outlined,
+    onTap: (ctx, _) => ctx.pushRoute(const DriftRecentlyTakenRoute()),
+  ),
 ];
 
 @RoutePage()

mobile/lib/presentation/pages/drift_asset_selection_timeline.page.dart

@@ -0,0 +1,50 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+@RoutePage()
+class DriftAssetSelectionTimelinePage extends ConsumerWidget {
+  final Set<BaseAsset> lockedSelectionAssets;
+  const DriftAssetSelectionTimelinePage({
+    super.key,
+    this.lockedSelectionAssets = const {},
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ProviderScope(
+      overrides: [
+        multiSelectProvider.overrideWith(
+          () => MultiSelectNotifier(
+            MultiSelectState(
+              selectedAssets: {},
+              lockedSelectionAssets: lockedSelectionAssets,
+              forceEnable: true,
+            ),
+          ),
+        ),
+        timelineServiceProvider.overrideWith(
+          (ref) {
+            final user = ref.watch(currentUserProvider);
+            if (user == null) {
+              throw Exception(
+                'User must be logged in to access recently taken',
+              );
+            }
+
+            final timelineService =
+                ref.watch(timelineFactoryProvider).remoteAssets(user.id);
+            ref.onDispose(timelineService.dispose);
+            return timelineService;
+          },
+        ),
+      ],
+      child: const Timeline(),
+    );
+  }
+}

mobile/lib/presentation/pages/drift_library.page.dart

@@ -5,14 +5,14 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/local_album_thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/partner.provider.dart';
 import 'package:immich_mobile/providers/search/people.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:immich_mobile/widgets/album/album_thumbnail_card.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/user_avatar.dart';
 import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
@@ -310,8 +310,7 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    // TODO: Migrate to the drift after local album page
-    final albums = ref.watch(localAlbumsProvider);
+    final albums = ref.watch(localAlbumProvider);
 
     return LayoutBuilder(
       builder: (context, constraints) {
@@ -320,9 +319,7 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
         final size = context.width * widthFactor - 20.0;
 
         return GestureDetector(
-          onTap: () => context.pushRoute(
-            const LocalAlbumsRoute(),
-          ),
+          onTap: () => context.pushRoute(const DriftLocalAlbumsRoute()),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
@@ -347,12 +344,29 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
                     crossAxisSpacing: 8,
                     mainAxisSpacing: 8,
                     physics: const NeverScrollableScrollPhysics(),
-                    children: albums.take(4).map((album) {
-                      return AlbumThumbnailCard(
-                        album: album,
-                        showTitle: false,
-                      );
-                    }).toList(),
+                    children: albums.when(
+                      data: (data) {
+                        return data.take(4).map((album) {
+                          return LocalAlbumThumbnail(
+                            albumId: album.id,
+                          );
+                        }).toList();
+                      },
+                      error: (error, _) {
+                        return [
+                          Center(
+                            child: Text('Error: $error'),
+                          ),
+                        ];
+                      },
+                      loading: () {
+                        return [
+                          const Center(
+                            child: CircularProgressIndicator(),
+                          ),
+                        ];
+                      },
+                    ),
                   ),
                 ),
               ),
@@ -498,7 +512,8 @@ class _PartnerList extends StatelessWidget {
               fontWeight: FontWeight.w500,
             ),
           ).t(context: context, args: {'user': partner.name}),
-          onTap: () => context.pushRoute(PartnerDetailRoute(partner: partner)),
+          onTap: () =>
+              context.pushRoute(DriftPartnerDetailRoute(partnerId: partner.id)),
         );
       },
     );