refactor(learning-support): convert learning support navigation to go_router

dabblingwithcode · claude · dabblingwithcode · commit 270c9d0e3b89 · 2026-03-23T15:11:14.000+01:00
Replace all Navigator.push calls in the learning support presentation
layer with context.push() calls. Add two missing GoRoutes
(learningSupportNewPlan, learningSupportNewStatus) to app_router.dart.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/school_data_hub_flutter/lib/core/router/app_router.dart b/school_data_hub_flutter/lib/core/router/app_router.dart
@@ -50,6 +50,7 @@ import 'package:school_data_hub_flutter/features/learning_support/presentation/s
 import 'package:school_data_hub_flutter/features/learning_support/presentation/set_bulk_support_categoies_status_screen/set_bulk_support_categoies_status_scren.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/new_support_goal_screen/new_support_goal_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/new_support_category_status_screen/controller/new_support_category_status_controller.dart';
+import 'package:school_data_hub_flutter/features/learning_support/presentation/new_learning_support_plan_screen/controller/new_learning_support_plan_controller.dart' show NewLearningSupportPlan;
 import 'package:school_data_hub_flutter/features/workbooks/presentation/workbook_list_screen/workbook_list_screen.dart';
 import 'package:school_data_hub_flutter/features/workbooks/presentation/new_workbook_screen/new_workbook_screen.dart';
 import 'package:school_data_hub_flutter/features/books/presentation/books_main_menu_screen/books_main_menu_screen.dart';
@@ -456,6 +457,29 @@ class AppRouter {
               state.extra! as NewSupportCategoryStatusController,
             ),
           ),
