Merge branch 'main' into upload-to-album

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

@@ -191,8 +191,12 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
   }
 
   String _getAssetTypeTitle(BaseAsset asset) {
-    if (asset is LocalAsset) return 'Local Asset';
-    if (asset is RemoteAsset) return 'Remote Asset';
+    if (asset is LocalAsset) {
+      return 'Local Asset';
+    }
+    if (asset is RemoteAsset) {
+      return 'Remote Asset';
+    }
     return 'Base Asset';
   }
 }

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

@@ -160,12 +160,25 @@ class DriftMemoryPage extends HookConsumerWidget {
       currentAssetPage.value = otherIndex;
       updateProgressText();
 
+      final activeMemory = currentMemory.value;
+
       // Wait for page change animation to finish
       await Future.delayed(const Duration(milliseconds: 400));
+
+      // check if memory is still the same and if context is still mounted
+      if (currentMemory.value != activeMemory || !context.mounted) {
+        return;
+      }
+
       // And then precache the next asset
       await precacheAsset(otherIndex + 1);
 
-      final asset = currentMemory.value.assets[otherIndex];
+      // check again as precache involves async operations
+      if (currentMemory.value != activeMemory || !context.mounted) {
+        return;
+      }
+
+      final asset = activeMemory.assets[otherIndex];
       currentAsset.value = asset;
       ref.read(assetViewerProvider.notifier).setAsset(asset);
     }

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

@@ -0,0 +1,32 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.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';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
+
+@RoutePage()
+class DriftRecentlyAddedPage extends StatelessWidget {
+  const DriftRecentlyAddedPage({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).recentlyAdded(user.id);
+          ref.onDispose(timelineService.dispose);
+          return timelineService;
+        }),
+      ],
+      child: Timeline(appBar: MesmerizingSliverAppBar(title: 'recently_added'.t())),
+    );
+  }
+}

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

