deps(mobile): update dependency auto_route to v8 (#9456)

deps: update dependency auto_route to v8 Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex Tran <alex.tran1502@gmail.com>
2025-08-10 23:22:22 +02:00 · 2024-05-14 19:07:31 +00:00
parent 72b1d582ba
commit 6c008176c9
36 changed files with 275 additions and 363 deletions
--- a/mobile/lib/pages/backup/album_preview.page.dart
+++ b/mobile/lib/pages/backup/album_preview.page.dart
@@ -54,7 +54,7 @@ class AlbumPreviewPage extends HookConsumerWidget {
          ],
        ),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_new_rounded),
        ),
      ),
--- a/mobile/lib/pages/backup/backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/backup_album_selection.page.dart
@@ -191,7 +191,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
    return Scaffold(
      appBar: AppBar(
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        title: const Text(
--- a/mobile/lib/pages/backup/backup_controller.page.dart
+++ b/mobile/lib/pages/backup/backup_controller.page.dart
@@ -7,16 +7,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/models/backup/backup_state.model.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/error_backup_list.provider.dart';
 import 'package:immich_mobile/providers/backup/ios_background_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
-import 'package:immich_mobile/widgets/backup/current_backup_asset_info_box.dart';
-import 'package:immich_mobile/models/backup/backup_state.model.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
+import 'package:immich_mobile/widgets/backup/current_backup_asset_info_box.dart';

@RoutePage()
 class BackupControllerPage extends HookConsumerWidget {
@@ -260,7 +260,7 @@ class BackupControllerPage extends HookConsumerWidget {
        leading: IconButton(
          onPressed: () {
            ref.watch(websocketProvider.notifier).listenUploadEvent();
-            context.popRoute(true);
+            context.maybePop(true);
          },
          splashRadius: 24,
          icon: const Icon(
--- a/mobile/lib/pages/backup/backup_options.page.dart
+++ b/mobile/lib/pages/backup/backup_options.page.dart
@@ -13,7 +13,7 @@ class BackupOptionsPage extends StatelessWidget {
        elevation: 0,
        title: const Text("backup_options_page_title").tr(),
        leading: IconButton(
-          onPressed: () => context.popRoute(true),
+          onPressed: () => context.maybePop(true),
          splashRadius: 24,
          icon: const Icon(
            Icons.arrow_back_ios_rounded,
--- a/mobile/lib/pages/backup/failed_backup_status.page.dart
+++ b/mobile/lib/pages/backup/failed_backup_status.page.dart
@@ -23,7 +23,7 @@ class FailedBackupStatusPage extends HookConsumerWidget {
        ),
        leading: IconButton(
          onPressed: () {
-            context.popRoute(true);
+            context.maybePop(true);
          },
          splashRadius: 24,
          icon: const Icon(
--- a/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart
+++ b/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart
@@ -26,7 +26,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget {
    final sharedUsersList = useState<Set<User>>({});

    addNewUsersHandler() {
-      context.popRoute(sharedUsersList.value.map((e) => e.id).toList());
+      context.maybePop(sharedUsersList.value.map((e) => e.id).toList());
    }

    buildTileIcon(User user) {
@@ -127,7 +127,7 @@ class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget {
        leading: IconButton(
          icon: const Icon(Icons.close_rounded),
          onPressed: () {
-            context.popRoute(null);
+            context.maybePop(null);
          },
        ),
        actions: [
--- a/mobile/lib/pages/common/album_options.page.dart
+++ b/mobile/lib/pages/common/album_options.page.dart
@@ -184,7 +184,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
      appBar: AppBar(
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () => context.popRoute(null),
+          onPressed: () => context.maybePop(null),
        ),
        centerTitle: true,
        title: Text("translated_text_options".tr()),
--- a/mobile/lib/pages/common/album_shared_user_selection.page.dart
+++ b/mobile/lib/pages/common/album_shared_user_selection.page.dart
@@ -36,7 +36,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget {
        await ref.watch(sharedAlbumProvider.notifier).getAllSharedAlbums();
        // ref.watch(assetSelectionProvider.notifier).removeAll();
        ref.watch(albumTitleProvider.notifier).clearAlbumTitle();
-        context.popRoute(true);
+        context.maybePop(true);
        context
            .navigateTo(const TabControllerRoute(children: [SharingRoute()]));
      }
@@ -152,7 +152,7 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget {
        leading: IconButton(
          icon: const Icon(Icons.close_rounded),
          onPressed: () async {
-            context.popRoute();
+            context.maybePop();
          },
        ),
        actions: [
--- a/mobile/lib/pages/common/app_log.page.dart
+++ b/mobile/lib/pages/common/app_log.page.dart
@@ -105,7 +105,7 @@ class AppLogPage extends HookConsumerWidget {
        ],
        leading: IconButton(
          onPressed: () {
-            context.popRoute();
+            context.maybePop();
          },
          icon: const Icon(
            Icons.arrow_back_ios_new_rounded,
--- a/mobile/lib/pages/common/create_album.page.dart
+++ b/mobile/lib/pages/common/create_album.page.dart
@@ -3,16 +3,16 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/album/album_title.provider.dart';
+import 'package:immich_mobile/providers/asset.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/album/album_action_outlined_button.dart';
 import 'package:immich_mobile/widgets/album/album_title_text_field.dart';
 import 'package:immich_mobile/widgets/album/shared_album_thumbnail_image.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/providers/asset.provider.dart';

@RoutePage()
 // ignore: must_be_immutable
@@ -216,7 +216,7 @@ class CreateAlbumPage extends HookConsumerWidget {
        leading: IconButton(
          onPressed: () {
            selectedAssets.value = {};
-            context.popRoute();
+            context.maybePop();
          },
          icon: const Icon(Icons.close_rounded),
        ),
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -2,32 +2,33 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'dart:ui' as ui;
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/image/immich_remote_image_provider.dart';
+import 'package:immich_mobile/pages/common/video_viewer.page.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.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/image/immich_remote_image_provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/asset_viewer/advanced_bottom_sheet.dart';
 import 'package:immich_mobile/widgets/asset_viewer/bottom_gallery_bar.dart';
 import 'package:immich_mobile/widgets/asset_viewer/exif_sheet/exif_bottom_sheet.dart';
 import 'package:immich_mobile/widgets/asset_viewer/gallery_app_bar.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/pages/common/video_viewer.page.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_image.dart';
 import 'package:immich_mobile/widgets/common/immich_thumbnail.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';
 import 'package:immich_mobile/widgets/photo_view/src/photo_view_computed_scale.dart';
 import 'package:immich_mobile/widgets/photo_view/src/photo_view_scale_state.dart';
 import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_hero_attributes.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:isar/isar.dart';
 import 'package:openapi/api.dart' show ThumbnailFormat;

@@ -174,7 +175,7 @@ class GalleryViewerPage extends HookConsumerWidget {

      final ratio = d.dy / max(d.dx.abs(), 1);
      if (d.dy > sensitivity && ratio > ratioThreshold) {
-        context.popRoute();
+        context.maybePop();
      } else if (d.dy < -sensitivity && ratio < -ratioThreshold) {
        showInfo();
      }
@@ -261,12 +262,9 @@ class GalleryViewerPage extends HookConsumerWidget {
    }

    return PopScope(
-      canPop: false,
-      onPopInvoked: (_) {
-        // Change immersive mode back to normal "edgeToEdge" mode
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-        context.pop();
-      },
+      // Change immersive mode back to normal "edgeToEdge" mode
+      onPopInvoked: (_) =>
+          SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge),
      child: Scaffold(
        backgroundColor: Colors.black,
        body: Stack(
--- a/mobile/lib/pages/common/video_viewer.page.dart
+++ b/mobile/lib/pages/common/video_viewer.page.dart
@@ -1,18 +1,15 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/asset_viewer/show_controls.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controller_provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
 import 'package:immich_mobile/widgets/asset_viewer/video_player.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/widgets/common/delayed_loading_indicator.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';

-@RoutePage()
-// ignore: must_be_immutable
 class VideoViewerPage extends HookConsumerWidget {
  final Asset asset;
  final bool isMotionVideo;
--- a/mobile/lib/pages/library/archive.page.dart
+++ b/mobile/lib/pages/library/archive.page.dart
@@ -17,7 +17,7 @@ class ArchivePage extends HookConsumerWidget {
      final count = archivedAssets.value?.totalAssets.toString() ?? "?";
      return AppBar(
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        centerTitle: true,
--- a/mobile/lib/pages/library/favorite.page.dart
+++ b/mobile/lib/pages/library/favorite.page.dart
@@ -15,7 +15,7 @@ class FavoritesPage extends HookConsumerWidget {
    AppBar buildAppBar() {
      return AppBar(
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        centerTitle: true,
--- a/mobile/lib/pages/library/trash.page.dart
+++ b/mobile/lib/pages/library/trash.page.dart
@@ -143,7 +143,7 @@ class TrashPage extends HookConsumerWidget {
      return AppBar(
        leading: IconButton(
          onPressed: !selectionEnabledHook.value
-              ? () => context.popRoute()
+              ? () => context.maybePop()
              : () {
                  selectionEnabledHook.value = false;
                  selection.value = {};
--- a/mobile/lib/pages/onboarding/permission_onboarding.page.dart
+++ b/mobile/lib/pages/onboarding/permission_onboarding.page.dart
@@ -176,7 +176,7 @@ class PermissionOnboardingPage extends HookConsumerWidget {
                ),
                TextButton(
                  child: const Text('permission_onboarding_back').tr(),
-                  onPressed: () => context.popRoute(),
+                  onPressed: () => context.maybePop(),
                ),
              ],
            ),
--- a/mobile/lib/pages/photos/memory.page.dart
+++ b/mobile/lib/pages/photos/memory.page.dart
@@ -3,14 +3,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_image.dart';
 import 'package:immich_mobile/widgets/memories/memory_bottom_info.dart';
 import 'package:immich_mobile/widgets/memories/memory_card.dart';
 import 'package:immich_mobile/widgets/memories/memory_epilogue.dart';
 import 'package:immich_mobile/widgets/memories/memory_progress_indicator.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_image.dart';

@RoutePage()
 class MemoryPage extends HookConsumerWidget {
@@ -153,7 +153,7 @@ class MemoryPage extends HookConsumerWidget {
          final offset = notification.metrics.pixels;
          if (isEpiloguePage &&
              (offset > notification.metrics.maxScrollExtent + 150)) {
-            context.popRoute();
+            context.maybePop();
            return true;
          }
        }
@@ -256,7 +256,7 @@ class MemoryPage extends HookConsumerWidget {
                              // auto_route doesn't invoke pop scope, so
                              // turn off full screen mode here
                              // https://github.com/Milad-Akarie/auto_route_library/issues/1799
-                              context.popRoute();
+                              context.maybePop();
                              SystemChrome.setEnabledSystemUIMode(
                                SystemUiMode.edgeToEdge,
                              );
--- a/mobile/lib/pages/search/all_motion_videos.page.dart
+++ b/mobile/lib/pages/search/all_motion_videos.page.dart
@@ -18,7 +18,7 @@ class AllMotionPhotosPage extends HookConsumerWidget {
      appBar: AppBar(
        title: const Text('motion_photos_page_title').tr(),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
      ),
--- a/mobile/lib/pages/search/all_people.page.dart
+++ b/mobile/lib/pages/search/all_people.page.dart
@@ -21,7 +21,7 @@ class AllPeoplePage extends HookConsumerWidget {
          'all_people_page_title',
        ).tr(),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
      ),
--- a/mobile/lib/pages/search/all_places.page.dart
+++ b/mobile/lib/pages/search/all_places.page.dart
@@ -22,7 +22,7 @@ class AllPlacesPage extends HookConsumerWidget {
          'curated_location_page_title',
        ).tr(),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
      ),
--- a/mobile/lib/pages/search/all_videos.page.dart
+++ b/mobile/lib/pages/search/all_videos.page.dart
@@ -15,7 +15,7 @@ class AllVideosPage extends HookConsumerWidget {
      appBar: AppBar(
        title: const Text('all_videos_page_title').tr(),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
      ),
--- a/mobile/lib/pages/search/map/map_location_picker.page.dart
+++ b/mobile/lib/pages/search/map/map_location_picker.page.dart
@@ -41,7 +41,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
    }

    void onClose([LatLng? selected]) {
-      context.popRoute(selected);
+      context.maybePop(selected);
    }

    Future<void> getCurrentLocation() async {
--- a/mobile/lib/pages/search/person_result.page.dart
+++ b/mobile/lib/pages/search/person_result.page.dart
@@ -102,7 +102,7 @@ class PersonResultPage extends HookConsumerWidget {
      appBar: AppBar(
        title: Text(name.value),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
        actions: [
--- a/mobile/lib/pages/search/recently_added.page.dart
+++ b/mobile/lib/pages/search/recently_added.page.dart
@@ -18,7 +18,7 @@ class RecentlyAddedPage extends HookConsumerWidget {
      appBar: AppBar(
        title: const Text('recently_added_page_title').tr(),
        leading: IconButton(
-          onPressed: () => context.popRoute(),
+          onPressed: () => context.maybePop(),
          icon: const Icon(Icons.arrow_back_ios_rounded),
        ),
      ),
--- a/mobile/lib/pages/search/search_input.page.dart
+++ b/mobile/lib/pages/search/search_input.page.dart
@@ -4,9 +4,11 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/providers/search/paginated_search.provider.dart';
+import 'package:immich_mobile/widgets/asset_grid/multiselect_grid.dart';
 import 'package:immich_mobile/widgets/search/search_filter/camera_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/display_option_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/filter_bottom_sheet_scaffold.dart';
@@ -15,8 +17,6 @@ import 'package:immich_mobile/widgets/search/search_filter/media_type_picker.dar
 import 'package:immich_mobile/widgets/search/search_filter/people_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_chip.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_utils.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:immich_mobile/widgets/asset_grid/multiselect_grid.dart';
 import 'package:openapi/api.dart';

@RoutePage()
@@ -480,9 +480,7 @@ class SearchInputPage extends HookConsumerWidget {
        ],
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () {
-            context.router.pop();
-          },
+          onPressed: () => context.router.maybePop(),
        ),
        title: TextField(
          controller: textSearchController,
--- a/mobile/lib/pages/sharing/shared_link/shared_link_edit.page.dart
+++ b/mobile/lib/pages/sharing/shared_link/shared_link_edit.page.dart
@@ -328,7 +328,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
              alignment: Alignment.bottomRight,
              child: ElevatedButton(
                onPressed: () {
-                  context.popRoute();
+                  context.maybePop();
                },
                child: const Text(
                  "share_done",
@@ -431,7 +431,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
            changeExpiry: changeExpiry,
          );
      ref.invalidate(sharedLinksStateProvider);
-      context.popRoute();
+      context.maybePop();
    }

    return Scaffold(