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

migration done

Browse Source
This commit is contained in:
Fabian Freund
2025-09-19 11:50:34 +02:00
parent b01012c76c
commit 79da47d11b
198 changed files with 17341 additions and 15711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/core/error_observer.dart
+3 -4
View File
@@ -20,16 +20,15 @@
import 'package:riverpod/riverpod.dart';
import 'package:weblibre/core/logger.dart';
class ErrorObserver extends ProviderObserver {
final class ErrorObserver extends ProviderObserver {
const ErrorObserver();
@override
void providerDidFail(
ProviderBase<Object?> provider,
ProviderObserverContext context,
Object error,
StackTrace stackTrace,
ProviderContainer container,
) {
logger.e('Provider $provider threw $error at $stackTrace');
logger.e('Provider ${context.provider} threw $error at $stackTrace');
}
}
app/lib/core/providers/defaults.g.dart
+117 -46
View File
@@ -6,58 +6,129 @@ part of 'defaults.dart';
// RiverpodGenerator
// **************************************************************************
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint, type=warning
@ProviderFor(lightSeedColorFallback)
const lightSeedColorFallbackProvider = LightSeedColorFallbackProvider._();
final class LightSeedColorFallbackProvider
extends $FunctionalProvider<Color, Color, Color>
with $Provider<Color> {
const LightSeedColorFallbackProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'lightSeedColorFallbackProvider',
isAutoDispose: false,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$lightSeedColorFallbackHash();
@$internal
@override
$ProviderElement<Color> $createElement($ProviderPointer pointer) =>
$ProviderElement(pointer);
@override
Color create(Ref ref) {
return lightSeedColorFallback(ref);
}
/// {@macro riverpod.override_with_value}
Override overrideWithValue(Color value) {
return $ProviderOverride(
origin: this,
providerOverride: $SyncValueProvider<Color>(value),
);
}
}
String _$lightSeedColorFallbackHash() =>
r'af151d3293d372f5df451aa8c3a75136377b6ce1';
/// See also [lightSeedColorFallback].
@ProviderFor(lightSeedColorFallback)
final lightSeedColorFallbackProvider = Provider<Color>.internal(
lightSeedColorFallback,
name: r'lightSeedColorFallbackProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$lightSeedColorFallbackHash,
dependencies: null,
allTransitiveDependencies: null,
);
@ProviderFor(darkSeedColorFallback)
const darkSeedColorFallbackProvider = DarkSeedColorFallbackProvider._();
final class DarkSeedColorFallbackProvider
extends $FunctionalProvider<Color, Color, Color>
with $Provider<Color> {
const DarkSeedColorFallbackProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'darkSeedColorFallbackProvider',
isAutoDispose: false,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$darkSeedColorFallbackHash();
@$internal
@override
$ProviderElement<Color> $createElement($ProviderPointer pointer) =>
$ProviderElement(pointer);
@override
Color create(Ref ref) {
return darkSeedColorFallback(ref);
}
/// {@macro riverpod.override_with_value}
Override overrideWithValue(Color value) {
return $ProviderOverride(
origin: this,
providerOverride: $SyncValueProvider<Color>(value),
);
}
}
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef LightSeedColorFallbackRef = ProviderRef<Color>;
String _$darkSeedColorFallbackHash() =>
r'9418cf71e3d80c8a2142e0d3a8820989b29bff86';
/// See also [darkSeedColorFallback].
@ProviderFor(darkSeedColorFallback)
final darkSeedColorFallbackProvider = Provider<Color>.internal(
darkSeedColorFallback,
name: r'darkSeedColorFallbackProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$darkSeedColorFallbackHash,
dependencies: null,
allTransitiveDependencies: null,
);
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef DarkSeedColorFallbackRef = ProviderRef<Color>;
String _$docsUriHash() => r'6456efcf97ddc7ee87a67e2d3380f7241e3d76ea';
/// See also [docsUri].
@ProviderFor(docsUri)
final docsUriProvider = Provider<Uri>.internal(
docsUri,
name: r'docsUriProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$docsUriHash,
dependencies: null,
allTransitiveDependencies: null,
);
const docsUriProvider = DocsUriProvider._();
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef DocsUriRef = ProviderRef<Uri>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
final class DocsUriProvider extends $FunctionalProvider<Uri, Uri, Uri>
with $Provider<Uri> {
const DocsUriProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'docsUriProvider',
isAutoDispose: false,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$docsUriHash();
@$internal
@override
$ProviderElement<Uri> $createElement($ProviderPointer pointer) =>
$ProviderElement(pointer);
@override
Uri create(Ref ref) {
return docsUri(ref);
}
/// {@macro riverpod.override_with_value}
Override overrideWithValue(Uri value) {
return $ProviderOverride(
origin: this,
providerOverride: $SyncValueProvider<Uri>(value),
);
}
}
String _$docsUriHash() => r'6456efcf97ddc7ee87a67e2d3380f7241e3d76ea';
app/lib/core/providers/format.g.dart
+44 -15
View File
@@ -6,20 +6,49 @@ part of 'format.dart';
// RiverpodGenerator
// **************************************************************************
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint, type=warning
@ProviderFor(Format)
const formatProvider = FormatProvider._();
final class FormatProvider extends $AsyncNotifierProvider<Format, void> {
const FormatProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'formatProvider',
isAutoDispose: false,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$formatHash();
@$internal
@override
Format create() => Format();
}
String _$formatHash() => r'fe7fcdd19b512784a36f3838c57701030475e429';
/// See also [Format].
@ProviderFor(Format)
final formatProvider = AsyncNotifierProvider<Format, void>.internal(
Format.new,
name: r'formatProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$formatHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$Format = AsyncNotifier<void>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
abstract class _$Format extends $AsyncNotifier<void> {
FutureOr<void> build();
@$mustCallSuper
@override
void runBuild() {
build();
final ref = this.ref as $Ref<AsyncValue<void>, void>;
final element =
ref.element
as $ClassProviderElement<
AnyNotifier<AsyncValue<void>, void>,
AsyncValue<void>,
Object?,
Object?
>;
element.handleValue(ref, null);
}
}
app/lib/core/providers/global_drop.g.dart
+53 -16
View File
@@ -6,21 +6,58 @@ part of 'global_drop.dart';
// RiverpodGenerator
// **************************************************************************
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint, type=warning
@ProviderFor(WillAcceptDrop)
const willAcceptDropProvider = WillAcceptDropProvider._();
final class WillAcceptDropProvider
extends $NotifierProvider<WillAcceptDrop, DropTargetData?> {
const WillAcceptDropProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'willAcceptDropProvider',
isAutoDispose: true,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$willAcceptDropHash();
@$internal
@override
WillAcceptDrop create() => WillAcceptDrop();
/// {@macro riverpod.override_with_value}
Override overrideWithValue(DropTargetData? value) {
return $ProviderOverride(
origin: this,
providerOverride: $SyncValueProvider<DropTargetData?>(value),
);
}
}
String _$willAcceptDropHash() => r'97b47784ef9101757602b4408d1f545ef2308830';
/// See also [WillAcceptDrop].
@ProviderFor(WillAcceptDrop)
final willAcceptDropProvider =
AutoDisposeNotifierProvider<WillAcceptDrop, DropTargetData?>.internal(
WillAcceptDrop.new,
name: r'willAcceptDropProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$willAcceptDropHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$WillAcceptDrop = AutoDisposeNotifier<DropTargetData?>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
abstract class _$WillAcceptDrop extends $Notifier<DropTargetData?> {
DropTargetData? build();
@$mustCallSuper
@override
void runBuild() {
final created = build();
final ref = this.ref as $Ref<DropTargetData?, DropTargetData?>;
final element =
ref.element
as $ClassProviderElement<
AnyNotifier<DropTargetData?, DropTargetData?>,
DropTargetData?,
Object?,
Object?
>;
element.handleValue(ref, created);
}
}
app/lib/core/providers/router.g.dart
+33 -16
View File
@@ -6,22 +6,39 @@ part of 'router.dart';
// RiverpodGenerator
// **************************************************************************
String _$routerHash() => r'ce7cc5b5f236781a06867a852a08ed03d3582022';
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint, type=warning
/// See also [router].
@ProviderFor(router)
final routerProvider = FutureProvider<GoRouter>.internal(
router,
name: r'routerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$routerHash,
dependencies: null,
allTransitiveDependencies: null,
);
const routerProvider = RouterProvider._();
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef RouterRef = FutureProviderRef<GoRouter>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
final class RouterProvider
extends
$FunctionalProvider<AsyncValue<GoRouter>, GoRouter, FutureOr<GoRouter>>
with $FutureModifier<GoRouter>, $FutureProvider<GoRouter> {
const RouterProvider._()
: super(
from: null,
argument: null,
retry: null,
name: r'routerProvider',
isAutoDispose: false,
dependencies: null,
$allTransitiveDependencies: null,
);
@override
String debugGetCreateSourceHash() => _$routerHash();
@$internal
@override
$FutureProviderElement<GoRouter> $createElement($ProviderPointer pointer) =>
$FutureProviderElement(pointer);
@override
FutureOr<GoRouter> create(Ref ref) {
return router(ref);
}
}
String _$routerHash() => r'ce7cc5b5f236781a06867a852a08ed03d3582022';
app/lib/core/routing/routes.bangs.dart
+4 -4
View File
@@ -39,14 +39,14 @@ part of 'routes.dart';
),
],
)
class BangCategoriesRoute extends GoRouteData with _$BangCategoriesRoute {
class BangCategoriesRoute extends GoRouteData with $BangCategoriesRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const BangCategoriesScreen();
}
}
class BangCategoryRoute extends GoRouteData with _$BangCategoryRoute {
class BangCategoryRoute extends GoRouteData with $BangCategoryRoute {
final String category;
const BangCategoryRoute({required this.category});
@@ -57,7 +57,7 @@ class BangCategoryRoute extends GoRouteData with _$BangCategoryRoute {
}
}
class BangSubCategoryRoute extends GoRouteData with _$BangSubCategoryRoute {
class BangSubCategoryRoute extends GoRouteData with $BangSubCategoryRoute {
final String category;
final String subCategory;
@@ -72,7 +72,7 @@ class BangSubCategoryRoute extends GoRouteData with _$BangSubCategoryRoute {
}
}
class BangSearchRoute extends GoRouteData with _$BangSearchRoute {
class BangSearchRoute extends GoRouteData with $BangSearchRoute {
static const String emptySearchText = ' ';
//This should be nullable but isnt allowed by go_router
app/lib/core/routing/routes.browser.dart
+11 -11
View File
@@ -61,7 +61,7 @@ part of 'routes.dart';
),
],
)
class BrowserRoute extends GoRouteData with _$BrowserRoute {
class BrowserRoute extends GoRouteData with $BrowserRoute {
static const name = 'BrowserRoute';
@override
@@ -72,7 +72,7 @@ class BrowserRoute extends GoRouteData with _$BrowserRoute {
enum TabType { regular, private, child }
class SearchRoute extends GoRouteData with _$SearchRoute {
class SearchRoute extends GoRouteData with $SearchRoute {
static const String emptySearchText = ' ';
final TabType tabType;
@@ -100,14 +100,14 @@ class SearchRoute extends GoRouteData with _$SearchRoute {
}
}
class TorProxyRoute extends GoRouteData with _$TorProxyRoute {
class TorProxyRoute extends GoRouteData with $TorProxyRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const TorProxyScreen();
}
}
class ContainerListRoute extends GoRouteData with _$ContainerListRoute {
class ContainerListRoute extends GoRouteData with $ContainerListRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const ContainerListScreen();
@@ -115,14 +115,14 @@ class ContainerListRoute extends GoRouteData with _$ContainerListRoute {
}
class ContainerSelectionRoute extends GoRouteData
with _$ContainerSelectionRoute {
with $ContainerSelectionRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const ContainerSelectionScreen();
}
}
class ContainerEditRoute extends GoRouteData with _$ContainerEditRoute {
class ContainerEditRoute extends GoRouteData with $ContainerEditRoute {
final ContainerDataWithCount $extra;
ContainerEditRoute(this.$extra);
@@ -133,7 +133,7 @@ class ContainerEditRoute extends GoRouteData with _$ContainerEditRoute {
}
}
class ContainerCreateRoute extends GoRouteData with _$ContainerCreateRoute {
class ContainerCreateRoute extends GoRouteData with $ContainerCreateRoute {
final ContainerData $extra;
ContainerCreateRoute(this.$extra);
@@ -144,7 +144,7 @@ class ContainerCreateRoute extends GoRouteData with _$ContainerCreateRoute {
}
}
class ContextMenuRoute extends GoRouteData with _$ContextMenuRoute {
class ContextMenuRoute extends GoRouteData with $ContextMenuRoute {
final String $extra;
const ContextMenuRoute(this.$extra);
@@ -158,7 +158,7 @@ class ContextMenuRoute extends GoRouteData with _$ContextMenuRoute {
}
}
class TabTreeRoute extends GoRouteData with _$TabTreeRoute {
class TabTreeRoute extends GoRouteData with $TabTreeRoute {
final String rootTabId;
const TabTreeRoute(this.rootTabId);
@@ -169,7 +169,7 @@ class TabTreeRoute extends GoRouteData with _$TabTreeRoute {
}
}
class OpenSharedContentRoute extends GoRouteData with _$OpenSharedContentRoute {
class OpenSharedContentRoute extends GoRouteData with $OpenSharedContentRoute {
final Uri $extra;
const OpenSharedContentRoute(this.$extra);
@@ -180,7 +180,7 @@ class OpenSharedContentRoute extends GoRouteData with _$OpenSharedContentRoute {
}
}
class HistoryRoute extends GoRouteData with _$HistoryRoute {
class HistoryRoute extends GoRouteData with $HistoryRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const HistoryScreen();
app/lib/core/routing/routes.dart
+2 -2
View File
@@ -60,7 +60,7 @@ part 'routes.bangs.dart';
part 'routes.feeds.dart';
@TypedGoRoute<AboutRoute>(name: 'AboutRoute', path: '/about')
class AboutRoute extends GoRouteData with _$AboutRoute {
class AboutRoute extends GoRouteData with $AboutRoute {
@override
Page<void> buildPage(BuildContext context, GoRouterState state) {
return DialogPage(builder: (_) => const AboutDialogScreen());
@@ -71,7 +71,7 @@ class AboutRoute extends GoRouteData with _$AboutRoute {
name: 'OnboardingRoute',
path: '/onboarding/:currentRevision/:targetRevision',
)
class OnboardingRoute extends GoRouteData with _$OnboardingRoute {
class OnboardingRoute extends GoRouteData with $OnboardingRoute {
final int currentRevision;
final int targetRevision;
app/lib/core/routing/routes.feeds.dart
+7 -7
View File
@@ -43,14 +43,14 @@ part of 'routes.dart';
TypedGoRoute<FeedEditRoute>(name: 'FeedEditRoute', path: 'edit/:feedId'),
],
)
class FeedListRoute extends GoRouteData with _$FeedListRoute {
class FeedListRoute extends GoRouteData with $FeedListRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const FeedListScreen();
}
}
class FeedCreateRoute extends GoRouteData with _$FeedCreateRoute {
class FeedCreateRoute extends GoRouteData with $FeedCreateRoute {
final Uri feedId;
FeedCreateRoute({required this.feedId});
@@ -61,7 +61,7 @@ class FeedCreateRoute extends GoRouteData with _$FeedCreateRoute {
}
}
class SelectFeedDialogRoute extends GoRouteData with _$SelectFeedDialogRoute {
class SelectFeedDialogRoute extends GoRouteData with $SelectFeedDialogRoute {
final String feedsJson;
const SelectFeedDialogRoute({required this.feedsJson});
@@ -78,7 +78,7 @@ class SelectFeedDialogRoute extends GoRouteData with _$SelectFeedDialogRoute {
}
}
class FeedEditRoute extends GoRouteData with _$FeedEditRoute {
class FeedEditRoute extends GoRouteData with $FeedEditRoute {
final Uri feedId;
const FeedEditRoute({required this.feedId});
@@ -89,7 +89,7 @@ class FeedEditRoute extends GoRouteData with _$FeedEditRoute {
}
}
class FeedAddRoute extends GoRouteData with _$FeedAddRoute {
class FeedAddRoute extends GoRouteData with $FeedAddRoute {
final Uri? $extra;
static const name = 'FeedAddRoute';
@@ -102,7 +102,7 @@ class FeedAddRoute extends GoRouteData with _$FeedAddRoute {
}
}
class FeedArticleListRoute extends GoRouteData with _$FeedArticleListRoute {
class FeedArticleListRoute extends GoRouteData with $FeedArticleListRoute {
final Uri feedId;
FeedArticleListRoute({required this.feedId});
@@ -113,7 +113,7 @@ class FeedArticleListRoute extends GoRouteData with _$FeedArticleListRoute {
}
}
class FeedArticleRoute extends GoRouteData with _$FeedArticleRoute {
class FeedArticleRoute extends GoRouteData with $FeedArticleRoute {
final String articleId;
FeedArticleRoute({required this.articleId});
app/lib/core/routing/routes.g.dart
+67 -98
View File
@@ -18,11 +18,10 @@ List<RouteBase> get $appRoutes => [
RouteBase get $aboutRoute => GoRouteData.$route(
path: '/about',
name: 'AboutRoute',
factory: _$AboutRoute._fromState,
factory: $AboutRoute._fromState,
);
mixin _$AboutRoute on GoRouteData {
mixin $AboutRoute on GoRouteData {
static AboutRoute _fromState(GoRouterState state) => AboutRoute();
@override
@@ -45,14 +44,13 @@ mixin _$AboutRoute on GoRouteData {
RouteBase get $onboardingRoute => GoRouteData.$route(
path: '/onboarding/:currentRevision/:targetRevision',
name: 'OnboardingRoute',
factory: _$OnboardingRoute._fromState,
factory: $OnboardingRoute._fromState,
);
mixin _$OnboardingRoute on GoRouteData {
mixin $OnboardingRoute on GoRouteData {
static OnboardingRoute _fromState(GoRouterState state) => OnboardingRoute(
currentRevision: int.parse(state.pathParameters['currentRevision']!)!,
targetRevision: int.parse(state.pathParameters['targetRevision']!)!,
currentRevision: int.parse(state.pathParameters['currentRevision']!),
targetRevision: int.parse(state.pathParameters['targetRevision']!),
);
OnboardingRoute get _self => this as OnboardingRoute;
@@ -79,38 +77,32 @@ mixin _$OnboardingRoute on GoRouteData {
RouteBase get $settingsRoute => GoRouteData.$route(
path: '/settings',
name: 'SettingsRoute',
factory: _$SettingsRoute._fromState,
factory: $SettingsRoute._fromState,
routes: [
GoRouteData.$route(
path: 'general',
name: 'GeneralSettingsRoute',
factory: _$GeneralSettingsRoute._fromState,
factory: $GeneralSettingsRoute._fromState,
),
GoRouteData.$route(
path: 'bang',
name: 'BangSettingsRoute',
factory: _$BangSettingsRoute._fromState,
factory: $BangSettingsRoute._fromState,
),
GoRouteData.$route(
path: 'web_engine',
name: 'WebEngineSettingsRoute',
factory: _$WebEngineSettingsRoute._fromState,
factory: $WebEngineSettingsRoute._fromState,
routes: [
GoRouteData.$route(
path: 'hardening',
name: 'WebEngineHardeningRoute',
factory: _$WebEngineHardeningRoute._fromState,
factory: $WebEngineHardeningRoute._fromState,
routes: [
GoRouteData.$route(
path: 'group/:group',
name: 'WebEngineHardeningGroupRoute',
factory: _$WebEngineHardeningGroupRoute._fromState,
factory: $WebEngineHardeningGroupRoute._fromState,
),
],
),
@@ -119,13 +111,12 @@ RouteBase get $settingsRoute => GoRouteData.$route(
GoRouteData.$route(
path: 'developer',
name: 'DeveloperSettingsRoute',
factory: _$DeveloperSettingsRoute._fromState,
factory: $DeveloperSettingsRoute._fromState,
),
],
);
mixin _$SettingsRoute on GoRouteData {
mixin $SettingsRoute on GoRouteData {
static SettingsRoute _fromState(GoRouterState state) => SettingsRoute();
@override
@@ -145,7 +136,7 @@ mixin _$SettingsRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$GeneralSettingsRoute on GoRouteData {
mixin $GeneralSettingsRoute on GoRouteData {
static GeneralSettingsRoute _fromState(GoRouterState state) =>
GeneralSettingsRoute();
@@ -166,7 +157,7 @@ mixin _$GeneralSettingsRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$BangSettingsRoute on GoRouteData {
mixin $BangSettingsRoute on GoRouteData {
static BangSettingsRoute _fromState(GoRouterState state) =>
BangSettingsRoute();
@@ -187,7 +178,7 @@ mixin _$BangSettingsRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$WebEngineSettingsRoute on GoRouteData {
mixin $WebEngineSettingsRoute on GoRouteData {
static WebEngineSettingsRoute _fromState(GoRouterState state) =>
WebEngineSettingsRoute();
@@ -208,7 +199,7 @@ mixin _$WebEngineSettingsRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$WebEngineHardeningRoute on GoRouteData {
mixin $WebEngineHardeningRoute on GoRouteData {
static WebEngineHardeningRoute _fromState(GoRouterState state) =>
WebEngineHardeningRoute();
@@ -230,7 +221,7 @@ mixin _$WebEngineHardeningRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$WebEngineHardeningGroupRoute on GoRouteData {
mixin $WebEngineHardeningGroupRoute on GoRouteData {
static WebEngineHardeningGroupRoute _fromState(GoRouterState state) =>
WebEngineHardeningGroupRoute(group: state.pathParameters['group']!);
@@ -256,7 +247,7 @@ mixin _$WebEngineHardeningGroupRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$DeveloperSettingsRoute on GoRouteData {
mixin $DeveloperSettingsRoute on GoRouteData {
static DeveloperSettingsRoute _fromState(GoRouterState state) =>
DeveloperSettingsRoute();
@@ -280,75 +271,64 @@ mixin _$DeveloperSettingsRoute on GoRouteData {
RouteBase get $browserRoute => GoRouteData.$route(
path: '/',
name: 'BrowserRoute',
factory: _$BrowserRoute._fromState,
factory: $BrowserRoute._fromState,
routes: [
GoRouteData.$route(
path: 'search/:tabType/:searchText',
name: 'SearchRoute',
factory: _$SearchRoute._fromState,
factory: $SearchRoute._fromState,
),
GoRouteData.$route(
path: 'tor_proxy',
name: 'TorProxyRoute',
factory: _$TorProxyRoute._fromState,
factory: $TorProxyRoute._fromState,
),
GoRouteData.$route(
path: 'history',
name: 'HistoryRoute',
factory: _$HistoryRoute._fromState,
factory: $HistoryRoute._fromState,
),
GoRouteData.$route(
path: 'context_menu',
name: 'ContextMenuRoute',
factory: _$ContextMenuRoute._fromState,
factory: $ContextMenuRoute._fromState,
),
GoRouteData.$route(
path: 'containers',
name: 'ContainerListRoute',
factory: _$ContainerListRoute._fromState,
factory: $ContainerListRoute._fromState,
routes: [
GoRouteData.$route(
path: 'create',
name: 'ContainerCreateRoute',
factory: _$ContainerCreateRoute._fromState,
factory: $ContainerCreateRoute._fromState,
),
GoRouteData.$route(
path: 'edit',
name: 'ContainerEditRoute',
factory: _$ContainerEditRoute._fromState,
factory: $ContainerEditRoute._fromState,
),
],
),
GoRouteData.$route(
path: 'select_container',
name: 'ContainerSelectionRoute',
factory: _$ContainerSelectionRoute._fromState,
factory: $ContainerSelectionRoute._fromState,
),
GoRouteData.$route(
path: 'tab_tree/:rootTabId',
name: 'TabTreeRoute',
factory: _$TabTreeRoute._fromState,
factory: $TabTreeRoute._fromState,
),
GoRouteData.$route(
path: 'open_content',
name: 'OpenSharedContentRoute',
factory: _$OpenSharedContentRoute._fromState,
factory: $OpenSharedContentRoute._fromState,
),
],
);
mixin _$BrowserRoute on GoRouteData {
mixin $BrowserRoute on GoRouteData {
static BrowserRoute _fromState(GoRouterState state) => BrowserRoute();
@override
@@ -368,7 +348,7 @@ mixin _$BrowserRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$SearchRoute on GoRouteData {
mixin $SearchRoute on GoRouteData {
static SearchRoute _fromState(GoRouterState state) => SearchRoute(
tabType: _$TabTypeEnumMap._$fromName(state.pathParameters['tabType']!)!,
searchText:
@@ -405,7 +385,7 @@ const _$TabTypeEnumMap = {
TabType.child: 'child',
};
mixin _$TorProxyRoute on GoRouteData {
mixin $TorProxyRoute on GoRouteData {
static TorProxyRoute _fromState(GoRouterState state) => TorProxyRoute();
@override
@@ -425,7 +405,7 @@ mixin _$TorProxyRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$HistoryRoute on GoRouteData {
mixin $HistoryRoute on GoRouteData {
static HistoryRoute _fromState(GoRouterState state) => HistoryRoute();
@override
@@ -445,7 +425,7 @@ mixin _$HistoryRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$ContextMenuRoute on GoRouteData {
mixin $ContextMenuRoute on GoRouteData {
static ContextMenuRoute _fromState(GoRouterState state) =>
ContextMenuRoute(state.extra as String);
@@ -470,7 +450,7 @@ mixin _$ContextMenuRoute on GoRouteData {
context.replace(location, extra: _self.$extra);
}
mixin _$ContainerListRoute on GoRouteData {
mixin $ContainerListRoute on GoRouteData {
static ContainerListRoute _fromState(GoRouterState state) =>
ContainerListRoute();
@@ -491,7 +471,7 @@ mixin _$ContainerListRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$ContainerCreateRoute on GoRouteData {
mixin $ContainerCreateRoute on GoRouteData {
static ContainerCreateRoute _fromState(GoRouterState state) =>
ContainerCreateRoute(state.extra as ContainerData);
@@ -516,7 +496,7 @@ mixin _$ContainerCreateRoute on GoRouteData {
context.replace(location, extra: _self.$extra);
}
mixin _$ContainerEditRoute on GoRouteData {
mixin $ContainerEditRoute on GoRouteData {
static ContainerEditRoute _fromState(GoRouterState state) =>
ContainerEditRoute(state.extra as ContainerDataWithCount);
@@ -541,7 +521,7 @@ mixin _$ContainerEditRoute on GoRouteData {
context.replace(location, extra: _self.$extra);
}
mixin _$ContainerSelectionRoute on GoRouteData {
mixin $ContainerSelectionRoute on GoRouteData {
static ContainerSelectionRoute _fromState(GoRouterState state) =>
ContainerSelectionRoute();
@@ -562,7 +542,7 @@ mixin _$ContainerSelectionRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$TabTreeRoute on GoRouteData {
mixin $TabTreeRoute on GoRouteData {
static TabTreeRoute _fromState(GoRouterState state) =>
TabTreeRoute(state.pathParameters['rootTabId']!);
@@ -587,7 +567,7 @@ mixin _$TabTreeRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$OpenSharedContentRoute on GoRouteData {
mixin $OpenSharedContentRoute on GoRouteData {
static OpenSharedContentRoute _fromState(GoRouterState state) =>
OpenSharedContentRoute(state.extra as Uri);
@@ -620,33 +600,29 @@ extension<T extends Enum> on Map<T, String> {
RouteBase get $bangCategoriesRoute => GoRouteData.$route(
path: '/bangs',
name: 'BangRoute',
factory: _$BangCategoriesRoute._fromState,
factory: $BangCategoriesRoute._fromState,
routes: [
GoRouteData.$route(
path: 'search/:searchText',
name: 'BangSearchRoute',
factory: _$BangSearchRoute._fromState,
factory: $BangSearchRoute._fromState,
),
GoRouteData.$route(
path: 'category/:category',
name: 'BangCategoryRoute',
factory: _$BangCategoryRoute._fromState,
factory: $BangCategoryRoute._fromState,
routes: [
GoRouteData.$route(
path: ':subCategory',
name: 'BangSubCategoryRoute',
factory: _$BangSubCategoryRoute._fromState,
factory: $BangSubCategoryRoute._fromState,
),
],
),
],
);
mixin _$BangCategoriesRoute on GoRouteData {
mixin $BangCategoriesRoute on GoRouteData {
static BangCategoriesRoute _fromState(GoRouterState state) =>
BangCategoriesRoute();
@@ -667,7 +643,7 @@ mixin _$BangCategoriesRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$BangSearchRoute on GoRouteData {
mixin $BangSearchRoute on GoRouteData {
static BangSearchRoute _fromState(GoRouterState state) => BangSearchRoute(
searchText:
state.pathParameters['searchText'] ?? BangSearchRoute.emptySearchText,
@@ -694,7 +670,7 @@ mixin _$BangSearchRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$BangCategoryRoute on GoRouteData {
mixin $BangCategoryRoute on GoRouteData {
static BangCategoryRoute _fromState(GoRouterState state) =>
BangCategoryRoute(category: state.pathParameters['category']!);
@@ -719,7 +695,7 @@ mixin _$BangCategoryRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$BangSubCategoryRoute on GoRouteData {
mixin $BangSubCategoryRoute on GoRouteData {
static BangSubCategoryRoute _fromState(GoRouterState state) =>
BangSubCategoryRoute(
category: state.pathParameters['category']!,
@@ -750,49 +726,42 @@ mixin _$BangSubCategoryRoute on GoRouteData {
RouteBase get $feedListRoute => GoRouteData.$route(
path: '/feeds',
name: 'FeedListRoute',
factory: _$FeedListRoute._fromState,
factory: $FeedListRoute._fromState,
routes: [
GoRouteData.$route(
path: 'add',
name: 'FeedAddRoute',
factory: _$FeedAddRoute._fromState,
factory: $FeedAddRoute._fromState,
),
GoRouteData.$route(
path: 'articles/:feedId',
name: 'FeedArticleListRoute',
factory: _$FeedArticleListRoute._fromState,
factory: $FeedArticleListRoute._fromState,
),
GoRouteData.$route(
path: 'article/:articleId',
name: 'FeedArticleRoute',
factory: _$FeedArticleRoute._fromState,
factory: $FeedArticleRoute._fromState,
),
GoRouteData.$route(
path: 'create/:feedId',
name: 'FeedCreateRoute',
factory: _$FeedCreateRoute._fromState,
factory: $FeedCreateRoute._fromState,
),
GoRouteData.$route(
path: 'available/:feedsJson',
name: 'SelectFeedDialogRoute',
factory: _$SelectFeedDialogRoute._fromState,
factory: $SelectFeedDialogRoute._fromState,
),
GoRouteData.$route(
path: 'edit/:feedId',
name: 'FeedEditRoute',
factory: _$FeedEditRoute._fromState,
factory: $FeedEditRoute._fromState,
),
],
);
mixin _$FeedListRoute on GoRouteData {
mixin $FeedListRoute on GoRouteData {
static FeedListRoute _fromState(GoRouterState state) => FeedListRoute();
@override
@@ -812,7 +781,7 @@ mixin _$FeedListRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$FeedAddRoute on GoRouteData {
mixin $FeedAddRoute on GoRouteData {
static FeedAddRoute _fromState(GoRouterState state) =>
FeedAddRoute($extra: state.extra as Uri?);
@@ -837,9 +806,9 @@ mixin _$FeedAddRoute on GoRouteData {
context.replace(location, extra: _self.$extra);
}
mixin _$FeedArticleListRoute on GoRouteData {
mixin $FeedArticleListRoute on GoRouteData {
static FeedArticleListRoute _fromState(GoRouterState state) =>
FeedArticleListRoute(feedId: Uri.parse(state.pathParameters['feedId']!)!);
FeedArticleListRoute(feedId: Uri.parse(state.pathParameters['feedId']!));
FeedArticleListRoute get _self => this as FeedArticleListRoute;
@@ -862,7 +831,7 @@ mixin _$FeedArticleListRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$FeedArticleRoute on GoRouteData {
mixin $FeedArticleRoute on GoRouteData {
static FeedArticleRoute _fromState(GoRouterState state) =>
FeedArticleRoute(articleId: state.pathParameters['articleId']!);
@@ -887,9 +856,9 @@ mixin _$FeedArticleRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$FeedCreateRoute on GoRouteData {
mixin $FeedCreateRoute on GoRouteData {
static FeedCreateRoute _fromState(GoRouterState state) =>
FeedCreateRoute(feedId: Uri.parse(state.pathParameters['feedId']!)!);
FeedCreateRoute(feedId: Uri.parse(state.pathParameters['feedId']!));
FeedCreateRoute get _self => this as FeedCreateRoute;
@@ -912,7 +881,7 @@ mixin _$FeedCreateRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$SelectFeedDialogRoute on GoRouteData {
mixin $SelectFeedDialogRoute on GoRouteData {
static SelectFeedDialogRoute _fromState(GoRouterState state) =>
SelectFeedDialogRoute(feedsJson: state.pathParameters['feedsJson']!);
@@ -937,9 +906,9 @@ mixin _$SelectFeedDialogRoute on GoRouteData {
void replace(BuildContext context) => context.replace(location);
}
mixin _$FeedEditRoute on GoRouteData {
mixin $FeedEditRoute on GoRouteData {
static FeedEditRoute _fromState(GoRouterState state) =>
FeedEditRoute(feedId: Uri.parse(state.pathParameters['feedId']!)!);
FeedEditRoute(feedId: Uri.parse(state.pathParameters['feedId']!));
FeedEditRoute get _self => this as FeedEditRoute;
app/lib/core/routing/routes.settings.dart
+7 -7
View File
@@ -50,35 +50,35 @@ part of 'routes.dart';
),
],
)
class SettingsRoute extends GoRouteData with _$SettingsRoute {
class SettingsRoute extends GoRouteData with $SettingsRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const SettingsScreen();
}
}
class GeneralSettingsRoute extends GoRouteData with _$GeneralSettingsRoute {
class GeneralSettingsRoute extends GoRouteData with $GeneralSettingsRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const GeneralSettingsScreen();
}
}
class BangSettingsRoute extends GoRouteData with _$BangSettingsRoute {
class BangSettingsRoute extends GoRouteData with $BangSettingsRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const BangSettingsScreen();
}
}
class WebEngineSettingsRoute extends GoRouteData with _$WebEngineSettingsRoute {
class WebEngineSettingsRoute extends GoRouteData with $WebEngineSettingsRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const WebEngineSettingsScreen();
}
}
class DeveloperSettingsRoute extends GoRouteData with _$DeveloperSettingsRoute {
class DeveloperSettingsRoute extends GoRouteData with $DeveloperSettingsRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const DeveloperSettingsScreen();
@@ -86,7 +86,7 @@ class DeveloperSettingsRoute extends GoRouteData with _$DeveloperSettingsRoute {
}
class WebEngineHardeningRoute extends GoRouteData
with _$WebEngineHardeningRoute {
with $WebEngineHardeningRoute {
@override
Widget build(BuildContext context, GoRouterState state) {
return const WebEngineHardeningScreen();
@@ -94,7 +94,7 @@ class WebEngineHardeningRoute extends GoRouteData
}
class WebEngineHardeningGroupRoute extends GoRouteData
with _$WebEngineHardeningGroupRoute {
with $WebEngineHardeningGroupRoute {
final String group;
const WebEngineHardeningGroupRoute({required this.group});