@@ -240,7 +240,9 @@ class _EditAlbumDialogState extends ConsumerState<_EditAlbumDialog> {
   }
 
   Future<void> _handleSave() async {
-    if (formKey.currentState?.validate() != true) return;
+    if (formKey.currentState?.validate() != true) {
+      return;
+    }
 
     try {
       final newTitle = titleController.text.trim();

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

@@ -1,13 +1,18 @@
 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/translate_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.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/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 @RoutePage()
 class DriftTrashPage extends StatelessWidget {
@@ -36,6 +41,7 @@ class DriftTrashPage extends StatelessWidget {
           pinned: true,
           centerTitle: true,
           elevation: 0,
+          actions: [const _TrashKebabMenu()],
         ),
         topSliverWidgetHeight: 24,
         topSliverWidget: Consumer(
@@ -53,3 +59,89 @@ class DriftTrashPage extends StatelessWidget {
     );
   }
 }
+
+class _TrashKebabMenu extends ConsumerWidget {
+  const _TrashKebabMenu();
+
+  Future<void> _confirmAndRun(
+    BuildContext context,
+    WidgetRef ref, {
+    required String title,
+    required String content,
+    required Future<ActionResult> Function(String userId) action,
+    required String Function(int count) successMsg,
+  }) async {
+    await showDialog<bool>(
+      context: context,
+      builder: (_) => ConfirmDialog(
+        title: title,
+        content: content,
+        onOk: () async {
+          final user = ref.read(currentUserProvider);
+          if (user == null) {
+            return;
+          }
+          final result = await action(user.id);
+          if (!context.mounted) {
+            return;
+          }
+          ImmichToast.show(
+            context: context,
+            msg: result.success ? successMsg(result.count) : context.t.scaffold_body_error_occurred,
+            toastType: result.success ? ToastType.success : ToastType.error,
+          );
+        },
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return MenuAnchor(
+      consumeOutsideTap: true,
+      style: MenuStyle(
+        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
+        surfaceTintColor: const WidgetStatePropertyAll(Colors.grey),
+        elevation: const WidgetStatePropertyAll(4),
+        shape: const WidgetStatePropertyAll(
+          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
+        ),
+        padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
+      ),
+      menuChildren: [
+        BaseActionButton(
+          label: context.t.empty_trash,
+          iconData: Icons.delete_forever_outlined,
+          onPressed: () => _confirmAndRun(
+            context,
+            ref,
+            title: context.t.empty_trash,
+            content: context.t.empty_trash_confirmation,
+            action: ref.read(actionProvider.notifier).emptyTrash,
+            successMsg: (count) => context.t.assets_permanently_deleted_count(count: count),
+          ),
+          menuItem: true,
+        ),
+        BaseActionButton(
+          label: context.t.restore_all,
+          iconData: Icons.restore_outlined,
+          onPressed: () => _confirmAndRun(
+            context,
+            ref,
+            title: context.t.restore_all,
+            content: context.t.assets_restore_confirmation,
+            action: ref.read(actionProvider.notifier).restoreAllTrash,
+            successMsg: (count) => context.t.assets_restored_count(count: count),
+          ),
+          menuItem: true,
+        ),
+      ],
+      builder: (context, controller, child) {
+        return IconButton(
+          icon: const Icon(Icons.more_vert_rounded),
+          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
+        );
+      },
+    );
+  }
+}

mobile/lib/presentation/pages/edit/drift_edit.page.dart

@@ -95,7 +95,9 @@ class _DriftEditImagePageState extends ConsumerState<DriftEditImagePage> with Ti
     return PopScope(
       canPop: !hasUnsavedEdits,
       onPopInvokedWithResult: (didPop, result) async {
-        if (didPop) return;
+        if (didPop) {
+          return;
+        }
         final shouldDiscard = await _showDiscardChangesDialog() ?? false;
         if (shouldDiscard && mounted) {
           Navigator.of(context).pop();

mobile/lib/presentation/pages/edit/editor.provider.dart

@@ -179,7 +179,9 @@ class EditorState {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
 
     return other is EditorState &&
         other.isApplyingEdits == isApplyingEdits &&

mobile/lib/presentation/pages/profile/profile_picture_crop.page.dart

@@ -58,7 +58,9 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
   }
 
   Future<void> _handleDone() async {
-    if (_isLoading) return;
+    if (_isLoading) {
+      return;
+    }
 
     setState(() {
       _isLoading = true;
@@ -72,7 +74,9 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
           .read(uploadProfileImageProvider.notifier)
           .upload(xFile, fileName: 'profile-picture.png');
 
-      if (!context.mounted) return;
+      if (!context.mounted) {
+        return;
+      }
 
       if (success) {
         final profileImagePath = ref.read(uploadProfileImageProvider).profileImagePath;
@@ -102,7 +106,9 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
         );
       }
     } catch (e) {
-      if (!context.mounted) return;
+      if (!context.mounted) {
+        return;
+      }
 
       ImmichToast.show(
         context: context,

mobile/lib/presentation/pages/search/drift_search.page.dart

@@ -13,6 +13,7 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
@@ -106,10 +107,17 @@ class DriftSearchPage extends HookConsumerWidget {
 
       Future.microtask(() {
         textSearchController.clear();
+        peopleCurrentFilterWidget.value = null;
+        dateRangeCurrentFilterWidget.value = null;
+        cameraCurrentFilterWidget.value = null;
+        tagCurrentFilterWidget.value = null;
+        mediaTypeCurrentFilterWidget.value = null;
+        ratingCurrentFilterWidget.value = null;
+        displayOptionCurrentFilterWidget.value = null;
+        locationCurrentFilterWidget.value = preFilter.location.city != null
+            ? Text(preFilter.location.city!, style: context.textTheme.labelLarge)
+            : null;
         search(preFilter);
-        if (preFilter.location.city != null) {
-          locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
-        }
       });
 
       return null;
@@ -701,7 +709,9 @@ class _SearchResultGrid extends ConsumerWidget {
   bool _onScrollUpdateNotification(ScrollNotification notification) {
     final metrics = notification.metrics;
 
-    if (metrics.axis != Axis.vertical) return false;
+    if (metrics.axis != Axis.vertical) {
+      return false;
+    }
 
     final isBottomSheet = notification.context?.findAncestorWidgetOfExactType<DraggableScrollableSheet>() != null;
     final remaining = metrics.maxScrollExtent - metrics.pixels;
@@ -728,7 +738,9 @@ class _SearchResultGrid extends ConsumerWidget {
 
     final hasMore = ref.watch(paginatedSearchProvider.select((s) => s.nextPage != null));
 
-    if (hasMore) return null;
+    if (hasMore) {
+      return null;
+    }
 
     return SliverToBoxAdapter(
       child: Padding(
@@ -868,6 +880,12 @@ class _QuickLinkList extends StatelessWidget {
             isTop: true,
             onTap: () => context.pushRoute(const DriftRecentlyTakenRoute()),
           ),
+          _QuickLink(
+            title: context.t.recently_added,
+            icon: Icons.upload_outlined,
+            isTop: true,
+            onTap: () => context.pushRoute(const DriftRecentlyAddedRoute()),
+          ),
           _QuickLink(
             title: 'videos'.t(context: context),
             icon: Icons.play_circle_outline_rounded,

mobile/lib/presentation/pages/search/paginated_search.provider.dart

@@ -44,7 +44,9 @@ class PaginatedSearchNotifier extends StateNotifier<SearchState> {
   Stream<int> get assetCount => _assetCountController.stream;
 
   Future<void> search(SearchFilter filter) async {
-    if (state.nextPage == null || state.isLoading) return;
+    if (state.nextPage == null || state.isLoading) {
+      return;
+    }
 
     state = SearchState(assets: state.assets, nextPage: state.nextPage, isLoading: true);