Complete go_router migration

Author: dabblingwithcode

school_data_hub_flutter/lib/core/router/app_router.dart

@@ -58,6 +58,7 @@ import 'package:school_data_hub_flutter/features/books/presentation/book_infos_s
 import 'package:school_data_hub_flutter/features/books/presentation/edit_book_screen/edit_book_controller.dart';
 import 'package:school_data_hub_flutter/features/books/domain/models/library_book_proxy.dart';
 import 'package:school_data_hub_flutter/features/learning/competence_report/presentation/competence_report_item_list_screen/competence_report_item_list_scope.dart';
+import 'package:school_data_hub_flutter/features/learning/competence/presentation/pupil_list_learning_screen/widgets/pupil_competence_goals/new_competence_goal_page.dart';
 // School lists
 import 'package:school_data_hub_flutter/features/school_lists/presentation/school_lists_screen/school_lists_screen.dart';
 import 'package:school_data_hub_flutter/features/school_lists/presentation/new_list_screen/new_school_list_screen.dart';
@@ -67,6 +68,7 @@ import 'package:school_data_hub_flutter/features/authorizations/presentation/new
 import 'package:school_data_hub_flutter/features/authorizations/presentation/authorization_pupils_screen/authorization_pupils_screen.dart';
 // School calendar
 import 'package:school_data_hub_flutter/features/school_calendar/presentation/school_semester_list_screen/school_semester_list_screen.dart';
+import 'package:school_data_hub_flutter/features/school_calendar/presentation/new_school_semester_screen/new_school_semester_screen.dart';
 // Tools
 import 'package:school_data_hub_flutter/features/timetable/presentation/timetable_screen/timetable_screen.dart';
 import 'package:school_data_hub_flutter/features/timetable/presentation/new_timetable_screen/new_timetable_screen.dart';
@@ -91,6 +93,7 @@ import 'package:school_data_hub_flutter/features/matrix/rooms/presentation/matri
 import 'package:school_data_hub_flutter/features/matrix/rooms/presentation/new_matrix_room_screen/new_matrix_room_screen.dart';
 import 'package:school_data_hub_flutter/features/matrix/policy/presentation/matrix_event_reports_screen/matrix_event_reports_screen.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/select_matrix_users_list_screen/controller/select_matrix_users_list_controller.dart';
+import 'package:school_data_hub_flutter/features/matrix/rooms/presentation/select_matrix_rooms_list_screen/controller/select_matrix_rooms_list_controller.dart';
 import 'package:school_data_hub_flutter/features/matrix/rooms/domain/models/matrix_room.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/domain/models/matrix_user.dart';
 // Admin / User
@@ -109,6 +112,12 @@ import 'package:school_data_hub_flutter/features/school/presentation/edit_school
 import 'package:school_data_hub_flutter/app_utils/logger/presentation/logs_screen/logs_screen.dart';
 import 'package:school_data_hub_flutter/features/user/presentation/change_password/change_password_screen.dart';
 import 'package:school_data_hub_flutter/features/books/presentation/book_search_form_screen/book_search_form_screen.dart';
+import 'package:school_data_hub_flutter/features/books/presentation/book_search_form_screen/select_book_tags_screen.dart';
+import 'package:school_data_hub_flutter/features/books/presentation/book_search_screen/book_search_results_screen.dart';
+import 'package:school_data_hub_flutter/features/books/presentation/book_tag_management_screen/book_tag_management_controller.dart';
+import 'package:school_data_hub_flutter/features/books/presentation/new_book_screen/new_book_controller.dart';
+import 'package:school_data_hub_flutter/features/books/presentation/edit_book_screen/book_tag_selection_screen.dart';
+import 'package:school_data_hub_flutter/features/books/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/statistics/chart_screen/chart_page_controller.dart';
 import 'package:school_data_hub_flutter/features/statistics/statistics_screen/controller/statistics.dart';
 import 'package:school_data_hub_flutter/app_utils/shorebird_code_push_screen.dart';
@@ -283,6 +292,12 @@ class AppRouter {
             path: RoutePaths.schoolSemesters,
             builder: (_, __) => const SchoolSemesterListScreen(),
           ),
+          GoRoute(
+            path: RoutePaths.schoolSemesterNew,
+            builder: (_, state) => NewSchoolSemesterScreen(
+              semester: state.extra as SchoolSemester?,
+            ),
+          ),
           GoRoute(
             path: RoutePaths.learningCompetencesSortable,
             builder: (_, __) => const CompetenceSortableListScreen(),
@@ -297,7 +312,9 @@ class AppRouter {
           ),
           GoRoute(
             path: RoutePaths.adminUsersNew,
-            builder: (_, __) => const CreateOrEditUserScreen(),
+            builder: (_, state) => CreateOrEditUserScreen(
+              userWithDevices: state.extra as UserWithDevices?,
+            ),
           ),
           GoRoute(
             path: RoutePaths.adminUsersResetPassword,
@@ -389,6 +406,17 @@ class AppRouter {
                       as void Function(BuildContext, Competence)?,
             ),
           ),
+          GoRoute(
+            path: RoutePaths.learningCompetenceGoalNew,
+            builder: (_, state) {
+              final args = state.extra as Map<String, dynamic>?;
+              return NewCompetenceGoalScreen(
+                pupilId: args?['pupilId'] as int?,
+                competenceId: args?['competenceId'] as int?,
+                existingGoal: args?['existingGoal'] as CompetenceGoal?,
+              );
+            },
+          ),
 
           // --- Learning Competence Report ---
           GoRoute(
@@ -521,6 +549,15 @@ class AppRouter {
               );
             },
           ),
+          GoRoute(
+            path: RoutePaths.adminMatrixSelectRooms,
+            builder: (_, state) {
+              final args = state.extra! as Map<String, dynamic>;
+              return SelectMatrixRoomsList(
+                args['selectableRooms'] as List<String>?,
+              );
+            },
+          ),
 
           // --- Admin / User ---
           GoRoute(
@@ -542,6 +579,71 @@ class AppRouter {
               libraryId: state.extra! as String,
             ),
           ),
+          GoRoute(
+            path: RoutePaths.learningBooksTags,
+            builder: (_, __) => const BookTagManagement(),
+          ),
+          GoRoute(
+            path: RoutePaths.learningBooksSelectTags,
+            builder: (_, state) {
+              final args = state.extra as Map<String, dynamic>?;
+              return SelectBookTagsScreen(
+                initialSelectedTags:
+                    (args?['initialSelectedTags'] as List<dynamic>?)
+                        ?.cast<BookTag>() ??
+                    const [],
+              );
+            },
+          ),
+          GoRoute(
+            path: RoutePaths.learningBooksNew,
+            builder: (_, state) {
+              final args = state.extra! as Map<String, dynamic>;
+              return NewBook(
+                isEdit: args['isEdit'] as bool,
+                isbn: args['isbn'] as int,
+                libraryId: args['libraryId'] as String?,
+                bookTitle: args['bookTitle'] as String?,
+                bookAuthor: args['bookAuthor'] as String?,
+                bookDescription: args['bookDescription'] as String?,
+                bookReadingLevel: args['bookReadingLevel'] as String?,
+                location: args['location'] as LibraryBookLocation?,
+                bookAvailable: args['bookAvailable'] as bool?,
+                imageId: args['imageId'] as String?,
+                bookTags: (args['bookTags'] as List<dynamic>?)
+                    ?.cast<BookTagging>(),
+              );
+            },
+          ),
+          GoRoute(
+            path: RoutePaths.learningBooksTagSelection,
+            builder: (_, state) {
+              final args = state.extra! as Map<String, dynamic>;
+              return BookTagSelectionScreen(
+                allTags: (args['allTags'] as List<dynamic>).cast<BookTag>(),
+                selectedTagIds: (args['selectedTagIds'] as Set<dynamic>)
+                    .cast<int>(),
+              );
+            },
+          ),
+          GoRoute(
+            path: RoutePaths.learningBooksResults,
+            builder: (_, state) {
+              final args = state.extra as Map<String, dynamic>?;
+              return BookSearchResultsScreen(
+                title: args?['title'] as String?,
+                author: args?['author'] as String?,
+                keywords: args?['keywords'] as String?,
+                location: args?['location'] as LibraryBookLocation?,
+                readingLevel: args?['readingLevel'] as String?,
+                borrowStatus: args?['borrowStatus'] as BorrowedStatus?,
+                selectedTags:
+                    (args?['selectedTags'] as List<dynamic>?)
+                        ?.cast<BookTag>() ??
+                    const [],
+              );
+            },
+          ),
 
           // --- Timetable ---
           GoRoute(
@@ -653,6 +755,9 @@ class AppRouter {
               return PdfViewerScreen(
                 pdfGenerator: args['pdfGenerator'] as Future<File> Function(),
                 title: (args['title'] as String?) ?? 'PDF Vorschau',
+                iconData:
+                    (args['iconData'] as IconData?) ?? Icons.picture_as_pdf,
+                showZoomButton: (args['showZoomButton'] as bool?) ?? false,
               );
             },
           ),

