MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

implemented container site assignements & improved routing

Browse Source
This commit is contained in:
Fabian Freund
2025-11-09 07:25:54 +01:00
parent da232bf8aa
commit 107b2a9aa6
45 changed files with 1104 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/core/providers/router.dart
+1 -1
View File
@@ -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
+1 -1
View File
@@ -41,4 +41,4 @@ final class RouterProvider
}
}
String _$routerHash() => r'87b6e6c1097a0677f3d25570341b343b4392aa59';
String _$routerHash() => r'ab1d1e2ea27dd41fe78d7430bfeba87051d88d36';
app/lib/core/routing/routes.browser.dart
+20 -12
View File
@@ -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.dart
+2
View File
@@ -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.feeds.dart
+6 -3
View File
@@ -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))),
);
}
}
app/lib/core/routing/routes.g.dart
+49 -45
View File
@@ -376,7 +376,7 @@ mixin $AddonCollectionRoute on GoRouteData {
}
RouteBase get $browserRoute => GoRouteData.$route(
path: '/',
path: '/browser',
name: 'BrowserRoute',
factory: $BrowserRoute._fromState,
routes: [
@@ -416,12 +416,12 @@ RouteBase get $browserRoute => GoRouteData.$route(
factory: $ContainerListRoute._fromState,
routes: [
GoRouteData.$route(
path: 'create',
path: 'create/:containerData',
name: 'ContainerCreateRoute',
factory: $ContainerCreateRoute._fromState,
),
GoRouteData.$route(
path: 'edit',
path: 'edit/:containerData',
name: 'ContainerEditRoute',
factory: $ContainerEditRoute._fromState,
),
@@ -449,7 +449,7 @@ mixin $BrowserRoute on GoRouteData {
static BrowserRoute _fromState(GoRouterState state) => BrowserRoute();
@override
String get location => GoRouteData.$location('/');
String get location => GoRouteData.$location('/browser');
@override
void go(BuildContext context) => context.go(location);
@@ -483,7 +483,7 @@ mixin $SearchRoute on GoRouteData {
@override
String get location => GoRouteData.$location(
'/search/${Uri.encodeComponent(_$TabTypeEnumMap[_self.tabType]!)}/${Uri.encodeComponent(_self.searchText)}',
'/browser/search/${Uri.encodeComponent(_$TabTypeEnumMap[_self.tabType]!)}/${Uri.encodeComponent(_self.searchText)}',
queryParams: {
if (_self.launchedFromIntent != false)
'launched-from-intent': _self.launchedFromIntent.toString(),
@@ -514,7 +514,7 @@ mixin $TorProxyRoute on GoRouteData {
static TorProxyRoute _fromState(GoRouterState state) => TorProxyRoute();
@override
String get location => GoRouteData.$location('/tor_proxy');
String get location => GoRouteData.$location('/browser/tor_proxy');
@override
void go(BuildContext context) => context.go(location);
@@ -534,7 +534,7 @@ mixin $HistoryRoute on GoRouteData {
static HistoryRoute _fromState(GoRouterState state) => HistoryRoute();
@override
String get location => GoRouteData.$location('/history');
String get location => GoRouteData.$location('/browser/history');
@override
void go(BuildContext context) => context.go(location);
@@ -554,7 +554,7 @@ mixin $TabViewRoute on GoRouteData {
static TabViewRoute _fromState(GoRouterState state) => TabViewRoute();
@override
String get location => GoRouteData.$location('/tab_view');
String get location => GoRouteData.$location('/browser/tab_view');
@override
void go(BuildContext context) => context.go(location);
@@ -572,27 +572,28 @@ mixin $TabViewRoute on GoRouteData {
mixin $ContextMenuRoute on GoRouteData {
static ContextMenuRoute _fromState(GoRouterState state) =>
ContextMenuRoute(state.extra as String);
ContextMenuRoute(hitResult: state.uri.queryParameters['hit-result']!);
ContextMenuRoute get _self => this as ContextMenuRoute;
@override
String get location => GoRouteData.$location('/context_menu');
String get location => GoRouteData.$location(
'/browser/context_menu',
queryParams: {'hit-result': _self.hitResult},
);
@override
void go(BuildContext context) => context.go(location, extra: _self.$extra);
void go(BuildContext context) => context.go(location);
@override
Future<T?> push<T>(BuildContext context) =>
context.push<T>(location, extra: _self.$extra);
Future<T?> push<T>(BuildContext context) => context.push<T>(location);
@override
void pushReplacement(BuildContext context) =>
context.pushReplacement(location, extra: _self.$extra);
context.pushReplacement(location);
@override
void replace(BuildContext context) =>
context.replace(location, extra: _self.$extra);
void replace(BuildContext context) => context.replace(location);
}
mixin $ContainerDraftRoute on GoRouteData {
@@ -600,7 +601,7 @@ mixin $ContainerDraftRoute on GoRouteData {
ContainerDraftRoute();
@override
String get location => GoRouteData.$location('/container_draft');
String get location => GoRouteData.$location('/browser/container_draft');
@override
void go(BuildContext context) => context.go(location);
@@ -621,7 +622,7 @@ mixin $ContainerListRoute on GoRouteData {
ContainerListRoute();
@override
String get location => GoRouteData.$location('/containers');
String get location => GoRouteData.$location('/browser/containers');
@override
void go(BuildContext context) => context.go(location);
@@ -639,52 +640,54 @@ mixin $ContainerListRoute on GoRouteData {
mixin $ContainerCreateRoute on GoRouteData {
static ContainerCreateRoute _fromState(GoRouterState state) =>
ContainerCreateRoute(state.extra as ContainerData);
ContainerCreateRoute(
containerData: state.pathParameters['containerData']!,
);
ContainerCreateRoute get _self => this as ContainerCreateRoute;
@override
String get location => GoRouteData.$location('/containers/create');
String get location => GoRouteData.$location(
'/browser/containers/create/${Uri.encodeComponent(_self.containerData)}',
);
@override
void go(BuildContext context) => context.go(location, extra: _self.$extra);
void go(BuildContext context) => context.go(location);
@override
Future<T?> push<T>(BuildContext context) =>
context.push<T>(location, extra: _self.$extra);
Future<T?> push<T>(BuildContext context) => context.push<T>(location);
@override
void pushReplacement(BuildContext context) =>
context.pushReplacement(location, extra: _self.$extra);
context.pushReplacement(location);
@override
void replace(BuildContext context) =>
context.replace(location, extra: _self.$extra);
void replace(BuildContext context) => context.replace(location);
}
mixin $ContainerEditRoute on GoRouteData {
static ContainerEditRoute _fromState(GoRouterState state) =>
ContainerEditRoute(state.extra as ContainerDataWithCount);
ContainerEditRoute(containerData: state.pathParameters['containerData']!);
ContainerEditRoute get _self => this as ContainerEditRoute;
@override
String get location => GoRouteData.$location('/containers/edit');
String get location => GoRouteData.$location(
'/browser/containers/edit/${Uri.encodeComponent(_self.containerData)}',
);
@override
void go(BuildContext context) => context.go(location, extra: _self.$extra);
void go(BuildContext context) => context.go(location);
@override
Future<T?> push<T>(BuildContext context) =>
context.push<T>(location, extra: _self.$extra);
Future<T?> push<T>(BuildContext context) => context.push<T>(location);
@override
void pushReplacement(BuildContext context) =>
context.pushReplacement(location, extra: _self.$extra);
context.pushReplacement(location);
@override
void replace(BuildContext context) =>
context.replace(location, extra: _self.$extra);
void replace(BuildContext context) => context.replace(location);
}
mixin $ContainerSelectionRoute on GoRouteData {
@@ -692,7 +695,7 @@ mixin $ContainerSelectionRoute on GoRouteData {
ContainerSelectionRoute();
@override
String get location => GoRouteData.$location('/select_container');
String get location => GoRouteData.$location('/browser/select_container');
@override
void go(BuildContext context) => context.go(location);
@@ -716,7 +719,7 @@ mixin $TabTreeRoute on GoRouteData {
@override
String get location => GoRouteData.$location(
'/tab_tree/${Uri.encodeComponent(_self.rootTabId)}',
'/browser/tab_tree/${Uri.encodeComponent(_self.rootTabId)}',
);
@override
@@ -743,7 +746,7 @@ mixin $OpenSharedContentRoute on GoRouteData {
@override
String get location => GoRouteData.$location(
'/open_content',
'/browser/open_content',
queryParams: {
if (_self.sharedUrl != 'about:blank') 'shared-url': _self.sharedUrl,
},
@@ -974,27 +977,28 @@ mixin $FeedListRoute on GoRouteData {
mixin $FeedAddRoute on GoRouteData {
static FeedAddRoute _fromState(GoRouterState state) =>
FeedAddRoute($extra: state.extra as Uri?);
FeedAddRoute(uri: state.uri.queryParameters['uri']);
FeedAddRoute get _self => this as FeedAddRoute;
@override
String get location => GoRouteData.$location('/feeds/add');
String get location => GoRouteData.$location(
'/feeds/add',
queryParams: {if (_self.uri != null) 'uri': _self.uri},
);
@override
void go(BuildContext context) => context.go(location, extra: _self.$extra);
void go(BuildContext context) => context.go(location);
@override
Future<T?> push<T>(BuildContext context) =>
context.push<T>(location, extra: _self.$extra);
Future<T?> push<T>(BuildContext context) => context.push<T>(location);
@override
void pushReplacement(BuildContext context) =>
context.pushReplacement(location, extra: _self.$extra);
context.pushReplacement(location);
@override
void replace(BuildContext context) =>
context.replace(location, extra: _self.$extra);
void replace(BuildContext context) => context.replace(location);
}
mixin $FeedArticleListRoute on GoRouteData {