Update route to artist search screen

VocaDB · Apr 9, 2024 · 6f87488 · 6f87488
1 parent 787a36b
commit 6f87488
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/lib/src/features/home/presentation/home_screen/home_screen.dart b/lib/src/features/home/presentation/home_screen/home_screen.dart
@@ -9,6 +9,7 @@ import 'package:vocadb_app/src/features/home/presentation/home_screen/random_alb
 import 'package:vocadb_app/src/features/home/presentation/home_screen/recent_albums_section.dart';
 import 'package:vocadb_app/src/features/home/presentation/home_screen/recent_events_section.dart';
 import 'package:vocadb_app/src/features/home/presentation/home_screen/shortcut_menu_button.dart';
+import 'package:vocadb_app/src/routing/app_route_context.dart';
 
 class HomeScreen extends StatelessWidget {
   const HomeScreen({super.key});
@@ -38,7 +39,9 @@ class HomeScreen extends StatelessWidget {
                   ShortcutMenuButton(
                     title: 'Artists', 
                     iconData: Icons.person, 
-                    onPressed: () {},
+                    onPressed: () {
+                      context.goArtistSearchScreen();
+                    },
                   ),
                   ShortcutMenuButton(
                     title: 'Albums', 

diff --git a/lib/src/routing/app_route_context.dart b/lib/src/routing/app_route_context.dart
@@ -29,6 +29,11 @@ extension AppRouteContext on BuildContext {
     goNamed(AppRoute.releaseEventDetail.name, pathParameters: { 'id': releaseEvent.id.toString() });
   }
 
+  Future<void> goArtistSearchScreen() async {
+    goNamed(AppRoute.artistsList.name);
+
+  }
+
   Future<void> goArtistsListFilterScreen() async {
     goNamed(AppRoute.artistsListFilter.name);
 

diff --git a/lib/src/routing/app_router.dart b/lib/src/routing/app_router.dart
@@ -27,6 +27,7 @@ import 'package:vocadb_app/src/features/users/presentation/rated_songs_screen/ra
 import 'package:vocadb_app/src/features/users/presentation/rated_songs_screen/rated_songs_screen.dart';
 import 'package:vocadb_app/src/features/songs/presentation/song_detail_screen/song_detail_screen.dart';
 import 'package:vocadb_app/src/features/tags/presentation/tag_detail_screen/tag_detail_screen.dart';
+import 'package:vocadb_app/src/routing/app_route_context.dart';
 import 'package:vocadb_app/src/routing/go_router_refresh_stream.dart';
 
 enum AppRoute {
@@ -91,13 +92,15 @@ final goRouterProvider = Provider.autoDispose<GoRouter>(
               },
             ),
             GoRoute(
-              path: 'Artists',
+              path: 'Ar',
               name: AppRoute.artistsList.name,
-              pageBuilder: (context, state) => MaterialPage(
-                key: state.pageKey,
-                fullscreenDialog: true,
-                child: const ArtistsListScreen(),
-              ),
+              builder: (context, state) {
+                return ArtistsListScreen(
+                  onSelectArtist: (artist) {
+                    context.goArtistDetail(artist);
+                  }
+                );
+              },
               routes: [
                 GoRoute(
                   path: 'Filter',
@@ -107,7 +110,15 @@ final goRouterProvider = Provider.autoDispose<GoRouter>(
                     fullscreenDialog: true,
                     child: const ArtistsFilterScreen(),
                   ),
-                )
+                ),
+            GoRoute(
+              path: ':id',
+              name: AppRoute.artistDetail.name,
+              builder: (context, state) {
+                final artistId = state.pathParameters['id']!;
+                return ArtistDetailScreen(artistId: artistId);
+              },
+            ),
               ],
             ),
             GoRoute(
@@ -118,14 +129,6 @@ final goRouterProvider = Provider.autoDispose<GoRouter>(
                 return AlbumDetailScreen(album: Album(id: int.parse(albumId)));
               },
             ),
-            GoRoute(
-              path: 'Ar/:id',
-              name: AppRoute.artistDetail.name,
-              builder: (context, state) {
-                final artistId = state.pathParameters['id']!;
-                return ArtistDetailScreen(artistId: artistId);
-              },
-            ),
             GoRoute(
               path: 'T/:id',
               name: AppRoute.tagDetail.name,