implemented container site assignements & improved routing

Author: FaFre

app/lib/core/providers/router.dart

@@ -49,6 +49,6 @@ Future<GoRouter> router(Ref ref) async {
   return GoRouter(
     debugLogDiagnostics: true,
     routes: $appRoutes,
-    initialLocation: initialLocation,
+    initialLocation: initialLocation ?? BrowserRoute().location,
   );
 }

app/lib/core/providers/router.g.dart

@@ -21,7 +21,7 @@ part of 'routes.dart';
 
 @TypedGoRoute<BrowserRoute>(
   name: BrowserRoute.name,
-  path: '/',
+  path: '/browser',
   routes: [
     TypedGoRoute<SearchRoute>(
       name: 'SearchRoute',
@@ -44,11 +44,11 @@ part of 'routes.dart';
       routes: [
         TypedGoRoute<ContainerCreateRoute>(
           name: 'ContainerCreateRoute',
-          path: 'create',
+          path: 'create/:containerData',
         ),
         TypedGoRoute<ContainerEditRoute>(
           name: 'ContainerEditRoute',
-          path: 'edit',
+          path: 'edit/:containerData',
         ),
       ],
     ),
@@ -135,37 +135,45 @@ class ContainerSelectionRoute extends GoRouteData
 }
 
 class ContainerEditRoute extends GoRouteData with $ContainerEditRoute {
-  final ContainerDataWithCount $extra;
+  final String containerData;
 
-  ContainerEditRoute(this.$extra);
+  ContainerEditRoute({required this.containerData});
 
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return ContainerEditScreen.edit(initialContainer: $extra);
+    return ContainerEditScreen.edit(
+      initialContainer: ContainerData.fromJson(
+        jsonDecode(containerData) as Map<String, dynamic>,
+      ),
+    );
   }
 }
 
 class ContainerCreateRoute extends GoRouteData with $ContainerCreateRoute {
-  final ContainerData $extra;
+  final String containerData;
 
-  ContainerCreateRoute(this.$extra);
+  ContainerCreateRoute({required this.containerData});
 
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return ContainerEditScreen.create(initialContainer: $extra);
+    return ContainerEditScreen.create(
+      initialContainer: ContainerData.fromJson(
+        jsonDecode(containerData) as Map<String, dynamic>,
+      ),
+    );
   }
 }
 
 class ContextMenuRoute extends GoRouteData with $ContextMenuRoute {
-  final String $extra;
+  final String hitResult;
 
-  const ContextMenuRoute(this.$extra);
+  const ContextMenuRoute({required this.hitResult});
 
   @override
   Page<void> buildPage(BuildContext context, GoRouterState state) {
     return DialogPage(
       builder: (_) =>
-          ContextMenuDialog(hitResult: HitResultJson.fromJson($extra)),
+          ContextMenuDialog(hitResult: HitResultJson.fromJson(hitResult)),
     );
   }
 }

app/lib/core/routing/routes.browser.dart

@@ -21,6 +21,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:nullability/nullability.dart';
 import 'package:weblibre/core/routing/widgets/dialog_page.dart';
 import 'package:weblibre/features/about/presentation/screens/about.dart';
 import 'package:weblibre/features/bangs/presentation/screens/categories.dart';
@@ -39,6 +40,7 @@ import 'package:weblibre/features/geckoview/features/tabs/presentation/screens/c
 import 'package:weblibre/features/geckoview/features/tabs/presentation/screens/container_edit.dart';
 import 'package:weblibre/features/geckoview/features/tabs/presentation/screens/container_list.dart';
 import 'package:weblibre/features/geckoview/features/tabs/presentation/screens/container_selection.dart';
+import 'package:weblibre/features/geckoview/features/tabs/presentation/screens/container_sites.dart';
 import 'package:weblibre/features/onboarding/presentation/onboarding.dart';
 import 'package:weblibre/features/settings/presentation/screens/addon_collection.dart';
 import 'package:weblibre/features/settings/presentation/screens/bang_settings.dart';

app/lib/core/routing/routes.dart

@@ -90,15 +90,18 @@ class FeedEditRoute extends GoRouteData with $FeedEditRoute {
 }
 
 class FeedAddRoute extends GoRouteData with $FeedAddRoute {
-  final Uri? $extra;
+  final String? uri;
 
   static const name = 'FeedAddRoute';
 
-  const FeedAddRoute({this.$extra});
+  const FeedAddRoute({required this.uri});
 
   @override
   Page<void> buildPage(BuildContext context, GoRouterState state) {
-    return DialogPage(builder: (_) => AddFeedDialog(initialUri: $extra));
+    return DialogPage(
+      builder: (_) =>
+          AddFeedDialog(initialUri: uri.mapNotNull((uri) => Uri.tryParse(uri))),
+    );
   }
 }