school_data_hub_flutter/lib/core/router/route_paths.dart

@@ -39,6 +39,7 @@ abstract final class RoutePaths {
   static const schoolEdit = '/school/edit';
   static const schoolCalendar = '/school/calendar';
   static const schoolSemesters = '/school/semesters';
+  static const schoolSemesterNew = '/school/semesters/new';
 
   // --- Authorizations ---
   static const authorizationNew = '/authorizations/new';
@@ -102,6 +103,7 @@ abstract final class RoutePaths {
   // --- Books (additional) ---
   static const learningBooksEdit = '/learning/books/edit';
   static const learningBooksInfo = '/learning/books/info';
+  static const learningBooksTagSelection = '/learning/books/tag-selection';
 
   // --- Tools ---
   static const toolsTimetable = '/tools/timetable';
@@ -139,6 +141,7 @@ abstract final class RoutePaths {
   static const adminMatrixRoomNew = '/admin/matrix/rooms/new';
   static const adminMatrixEventReports = '/admin/matrix/event-reports';
   static const adminMatrixSelectUsers = '/admin/matrix/select-users';
+  static const adminMatrixSelectRooms = '/admin/matrix/select-rooms';
 
   // --- Admin (additional) ---
   static const adminUsersBatchImport = '/admin/users/batch-import';

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_identity_stream_screen/connection_code_dialog.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/style.dart';
+import 'package:school_data_hub_flutter/core/router/route_paths.dart';
 import 'package:school_data_hub_flutter/features/_pupil/domain/models/enums.dart';
-import 'package:school_data_hub_flutter/features/_pupil/presentation/pupil_identity_stream_screen/pupil_identity_stream_screen.dart';
 
 Future<void> showConnectionCodeDialog(BuildContext context) async {
   final controller = TextEditingController();
@@ -42,14 +43,13 @@ Future<void> showConnectionCodeDialog(BuildContext context) async {
               final code = controller.text.trim();
               if (code.isNotEmpty) {
                 Navigator.of(context).pop();
-                Navigator.of(context, rootNavigator: true).push(
-                  MaterialPageRoute<void>(
-                    builder: (context) => PupilIdentityStreamScreen(
-                      role: PupilIdentityStreamRole.receiver,
-                      encryptedData: null,
-                      importedChannelName: code,
-                    ),
-                  ),
+                context.push(
+                  RoutePaths.pupilIdentityStream,
+                  extra: {
+                    'role': PupilIdentityStreamRole.receiver,
+                    'encryptedData': null,
+                    'importedChannelName': code,
+                  },
                 );
               }
             },

school_data_hub_flutter/lib/features/_pupil/presentation/pupil_profile_screen/pupil_profile_screen_content/authorization_content/pupil_profile_authorization_entry_card.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_it/flutter_it.dart';
 import 'package:gap/gap.dart';
+import 'package:go_router/go_router.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/common/widgets/buttons_switches/custom_checkbox_either_or.dart';
@@ -11,8 +12,8 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_di
 import 'package:school_data_hub_flutter/common/widgets/hub_document/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/card_box.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/style.dart';
+import 'package:school_data_hub_flutter/core/router/route_paths.dart';
 import 'package:school_data_hub_flutter/features/authorizations/domain/authorization_manager.dart';
-import 'package:school_data_hub_flutter/features/authorizations/presentation/authorization_pupils_screen/authorization_pupils_screen.dart';
 import 'package:school_data_hub_flutter/features/_pupil/domain/models/pupil_proxy.dart';
 
 class PupilProfileAuthorizationCard extends WatchingWidget {
@@ -51,11 +52,9 @@ class PupilProfileAuthorizationCard extends WatchingWidget {
                         children: [
                           GestureDetector(
                             onTap: () {
-                              Navigator.of(context, rootNavigator: true).push(
-                                MaterialPageRoute<void>(
-                                  builder: (ctx) =>
-                                      AuthorizationPupilsScreen(authorization),
-                                ),
+                              context.push(
+                                RoutePaths.authorizationPupils,
+                                extra: authorization,
                               );
                             },
                             onLongPress: () async {