+          GoRoute(
+            path: RoutePaths.learningSupportNewPlan,
+            builder: (_, state) {
+              final args = state.extra! as Map<String, dynamic>;
+              return NewLearningSupportPlan(
+                pupil: args['pupil'] as PupilProxy,
+                existingPlan: args['existingPlan'] as LearningSupportPlan?,
+              );
+            },
+          ),
+          GoRoute(
+            path: RoutePaths.learningSupportNewStatus,
+            builder: (_, state) {
+              final args = state.extra! as Map<String, dynamic>;
+              return NewSupportCategoryStatus(
+                appBarTitle: args['appBarTitle'] as String,
+                pupilId: args['pupilId'] as int,
+                goalCategoryId: args['goalCategoryId'] as int,
+                elementType: args['elementType'] as String,
+                existingGoal: args['existingGoal'] as SupportGoal?,
+              );
+            },
+          ),
 
           // --- Matrix ---
           GoRoute(
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/new_learning_support_plan_screen/index.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/new_learning_support_plan_screen/index.dart
@@ -4,14 +4,14 @@
 ///
 /// Usage:
 /// ```dart
-/// import 'package:school_data_hub_flutter/features/learning_support/presentation/new_learning_support_plan/new_learning_support_plan.dart';
+/// import 'package:go_router/go_router.dart';
+/// import 'package:school_data_hub_flutter/core/router/route_paths.dart';
 ///
 /// // Navigate to create a new learning support plan
-/// Navigator.of(context, rootNavigator: true).push(
-///   MaterialPageRoute(
-///     builder: (context) => NewLearningSupportPlan(pupil: pupil),
-///   ),
-/// );
+/// context.push(RoutePaths.learningSupportNewPlan, extra: {
+///   'pupil': pupil,
+///   'existingPlan': null,
+/// });
 /// ```
 library;
 
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_category_status_screen/new_support_category_status_screen.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_category_status_screen/new_support_category_status_screen.dart
@@ -1,14 +1,15 @@
 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_flutter/common/widgets/growth_dropdown.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/button.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/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/support_category_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/new_support_category_status_screen/controller/new_support_category_status_controller.dart';
-import 'package:school_data_hub_flutter/features/learning_support/presentation/select_support_category_screen/select_support_category_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/dialogs/goal_examples_dialog.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_category_parents_names.dart';
 
@@ -66,19 +67,16 @@ class NewSupportCategoryStatusScreen extends StatelessWidget {
                             ? Button(
                                 onPressed: () async {
                                   final int? categoryId =
-                                      await Navigator.of(context, rootNavigator: true).push(
-                                        MaterialPageRoute<int>(
-                                          builder: (ctx) =>
-                                              SelectSupportCategoryScreen(
-                                                pupil: pupilManager
-                                                    .getPupilByPupilId(
-                                                      controller.widget.pupilId,
-                                                    )!,
-                                                elementType: controller
-                                                    .widget
-                                                    .elementType,
-                                              ),
-                                        ),
+                                      await context.push<int>(
+                                        RoutePaths.learningSupportCategorySelect,
+                                        extra: {
+                                          'pupil': pupilManager
+                                              .getPupilByPupilId(
+                                                controller.widget.pupilId,
+                                              )!,
+                                          'elementType':
+                                              controller.widget.elementType,
+                                        },
                                       );
                                   if (categoryId == null) {
                                     return;
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_goal_screen/new_support_goal_screen.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_goal_screen/new_support_goal_screen.dart
@@ -1,13 +1,14 @@
 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_flutter/common/widgets/growth_dropdown.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/button.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/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/support_category_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/new_support_category_status_screen/controller/new_support_category_status_controller.dart';
-import 'package:school_data_hub_flutter/features/learning_support/presentation/select_support_category_screen/select_support_category_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_category_parents_names.dart';
 
 class NewSupportGoalScreen extends StatelessWidget {
@@ -55,17 +56,17 @@ class NewSupportGoalScreen extends StatelessWidget {
                             controller.goalCategoryId == 0
                         ? Button(
                             onPressed: () async {
-                              final int?
-                              categoryId = await Navigator.of(context, rootNavigator: true).push(
-                                MaterialPageRoute<int>(
-                                  builder: (ctx) => SelectSupportCategoryScreen(
-                                    pupil: pupilManager.getPupilByPupilId(
-                                      controller.widget.pupilId,
-                                    )!,
-                                    elementType: controller.widget.elementType,
-                                  ),
-                                ),
-                              );
+                              final int? categoryId =
+                                  await context.push<int>(
+                                    RoutePaths.learningSupportCategorySelect,
+                                    extra: {
+                                      'pupil': pupilManager.getPupilByPupilId(
+                                        controller.widget.pupilId,
+                                      )!,
+                                      'elementType':
+                                          controller.widget.elementType,
+                                    },
+                                  );
                               if (categoryId == null) {
                                 return;
                               }
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/post_or_patch_support_category_screen/post_or_patch_support_category_screen.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/post_or_patch_support_category_screen/post_or_patch_support_category_screen.dart
@@ -1,12 +1,14 @@
 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/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/app_header.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/button.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/learning_support/domain/support_category_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_sortable_screen/select_parent_category_screen.dart';
 
@@ -111,12 +113,9 @@ class _PostOrPatchSupportCategoryScreenState
   }
 
   Future<void> _openSelectParent() async {
-    final result = await Navigator.of(context, rootNavigator: true).push<int>(
-      MaterialPageRoute<int>(
-        builder: (ctx) => SelectParentCategoryScreen(
-          movingCategoryId: widget.category?.categoryId ?? -1,
-        ),
-      ),
+    final result = await context.push<int>(
+      RoutePaths.learningSupportCategorySelectParent,
+      extra: widget.category?.categoryId ?? -1,
     );
     if (result != null && mounted) {
       if (result == SelectParentCategoryScreen.rootSentinel) {
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_screen/support_category_list_screen.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_screen/support_category_list_screen.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_it/flutter_it.dart';
+import 'package:go_router/go_router.dart';
 import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar/action_bar.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/app_header.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/style.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/tappable_icon.dart';
+import 'package:school_data_hub_flutter/core/router/route_paths.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/support_category_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_screen/widgets/support_category_tree.dart';
-import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_sortable_screen/sortable_support_category_list_screen.dart';
 
 class CategoryListScreen extends WatchingWidget {
   const CategoryListScreen({super.key});
@@ -47,11 +48,7 @@ class CategoryListScreen extends WatchingWidget {
             icon: const Icon(Icons.edit_rounded, size: 30),
             tooltip: 'Reihenfolge ändern',
             onPressed: () {
-              Navigator.of(context, rootNavigator: true).push<void>(
-                MaterialPageRoute<void>(
-                  builder: (ctx) => const SortableSupportCategoryListScreen(),
-                ),
-              );
+              context.push(RoutePaths.learningSupportCategorySortable);
             },
           ),
         ],
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_sortable_screen/sortable_support_category_list_screen.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_sortable_screen/sortable_support_category_list_screen.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_it/flutter_it.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/common/widgets/bottom_nav_bar/action_bar.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/app_header.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/style.dart';
 import 'package:school_data_hub_flutter/common/widgets/orient_ui/tappable_icon.dart';
+import 'package:school_data_hub_flutter/core/router/route_paths.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/support_category_manager.dart';
-import 'package:school_data_hub_flutter/features/learning_support/presentation/post_or_patch_support_category_screen/post_or_patch_support_category_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_sortable_screen/widgets/support_category_tree_sortable.dart';
 
 class SortableSupportCategoryListScreen extends WatchingWidget {
@@ -60,14 +61,7 @@ class SortableSupportCategoryListScreen extends WatchingWidget {
             icon: const Icon(Icons.add, size: 30),
             tooltip: 'Neue Kategorie',
             onPressed: () {
-              Navigator.of(context, rootNavigator: true).push<void>(
-                MaterialPageRoute<void>(
-                  builder: (ctx) => const PostOrPatchSupportCategoryScreen(
-                    category: null,
-                    parentCategoryId: null,
-                  ),
-                ),
-              );
+              context.push(RoutePaths.learningSupportCategoryEdit);
             },
           ),
         ],
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_sortable_screen/widgets/support_category_card_sortable.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_sortable_screen/widgets/support_category_card_sortable.dart
@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart' hide ReorderableList;
 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/common/widgets/expansion/expansion_body.dart';
 import 'package:school_data_hub_flutter/common/widgets/expansion/expansion_controller.dart';
 import 'package:school_data_hub_flutter/common/widgets/expansion/expansion_header.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/reorderable_list.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/learning_support/domain/support_category_manager.dart';
-import 'package:school_data_hub_flutter/features/learning_support/presentation/post_or_patch_support_category_screen/post_or_patch_support_category_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_sortable_screen/select_parent_category_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_sortable_screen/widgets/support_category_leaf_card_sortable.dart';
 
@@ -88,12 +89,9 @@ class _SupportCategoryCardSortableState
   }
 
   Future<void> _navigateToSelectParent(BuildContext context) async {
-    final result = await Navigator.of(context, rootNavigator: true).push<int>(
-      MaterialPageRoute<int>(
-        builder: (ctx) => SelectParentCategoryScreen(
-          movingCategoryId: widget.category.categoryId,
-        ),
-      ),
+    final result = await context.push<int>(
+      RoutePaths.learningSupportCategorySelectParent,
+      extra: widget.category.categoryId,
     );
     if (result != null && context.mounted) {
       final newParent = result == SelectParentCategoryScreen.rootSentinel
@@ -182,12 +180,9 @@ class _SupportCategoryCardSortableState
                       size: 22,
                     ),
                     onPressed: () {
-                      Navigator.of(context, rootNavigator: true).push<void>(
-                        MaterialPageRoute<void>(
-                          builder: (ctx) => PostOrPatchSupportCategoryScreen(
-                            category: widget.category,
-                          ),
-                        ),
+                      context.push(
+                        RoutePaths.learningSupportCategoryEdit,
+                        extra: {'category': widget.category},
                       );
                     },
                     tooltip: 'Kategorie bearbeiten',
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_sortable_screen/widgets/support_category_leaf_card_sortable.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/support_category_list_sortable_screen/widgets/support_category_leaf_card_sortable.dart
@@ -1,11 +1,12 @@
 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/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/learning_support/domain/support_category_manager.dart';
-import 'package:school_data_hub_flutter/features/learning_support/presentation/post_or_patch_support_category_screen/post_or_patch_support_category_screen.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/support_category_list_sortable_screen/select_parent_category_screen.dart';
 
 class SupportCategoryLeafCardSortable extends StatelessWidget {
@@ -19,11 +20,9 @@ class SupportCategoryLeafCardSortable extends StatelessWidget {
   });
 
   Future<void> _navigateToSelectParent(BuildContext context) async {
-    final result = await Navigator.of(context, rootNavigator: true).push<int>(
-      MaterialPageRoute<int>(
-        builder: (ctx) =>
-            SelectParentCategoryScreen(movingCategoryId: category.categoryId),
-      ),
+    final result = await context.push<int>(
+      RoutePaths.learningSupportCategorySelectParent,
+      extra: category.categoryId,
     );
     if (result != null && context.mounted) {
       final newParent = result == SelectParentCategoryScreen.rootSentinel
@@ -67,11 +66,9 @@ class SupportCategoryLeafCardSortable extends StatelessWidget {
               size: 22,
             ),
             onPressed: () {
-              Navigator.of(context, rootNavigator: true).push<void>(
-                MaterialPageRoute<void>(
-                  builder: (ctx) =>
-                      PostOrPatchSupportCategoryScreen(category: category),
-                ),
+              context.push(
+                RoutePaths.learningSupportCategoryEdit,
+                extra: {'category': category},
               );
             },
             tooltip: 'Kategorie bearbeiten',
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/learning_support_plan_card.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/learning_support_plan_card.dart
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_card.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_card.dart
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart
