Fix pop error

canopas · Jan 8, 2025 · eb46e17 · eb46e17
1 parent dc8b12e
commit eb46e17
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 63 deletions.
diff --git a/app/lib/ui/flow/albums/albums_screen.dart b/app/lib/ui/flow/albums/albums_screen.dart
@@ -104,6 +104,7 @@ class _AlbumsScreenState extends ConsumerState<AlbumsScreen> {
               media: state.medias[album.id],
               onTap: () async {
                 await AlbumMediaListRoute(
+                  albumId: album.id,
                   $extra: album,
                 ).push(context);
                 _notifier.loadAlbums();

diff --git a/app/lib/ui/flow/media_selection/media_selection_screen.dart b/app/lib/ui/flow/media_selection/media_selection_screen.dart
@@ -157,7 +157,7 @@ class _MediaSelectionScreenState extends ConsumerState<MediaSelectionScreen> {
                   ),
                   itemCount: gridEntry.value.length,
                   itemBuilder: (context, index) => AppMediaThumbnail(
-                    heroTag: "selection",
+                    heroTag: "selection${gridEntry.value.elementAt(index)}",
                     onTap: () {
                       _notifier.toggleMediaSelection(
                         gridEntry.value.elementAt(index),

diff --git a/app/lib/ui/navigation/app_route.dart b/app/lib/ui/navigation/app_route.dart
@@ -20,8 +20,8 @@ class AppRoutePath {
   static const onBoard = '/on-board';
   static const home = '/';
   static const albums = '/albums';
-  static const add = 'add';
-  static const mediaList = 'media-list';
+  static const addAlbum = '/add-album';
+  static const albumMediaList = '/albums/:albumId';
   static const transfer = '/transfer';
   static const accounts = '/accounts';
   static const preview = '/preview';
@@ -49,13 +49,7 @@ class OnBoardRoute extends GoRouteData {
     ),
     TypedStatefulShellBranch<AlbumsShellBranch>(
       routes: [
-        TypedGoRoute<AlbumsRoute>(
-          path: AppRoutePath.albums,
-          routes: [
-            TypedGoRoute<AddAlbumRoute>(path: AppRoutePath.add),
-            TypedGoRoute<AlbumMediaListRoute>(path: AppRoutePath.mediaList),
-          ],
-        ),
+        TypedGoRoute<AlbumsRoute>(path: AppRoutePath.albums),
       ],
     ),
     TypedStatefulShellBranch<TransferShellBranch>(
@@ -105,9 +99,8 @@ class AlbumsRoute extends GoRouteData {
       const AlbumsScreen();
 }
 
+@TypedGoRoute<AddAlbumRoute>(path: AppRoutePath.addAlbum)
 class AddAlbumRoute extends GoRouteData {
-  static final GlobalKey<NavigatorState> $parentNavigatorKey = rootNavigatorKey;
-
   final Album? $extra;
 
   const AddAlbumRoute({this.$extra});
@@ -117,12 +110,12 @@ class AddAlbumRoute extends GoRouteData {
       AddAlbumScreen(editAlbum: $extra);
 }
 
+@TypedGoRoute<AlbumMediaListRoute>(path: AppRoutePath.albumMediaList)
 class AlbumMediaListRoute extends GoRouteData {
-  static final GlobalKey<NavigatorState> $parentNavigatorKey = rootNavigatorKey;
-
   final Album $extra;
+  final String albumId;
 
-  const AlbumMediaListRoute({required this.$extra});
+  const AlbumMediaListRoute({required this.$extra, required this.albumId});
 
   @override
   Widget build(BuildContext context, GoRouterState state) =>

diff --git a/app/lib/ui/navigation/app_route.g.dart b/app/lib/ui/navigation/app_route.g.dart