diff --git a/lib/logic/get_it/navigation.dart b/lib/logic/get_it/navigation.dart index aef86d63..7a43bcd7 100644 --- a/lib/logic/get_it/navigation.dart +++ b/lib/logic/get_it/navigation.dart @@ -12,7 +12,8 @@ class NavigationService { if (context == null) { showSnackBar( - 'Could not show dialog. This should not happen, please report this.'); + 'Could not show dialog. This should not happen, please report this.', + ); return; } diff --git a/lib/ui/pages/backup_details/backup_details.dart b/lib/ui/pages/backup_details/backup_details.dart index 8ba7ad30..26e2dacc 100644 --- a/lib/ui/pages/backup_details/backup_details.dart +++ b/lib/ui/pages/backup_details/backup_details.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; @@ -13,6 +14,7 @@ import 'package:selfprivacy/ui/helpers/modals.dart'; GlobalKey navigatorKey = GlobalKey(); +@RoutePage() class BackupDetailsPage extends StatefulWidget { const BackupDetailsPage({super.key}); diff --git a/lib/ui/pages/devices/devices.dart b/lib/ui/pages/devices/devices.dart index fe37418c..e3279b46 100644 --- a/lib/ui/pages/devices/devices.dart +++ b/lib/ui/pages/devices/devices.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:cubit_form/cubit_form.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; @@ -10,6 +11,7 @@ import 'package:selfprivacy/ui/components/info_box/info_box.dart'; import 'package:selfprivacy/ui/pages/devices/new_device.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; +@RoutePage() class DevicesScreen extends StatefulWidget { const DevicesScreen({super.key}); diff --git a/lib/ui/pages/dns_details/dns_details.dart b/lib/ui/pages/dns_details/dns_details.dart index be11f4ef..4f52c482 100644 --- a/lib/ui/pages/dns_details/dns_details.dart +++ b/lib/ui/pages/dns_details/dns_details.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:selfprivacy/config/get_it_config.dart'; @@ -8,6 +9,7 @@ import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; import 'package:selfprivacy/utils/network_utils.dart'; +@RoutePage() class DnsDetailsPage extends StatefulWidget { const DnsDetailsPage({super.key}); diff --git a/lib/ui/pages/more/about_application.dart b/lib/ui/pages/more/about_application.dart index 110a944c..7feab555 100644 --- a/lib/ui/pages/more/about_application.dart +++ b/lib/ui/pages/more/about_application.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:selfprivacy/logic/api_maps/graphql_maps/server_api/server_api.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; @@ -8,6 +9,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:url_launcher/url_launcher.dart'; +@RoutePage() class AboutApplicationPage extends StatelessWidget { const AboutApplicationPage({super.key}); diff --git a/lib/ui/pages/more/app_settings/app_settings.dart b/lib/ui/pages/more/app_settings/app_settings.dart index 08be5393..be8cc40e 100644 --- a/lib/ui/pages/more/app_settings/app_settings.dart +++ b/lib/ui/pages/more/app_settings/app_settings.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:selfprivacy/logic/cubit/app_settings/app_settings_cubit.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; @@ -6,6 +7,7 @@ import 'package:selfprivacy/ui/components/brand_alert/brand_alert.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:easy_localization/easy_localization.dart'; +@RoutePage() class AppSettingsPage extends StatefulWidget { const AppSettingsPage({super.key}); diff --git a/lib/ui/pages/more/app_settings/developer_settings.dart b/lib/ui/pages/more/app_settings/developer_settings.dart index 09ab8840..220cb791 100644 --- a/lib/ui/pages/more/app_settings/developer_settings.dart +++ b/lib/ui/pages/more/app_settings/developer_settings.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:selfprivacy/logic/api_maps/staging_options.dart'; import 'package:selfprivacy/logic/cubit/app_settings/app_settings_cubit.dart'; @@ -6,6 +7,7 @@ import 'package:selfprivacy/logic/cubit/recovery_key/recovery_key_cubit.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:easy_localization/easy_localization.dart'; +@RoutePage() class DeveloperSettingsPage extends StatefulWidget { const DeveloperSettingsPage({super.key}); diff --git a/lib/ui/pages/more/console.dart b/lib/ui/pages/more/console.dart index 6811e39a..cd13ca62 100644 --- a/lib/ui/pages/more/console.dart +++ b/lib/ui/pages/more/console.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'dart:collection'; import 'package:easy_localization/easy_localization.dart'; @@ -7,6 +8,7 @@ import 'package:selfprivacy/config/get_it_config.dart'; import 'package:selfprivacy/logic/models/message.dart'; import 'package:selfprivacy/ui/components/brand_header/brand_header.dart'; +@RoutePage() class ConsolePage extends StatefulWidget { const ConsolePage({super.key}); diff --git a/lib/ui/pages/more/more.dart b/lib/ui/pages/more/more.dart index 9ea2c49b..20eaeb2d 100644 --- a/lib/ui/pages/more/more.dart +++ b/lib/ui/pages/more/more.dart @@ -12,6 +12,7 @@ import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; import 'package:selfprivacy/utils/breakpoints.dart'; import 'package:selfprivacy/ui/router/router.dart'; +@RoutePage() class MorePage extends StatelessWidget { const MorePage({super.key}); diff --git a/lib/ui/pages/onboarding/onboarding.dart b/lib/ui/pages/onboarding/onboarding.dart index 9da66e9d..efa38da4 100644 --- a/lib/ui/pages/onboarding/onboarding.dart +++ b/lib/ui/pages/onboarding/onboarding.dart @@ -5,6 +5,7 @@ import 'package:selfprivacy/ui/components/brand_button/brand_button.dart'; import 'package:selfprivacy/ui/router/router.dart'; import 'package:easy_localization/easy_localization.dart'; +@RoutePage() class OnboardingPage extends StatefulWidget { const OnboardingPage({super.key}); diff --git a/lib/ui/pages/providers/providers.dart b/lib/ui/pages/providers/providers.dart index c6cb3179..25533a43 100644 --- a/lib/ui/pages/providers/providers.dart +++ b/lib/ui/pages/providers/providers.dart @@ -16,6 +16,7 @@ import 'package:selfprivacy/utils/breakpoints.dart'; GlobalKey navigatorKey = GlobalKey(); +@RoutePage() class ProvidersPage extends StatefulWidget { const ProvidersPage({super.key}); diff --git a/lib/ui/pages/recovery_key/recovery_key.dart b/lib/ui/pages/recovery_key/recovery_key.dart index 9b83cd9e..a7742b6d 100644 --- a/lib/ui/pages/recovery_key/recovery_key.dart +++ b/lib/ui/pages/recovery_key/recovery_key.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -11,6 +12,7 @@ import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/pages/recovery_key/recovery_key_receiving.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; +@RoutePage() class RecoveryKeyPage extends StatefulWidget { const RecoveryKeyPage({super.key}); diff --git a/lib/ui/pages/root_route.dart b/lib/ui/pages/root_route.dart index 80b57ece..65d4cd8d 100644 --- a/lib/ui/pages/root_route.dart +++ b/lib/ui/pages/root_route.dart @@ -8,6 +8,7 @@ import 'package:selfprivacy/ui/router/root_destinations.dart'; import 'package:selfprivacy/ui/router/router.dart'; +@RoutePage() class RootPage extends StatefulWidget implements AutoRouteWrapper { const RootPage({super.key}); diff --git a/lib/ui/pages/server_details/server_details_screen.dart b/lib/ui/pages/server_details/server_details_screen.dart index a0891630..e1f8f713 100644 --- a/lib/ui/pages/server_details/server_details_screen.dart +++ b/lib/ui/pages/server_details/server_details_screen.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:cubit_form/cubit_form.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; @@ -32,6 +33,7 @@ part 'time_zone/time_zone.dart'; var navigatorKey = GlobalKey(); +@RoutePage() class ServerDetailsScreen extends StatefulWidget { const ServerDetailsScreen({super.key}); diff --git a/lib/ui/pages/server_storage/binds_migration/services_migration.dart b/lib/ui/pages/server_storage/binds_migration/services_migration.dart index bb95ae94..71859116 100644 --- a/lib/ui/pages/server_storage/binds_migration/services_migration.dart +++ b/lib/ui/pages/server_storage/binds_migration/services_migration.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:selfprivacy/logic/cubit/server_jobs/server_jobs_cubit.dart'; @@ -16,6 +17,7 @@ import 'package:selfprivacy/ui/helpers/modals.dart'; import 'package:selfprivacy/ui/pages/root_route.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; +@RoutePage() class ServicesMigrationPage extends StatefulWidget { const ServicesMigrationPage({ required this.services, diff --git a/lib/ui/pages/server_storage/extending_volume.dart b/lib/ui/pages/server_storage/extending_volume.dart index 41b7b36f..50cb93be 100644 --- a/lib/ui/pages/server_storage/extending_volume.dart +++ b/lib/ui/pages/server_storage/extending_volume.dart @@ -10,6 +10,7 @@ import 'package:selfprivacy/ui/components/brand_button/brand_button.dart'; import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/logic/models/disk_status.dart'; +@RoutePage() class ExtendingVolumePage extends StatefulWidget { const ExtendingVolumePage({ required this.diskVolumeToResize, diff --git a/lib/ui/pages/server_storage/server_storage.dart b/lib/ui/pages/server_storage/server_storage.dart index c7606b8e..7b23e275 100644 --- a/lib/ui/pages/server_storage/server_storage.dart +++ b/lib/ui/pages/server_storage/server_storage.dart @@ -11,6 +11,7 @@ import 'package:selfprivacy/logic/models/disk_status.dart'; import 'package:selfprivacy/ui/components/storage_list_items/server_storage_list_item.dart'; import 'package:selfprivacy/ui/router/router.dart'; +@RoutePage() class ServerStoragePage extends StatefulWidget { const ServerStoragePage({ required this.diskStatus, diff --git a/lib/ui/pages/services/service_page.dart b/lib/ui/pages/services/service_page.dart index 88fedddd..a015a51a 100644 --- a/lib/ui/pages/services/service_page.dart +++ b/lib/ui/pages/services/service_page.dart @@ -12,6 +12,7 @@ import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart'; import 'package:selfprivacy/ui/router/router.dart'; import 'package:selfprivacy/utils/launch_url.dart'; +@RoutePage() class ServicePage extends StatefulWidget { const ServicePage({required this.serviceId, super.key}); diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart index 3d6b185e..80e03101 100644 --- a/lib/ui/pages/services/services.dart +++ b/lib/ui/pages/services/services.dart @@ -16,6 +16,7 @@ import 'package:selfprivacy/utils/breakpoints.dart'; import 'package:selfprivacy/utils/launch_url.dart'; import 'package:selfprivacy/utils/ui_helpers.dart'; +@RoutePage() class ServicesPage extends StatefulWidget { const ServicesPage({super.key}); diff --git a/lib/ui/pages/setup/initializing/initializing.dart b/lib/ui/pages/setup/initializing/initializing.dart index fe512ee2..e589e4f7 100644 --- a/lib/ui/pages/setup/initializing/initializing.dart +++ b/lib/ui/pages/setup/initializing/initializing.dart @@ -23,6 +23,7 @@ import 'package:selfprivacy/ui/pages/setup/recovering/recovery_routing.dart'; import 'package:selfprivacy/ui/router/router.dart'; import 'package:selfprivacy/utils/breakpoints.dart'; +@RoutePage() class InitializingPage extends StatelessWidget { const InitializingPage({super.key}); diff --git a/lib/ui/pages/setup/recovering/recovery_routing.dart b/lib/ui/pages/setup/recovering/recovery_routing.dart index 23f72f8f..2fee7297 100644 --- a/lib/ui/pages/setup/recovering/recovery_routing.dart +++ b/lib/ui/pages/setup/recovering/recovery_routing.dart @@ -1,3 +1,4 @@ +import 'package:auto_route/auto_route.dart'; import 'package:cubit_form/cubit_form.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; @@ -17,6 +18,7 @@ import 'package:selfprivacy/ui/pages/setup/recovering/recovery_server_provider_c import 'package:selfprivacy/ui/pages/setup/recovering/recovery_method_select.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; +@RoutePage() class RecoveryRouting extends StatelessWidget { const RecoveryRouting({super.key}); diff --git a/lib/ui/pages/users/new_user.dart b/lib/ui/pages/users/new_user.dart index 484ce174..d7ed2aca 100644 --- a/lib/ui/pages/users/new_user.dart +++ b/lib/ui/pages/users/new_user.dart @@ -1,5 +1,6 @@ part of 'users.dart'; +@RoutePage() class NewUserPage extends StatelessWidget { const NewUserPage({super.key}); diff --git a/lib/ui/pages/users/user_details.dart b/lib/ui/pages/users/user_details.dart index 63a7b171..f20ff543 100644 --- a/lib/ui/pages/users/user_details.dart +++ b/lib/ui/pages/users/user_details.dart @@ -1,5 +1,6 @@ part of 'users.dart'; +@RoutePage() class UserDetailsPage extends StatelessWidget { const UserDetailsPage({ required this.login, diff --git a/lib/ui/pages/users/users.dart b/lib/ui/pages/users/users.dart index 7ed3d929..8b3c5dfd 100644 --- a/lib/ui/pages/users/users.dart +++ b/lib/ui/pages/users/users.dart @@ -33,6 +33,7 @@ part 'user.dart'; part 'user_details.dart'; part 'reset_password.dart'; +@RoutePage() class UsersPage extends StatelessWidget { const UsersPage({super.key}); diff --git a/lib/ui/router/router.dart b/lib/ui/router/router.dart index c0afd0d6..23a4ec0e 100644 --- a/lib/ui/router/router.dart +++ b/lib/ui/router/router.dart @@ -41,65 +41,67 @@ Widget fadeThroughTransition( child: child, ); -@MaterialAutoRouter( +@AutoRouterConfig( // transitionsBuilder: fadeThroughTransition, replaceInRouteName: 'Page|Screen|Routing,Route', - routes: [ - AutoRoute( - page: OnboardingPage, - ), - AutoRoute(page: InitializingPage), - AutoRoute(page: RecoveryRouting), - AutoRoute( - page: RootPage, - initial: true, - children: [ - CustomRoute( - page: ProvidersPage, - usesPathAsKey: true, - initial: true, - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - ), - CustomRoute( - page: ServicesPage, - usesPathAsKey: true, - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - ), - CustomRoute( - page: UsersPage, - usesPathAsKey: true, - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - ), - CustomRoute( - page: MorePage, - usesPathAsKey: true, - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - ), - AutoRoute(page: AppSettingsPage), - AutoRoute(page: UserDetailsPage), - AutoRoute(page: NewUserPage), - AutoRoute(page: RecoveryKeyPage), - AutoRoute(page: DevicesScreen), - AutoRoute(page: AboutApplicationPage), - AutoRoute(page: DeveloperSettingsPage), - AutoRoute(page: ServicePage), - AutoRoute(page: ServerDetailsScreen), - AutoRoute(page: DnsDetailsPage), - AutoRoute(page: BackupDetailsPage), - AutoRoute(page: ServerStoragePage), - AutoRoute(page: ExtendingVolumePage), - ], - ), - AutoRoute(page: ServicesMigrationPage), - AutoRoute(page: ConsolePage), - ], ) class RootRouter extends _$RootRouter { RootRouter(GlobalKey super.navigatorKey); + + @override + RouteType get defaultRouteType => const RouteType.material(); + @override + final List routes = [ + AutoRoute(page: OnboardingRoute.page), + AutoRoute(page: InitializingRoute.page), + AutoRoute(page: RecoveryRoute.page), + AutoRoute( + page: RootRoute.page, + path: '/', + children: [ + CustomRoute( + page: ProvidersRoute.page, + usesPathAsKey: true, + path: '', + transitionsBuilder: fadeThroughTransition, + durationInMilliseconds: 400, + ), + CustomRoute( + page: ServicesRoute.page, + usesPathAsKey: true, + transitionsBuilder: fadeThroughTransition, + durationInMilliseconds: 400, + ), + CustomRoute( + page: UsersRoute.page, + usesPathAsKey: true, + transitionsBuilder: fadeThroughTransition, + durationInMilliseconds: 400, + ), + CustomRoute( + page: MoreRoute.page, + usesPathAsKey: true, + transitionsBuilder: fadeThroughTransition, + durationInMilliseconds: 400, + ), + AutoRoute(page: AppSettingsRoute.page), + AutoRoute(page: UserDetailsRoute.page), + AutoRoute(page: NewUserRoute.page), + AutoRoute(page: RecoveryKeyRoute.page), + AutoRoute(page: DevicesRoute.page), + AutoRoute(page: AboutApplicationRoute.page), + AutoRoute(page: DeveloperSettingsRoute.page), + AutoRoute(page: ServiceRoute.page), + AutoRoute(page: ServerDetailsRoute.page), + AutoRoute(page: DnsDetailsRoute.page), + AutoRoute(page: BackupDetailsRoute.page), + AutoRoute(page: ServerStorageRoute.page), + AutoRoute(page: ExtendingVolumeRoute.page), + ], + ), + AutoRoute(page: ServicesMigrationRoute.page), + AutoRoute(page: ConsoleRoute.page), + ]; } // Function to map route names to route titles diff --git a/lib/ui/router/router.gr.dart b/lib/ui/router/router.gr.dart index acbc7830..328c5f76 100644 --- a/lib/ui/router/router.gr.dart +++ b/lib/ui/router/router.gr.dart @@ -1,49 +1,144 @@ -// ************************************************************************** -// AutoRouteGenerator -// ************************************************************************** - // GENERATED CODE - DO NOT MODIFY BY HAND // ************************************************************************** -// AutoRouteGenerator +// AutoRouterGenerator // ************************************************************************** -// + // ignore_for_file: type=lint +// coverage:ignore-file part of 'router.dart'; -class _$RootRouter extends RootStackRouter { +abstract class _$RootRouter extends RootStackRouter { _$RootRouter([GlobalKey? navigatorKey]) : super(navigatorKey); @override final Map pagesMap = { + AboutApplicationRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const AboutApplicationPage(), + ); + }, + AppSettingsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const AppSettingsPage(), + ); + }, + DeveloperSettingsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const DeveloperSettingsPage(), + ); + }, + ConsoleRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const ConsolePage(), + ); + }, + MoreRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const MorePage(), + ); + }, OnboardingRoute.name: (routeData) { - return MaterialPageX( + return AutoRoutePage( routeData: routeData, child: const OnboardingPage(), ); }, - InitializingRoute.name: (routeData) { - return MaterialPageX( + ProvidersRoute.name: (routeData) { + return AutoRoutePage( routeData: routeData, - child: const InitializingPage(), + child: const ProvidersPage(), + ); + }, + ServerDetailsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const ServerDetailsScreen(), + ); + }, + ServiceRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( + routeData: routeData, + child: ServicePage( + serviceId: args.serviceId, + key: args.key, + ), + ); + }, + ServicesRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const ServicesPage(), + ); + }, + UsersRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const UsersPage(), + ); + }, + NewUserRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const NewUserPage(), + ); + }, + UserDetailsRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( + routeData: routeData, + child: UserDetailsPage( + login: args.login, + key: args.key, + ), + ); + }, + BackupDetailsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const BackupDetailsPage(), + ); + }, + DnsDetailsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const DnsDetailsPage(), ); }, RecoveryRoute.name: (routeData) { - return MaterialPageX( + return AutoRoutePage( routeData: routeData, child: const RecoveryRouting(), ); }, - RootRoute.name: (routeData) { - return MaterialPageX( + InitializingRoute.name: (routeData) { + return AutoRoutePage( routeData: routeData, - child: WrappedRoute(child: const RootPage()), + child: const InitializingPage(), + ); + }, + RecoveryKeyRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const RecoveryKeyPage(), + ); + }, + DevicesRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const DevicesScreen(), ); }, ServicesMigrationRoute.name: (routeData) { final args = routeData.argsAs(); - return MaterialPageX( + return AutoRoutePage( routeData: routeData, child: ServicesMigrationPage( services: args.services, @@ -53,139 +148,9 @@ class _$RootRouter extends RootStackRouter { ), ); }, - ConsoleRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const ConsolePage(), - ); - }, - ProvidersRoute.name: (routeData) { - return CustomPage( - routeData: routeData, - child: const ProvidersPage(), - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - opaque: true, - barrierDismissible: false, - ); - }, - ServicesRoute.name: (routeData) { - return CustomPage( - routeData: routeData, - child: const ServicesPage(), - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - opaque: true, - barrierDismissible: false, - ); - }, - UsersRoute.name: (routeData) { - return CustomPage( - routeData: routeData, - child: const UsersPage(), - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - opaque: true, - barrierDismissible: false, - ); - }, - MoreRoute.name: (routeData) { - return CustomPage( - routeData: routeData, - child: const MorePage(), - transitionsBuilder: fadeThroughTransition, - durationInMilliseconds: 400, - opaque: true, - barrierDismissible: false, - ); - }, - AppSettingsRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const AppSettingsPage(), - ); - }, - UserDetailsRoute.name: (routeData) { - final args = routeData.argsAs(); - return MaterialPageX( - routeData: routeData, - child: UserDetailsPage( - login: args.login, - key: args.key, - ), - ); - }, - NewUserRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const NewUserPage(), - ); - }, - RecoveryKeyRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const RecoveryKeyPage(), - ); - }, - DevicesRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const DevicesScreen(), - ); - }, - AboutApplicationRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const AboutApplicationPage(), - ); - }, - DeveloperSettingsRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const DeveloperSettingsPage(), - ); - }, - ServiceRoute.name: (routeData) { - final args = routeData.argsAs(); - return MaterialPageX( - routeData: routeData, - child: ServicePage( - serviceId: args.serviceId, - key: args.key, - ), - ); - }, - ServerDetailsRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const ServerDetailsScreen(), - ); - }, - DnsDetailsRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const DnsDetailsPage(), - ); - }, - BackupDetailsRoute.name: (routeData) { - return MaterialPageX( - routeData: routeData, - child: const BackupDetailsPage(), - ); - }, - ServerStorageRoute.name: (routeData) { - final args = routeData.argsAs(); - return MaterialPageX( - routeData: routeData, - child: ServerStoragePage( - diskStatus: args.diskStatus, - key: args.key, - ), - ); - }, ExtendingVolumeRoute.name: (routeData) { final args = routeData.argsAs(); - return MaterialPageX( + return AutoRoutePage( routeData: routeData, child: ExtendingVolumePage( diskVolumeToResize: args.diskVolumeToResize, @@ -194,175 +159,337 @@ class _$RootRouter extends RootStackRouter { ), ); }, + ServerStorageRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( + routeData: routeData, + child: ServerStoragePage( + diskStatus: args.diskStatus, + key: args.key, + ), + ); + }, + RootRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: WrappedRoute(child: const RootPage()), + ); + }, }; +} - @override - List get routes => [ - RouteConfig( - OnboardingRoute.name, - path: '/onboarding-page', - ), - RouteConfig( - InitializingRoute.name, - path: '/initializing-page', - ), - RouteConfig( - RecoveryRoute.name, - path: '/recovery-routing', - ), - RouteConfig( - RootRoute.name, - path: '/', - children: [ - RouteConfig( - ProvidersRoute.name, - path: '', - parent: RootRoute.name, - usesPathAsKey: true, - ), - RouteConfig( - ServicesRoute.name, - path: 'services-page', - parent: RootRoute.name, - usesPathAsKey: true, - ), - RouteConfig( - UsersRoute.name, - path: 'users-page', - parent: RootRoute.name, - usesPathAsKey: true, - ), - RouteConfig( - MoreRoute.name, - path: 'more-page', - parent: RootRoute.name, - usesPathAsKey: true, - ), - RouteConfig( - AppSettingsRoute.name, - path: 'app-settings-page', - parent: RootRoute.name, - ), - RouteConfig( - UserDetailsRoute.name, - path: 'user-details-page', - parent: RootRoute.name, - ), - RouteConfig( - NewUserRoute.name, - path: 'new-user-page', - parent: RootRoute.name, - ), - RouteConfig( - RecoveryKeyRoute.name, - path: 'recovery-key-page', - parent: RootRoute.name, - ), - RouteConfig( - DevicesRoute.name, - path: 'devices-screen', - parent: RootRoute.name, - ), - RouteConfig( - AboutApplicationRoute.name, - path: 'about-application-page', - parent: RootRoute.name, - ), - RouteConfig( - DeveloperSettingsRoute.name, - path: 'developer-settings-page', - parent: RootRoute.name, - ), - RouteConfig( - ServiceRoute.name, - path: 'service-page', - parent: RootRoute.name, - ), - RouteConfig( - ServerDetailsRoute.name, - path: 'server-details-screen', - parent: RootRoute.name, - ), - RouteConfig( - DnsDetailsRoute.name, - path: 'dns-details-page', - parent: RootRoute.name, - ), - RouteConfig( - BackupDetailsRoute.name, - path: 'backup-details-page', - parent: RootRoute.name, - ), - RouteConfig( - ServerStorageRoute.name, - path: 'server-storage-page', - parent: RootRoute.name, - ), - RouteConfig( - ExtendingVolumeRoute.name, - path: 'extending-volume-page', - parent: RootRoute.name, - ), - ], - ), - RouteConfig( - ServicesMigrationRoute.name, - path: '/services-migration-page', - ), - RouteConfig( +/// generated route for +/// [AboutApplicationPage] +class AboutApplicationRoute extends PageRouteInfo { + const AboutApplicationRoute({List? children}) + : super( + AboutApplicationRoute.name, + initialChildren: children, + ); + + static const String name = 'AboutApplicationRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [AppSettingsPage] +class AppSettingsRoute extends PageRouteInfo { + const AppSettingsRoute({List? children}) + : super( + AppSettingsRoute.name, + initialChildren: children, + ); + + static const String name = 'AppSettingsRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [DeveloperSettingsPage] +class DeveloperSettingsRoute extends PageRouteInfo { + const DeveloperSettingsRoute({List? children}) + : super( + DeveloperSettingsRoute.name, + initialChildren: children, + ); + + static const String name = 'DeveloperSettingsRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [ConsolePage] +class ConsoleRoute extends PageRouteInfo { + const ConsoleRoute({List? children}) + : super( ConsoleRoute.name, - path: '/console-page', - ), - ]; + initialChildren: children, + ); + + static const String name = 'ConsoleRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [MorePage] +class MoreRoute extends PageRouteInfo { + const MoreRoute({List? children}) + : super( + MoreRoute.name, + initialChildren: children, + ); + + static const String name = 'MoreRoute'; + + static const PageInfo page = PageInfo(name); } /// generated route for /// [OnboardingPage] class OnboardingRoute extends PageRouteInfo { - const OnboardingRoute() + const OnboardingRoute({List? children}) : super( OnboardingRoute.name, - path: '/onboarding-page', + initialChildren: children, ); static const String name = 'OnboardingRoute'; + + static const PageInfo page = PageInfo(name); } /// generated route for -/// [InitializingPage] -class InitializingRoute extends PageRouteInfo { - const InitializingRoute() +/// [ProvidersPage] +class ProvidersRoute extends PageRouteInfo { + const ProvidersRoute({List? children}) : super( - InitializingRoute.name, - path: '/initializing-page', + ProvidersRoute.name, + initialChildren: children, ); - static const String name = 'InitializingRoute'; + static const String name = 'ProvidersRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [ServerDetailsScreen] +class ServerDetailsRoute extends PageRouteInfo { + const ServerDetailsRoute({List? children}) + : super( + ServerDetailsRoute.name, + initialChildren: children, + ); + + static const String name = 'ServerDetailsRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [ServicePage] +class ServiceRoute extends PageRouteInfo { + ServiceRoute({ + required String serviceId, + Key? key, + List? children, + }) : super( + ServiceRoute.name, + args: ServiceRouteArgs( + serviceId: serviceId, + key: key, + ), + initialChildren: children, + ); + + static const String name = 'ServiceRoute'; + + static const PageInfo page = + PageInfo(name); +} + +class ServiceRouteArgs { + const ServiceRouteArgs({ + required this.serviceId, + this.key, + }); + + final String serviceId; + + final Key? key; + + @override + String toString() { + return 'ServiceRouteArgs{serviceId: $serviceId, key: $key}'; + } +} + +/// generated route for +/// [ServicesPage] +class ServicesRoute extends PageRouteInfo { + const ServicesRoute({List? children}) + : super( + ServicesRoute.name, + initialChildren: children, + ); + + static const String name = 'ServicesRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [UsersPage] +class UsersRoute extends PageRouteInfo { + const UsersRoute({List? children}) + : super( + UsersRoute.name, + initialChildren: children, + ); + + static const String name = 'UsersRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [NewUserPage] +class NewUserRoute extends PageRouteInfo { + const NewUserRoute({List? children}) + : super( + NewUserRoute.name, + initialChildren: children, + ); + + static const String name = 'NewUserRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [UserDetailsPage] +class UserDetailsRoute extends PageRouteInfo { + UserDetailsRoute({ + required String login, + Key? key, + List? children, + }) : super( + UserDetailsRoute.name, + args: UserDetailsRouteArgs( + login: login, + key: key, + ), + initialChildren: children, + ); + + static const String name = 'UserDetailsRoute'; + + static const PageInfo page = + PageInfo(name); +} + +class UserDetailsRouteArgs { + const UserDetailsRouteArgs({ + required this.login, + this.key, + }); + + final String login; + + final Key? key; + + @override + String toString() { + return 'UserDetailsRouteArgs{login: $login, key: $key}'; + } +} + +/// generated route for +/// [BackupDetailsPage] +class BackupDetailsRoute extends PageRouteInfo { + const BackupDetailsRoute({List? children}) + : super( + BackupDetailsRoute.name, + initialChildren: children, + ); + + static const String name = 'BackupDetailsRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [DnsDetailsPage] +class DnsDetailsRoute extends PageRouteInfo { + const DnsDetailsRoute({List? children}) + : super( + DnsDetailsRoute.name, + initialChildren: children, + ); + + static const String name = 'DnsDetailsRoute'; + + static const PageInfo page = PageInfo(name); } /// generated route for /// [RecoveryRouting] class RecoveryRoute extends PageRouteInfo { - const RecoveryRoute() + const RecoveryRoute({List? children}) : super( RecoveryRoute.name, - path: '/recovery-routing', - ); - - static const String name = 'RecoveryRoute'; -} - -/// generated route for -/// [RootPage] -class RootRoute extends PageRouteInfo { - const RootRoute({List? children}) - : super( - RootRoute.name, - path: '/', initialChildren: children, ); - static const String name = 'RootRoute'; + static const String name = 'RecoveryRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [InitializingPage] +class InitializingRoute extends PageRouteInfo { + const InitializingRoute({List? children}) + : super( + InitializingRoute.name, + initialChildren: children, + ); + + static const String name = 'InitializingRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [RecoveryKeyPage] +class RecoveryKeyRoute extends PageRouteInfo { + const RecoveryKeyRoute({List? children}) + : super( + RecoveryKeyRoute.name, + initialChildren: children, + ); + + static const String name = 'RecoveryKeyRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [DevicesScreen] +class DevicesRoute extends PageRouteInfo { + const DevicesRoute({List? children}) + : super( + DevicesRoute.name, + initialChildren: children, + ); + + static const String name = 'DevicesRoute'; + + static const PageInfo page = PageInfo(name); } /// generated route for @@ -373,18 +500,22 @@ class ServicesMigrationRoute extends PageRouteInfo { required DiskStatus diskStatus, required bool isMigration, Key? key, + List? children, }) : super( ServicesMigrationRoute.name, - path: '/services-migration-page', args: ServicesMigrationRouteArgs( services: services, diskStatus: diskStatus, isMigration: isMigration, key: key, ), + initialChildren: children, ); static const String name = 'ServicesMigrationRoute'; + + static const PageInfo page = + PageInfo(name); } class ServicesMigrationRouteArgs { @@ -409,276 +540,6 @@ class ServicesMigrationRouteArgs { } } -/// generated route for -/// [ConsolePage] -class ConsoleRoute extends PageRouteInfo { - const ConsoleRoute() - : super( - ConsoleRoute.name, - path: '/console-page', - ); - - static const String name = 'ConsoleRoute'; -} - -/// generated route for -/// [ProvidersPage] -class ProvidersRoute extends PageRouteInfo { - const ProvidersRoute() - : super( - ProvidersRoute.name, - path: '', - ); - - static const String name = 'ProvidersRoute'; -} - -/// generated route for -/// [ServicesPage] -class ServicesRoute extends PageRouteInfo { - const ServicesRoute() - : super( - ServicesRoute.name, - path: 'services-page', - ); - - static const String name = 'ServicesRoute'; -} - -/// generated route for -/// [UsersPage] -class UsersRoute extends PageRouteInfo { - const UsersRoute() - : super( - UsersRoute.name, - path: 'users-page', - ); - - static const String name = 'UsersRoute'; -} - -/// generated route for -/// [MorePage] -class MoreRoute extends PageRouteInfo { - const MoreRoute() - : super( - MoreRoute.name, - path: 'more-page', - ); - - static const String name = 'MoreRoute'; -} - -/// generated route for -/// [AppSettingsPage] -class AppSettingsRoute extends PageRouteInfo { - const AppSettingsRoute() - : super( - AppSettingsRoute.name, - path: 'app-settings-page', - ); - - static const String name = 'AppSettingsRoute'; -} - -/// generated route for -/// [UserDetailsPage] -class UserDetailsRoute extends PageRouteInfo { - UserDetailsRoute({ - required String login, - Key? key, - }) : super( - UserDetailsRoute.name, - path: 'user-details-page', - args: UserDetailsRouteArgs( - login: login, - key: key, - ), - ); - - static const String name = 'UserDetailsRoute'; -} - -class UserDetailsRouteArgs { - const UserDetailsRouteArgs({ - required this.login, - this.key, - }); - - final String login; - - final Key? key; - - @override - String toString() { - return 'UserDetailsRouteArgs{login: $login, key: $key}'; - } -} - -/// generated route for -/// [NewUserPage] -class NewUserRoute extends PageRouteInfo { - const NewUserRoute() - : super( - NewUserRoute.name, - path: 'new-user-page', - ); - - static const String name = 'NewUserRoute'; -} - -/// generated route for -/// [RecoveryKeyPage] -class RecoveryKeyRoute extends PageRouteInfo { - const RecoveryKeyRoute() - : super( - RecoveryKeyRoute.name, - path: 'recovery-key-page', - ); - - static const String name = 'RecoveryKeyRoute'; -} - -/// generated route for -/// [DevicesScreen] -class DevicesRoute extends PageRouteInfo { - const DevicesRoute() - : super( - DevicesRoute.name, - path: 'devices-screen', - ); - - static const String name = 'DevicesRoute'; -} - -/// generated route for -/// [AboutApplicationPage] -class AboutApplicationRoute extends PageRouteInfo { - const AboutApplicationRoute() - : super( - AboutApplicationRoute.name, - path: 'about-application-page', - ); - - static const String name = 'AboutApplicationRoute'; -} - -/// generated route for -/// [DeveloperSettingsPage] -class DeveloperSettingsRoute extends PageRouteInfo { - const DeveloperSettingsRoute() - : super( - DeveloperSettingsRoute.name, - path: 'developer-settings-page', - ); - - static const String name = 'DeveloperSettingsRoute'; -} - -/// generated route for -/// [ServicePage] -class ServiceRoute extends PageRouteInfo { - ServiceRoute({ - required String serviceId, - Key? key, - }) : super( - ServiceRoute.name, - path: 'service-page', - args: ServiceRouteArgs( - serviceId: serviceId, - key: key, - ), - ); - - static const String name = 'ServiceRoute'; -} - -class ServiceRouteArgs { - const ServiceRouteArgs({ - required this.serviceId, - this.key, - }); - - final String serviceId; - - final Key? key; - - @override - String toString() { - return 'ServiceRouteArgs{serviceId: $serviceId, key: $key}'; - } -} - -/// generated route for -/// [ServerDetailsScreen] -class ServerDetailsRoute extends PageRouteInfo { - const ServerDetailsRoute() - : super( - ServerDetailsRoute.name, - path: 'server-details-screen', - ); - - static const String name = 'ServerDetailsRoute'; -} - -/// generated route for -/// [DnsDetailsPage] -class DnsDetailsRoute extends PageRouteInfo { - const DnsDetailsRoute() - : super( - DnsDetailsRoute.name, - path: 'dns-details-page', - ); - - static const String name = 'DnsDetailsRoute'; -} - -/// generated route for -/// [BackupDetailsPage] -class BackupDetailsRoute extends PageRouteInfo { - const BackupDetailsRoute() - : super( - BackupDetailsRoute.name, - path: 'backup-details-page', - ); - - static const String name = 'BackupDetailsRoute'; -} - -/// generated route for -/// [ServerStoragePage] -class ServerStorageRoute extends PageRouteInfo { - ServerStorageRoute({ - required DiskStatus diskStatus, - Key? key, - }) : super( - ServerStorageRoute.name, - path: 'server-storage-page', - args: ServerStorageRouteArgs( - diskStatus: diskStatus, - key: key, - ), - ); - - static const String name = 'ServerStorageRoute'; -} - -class ServerStorageRouteArgs { - const ServerStorageRouteArgs({ - required this.diskStatus, - this.key, - }); - - final DiskStatus diskStatus; - - final Key? key; - - @override - String toString() { - return 'ServerStorageRouteArgs{diskStatus: $diskStatus, key: $key}'; - } -} - /// generated route for /// [ExtendingVolumePage] class ExtendingVolumeRoute extends PageRouteInfo { @@ -686,17 +547,21 @@ class ExtendingVolumeRoute extends PageRouteInfo { required DiskVolume diskVolumeToResize, required DiskStatus diskStatus, Key? key, + List? children, }) : super( ExtendingVolumeRoute.name, - path: 'extending-volume-page', args: ExtendingVolumeRouteArgs( diskVolumeToResize: diskVolumeToResize, diskStatus: diskStatus, key: key, ), + initialChildren: children, ); static const String name = 'ExtendingVolumeRoute'; + + static const PageInfo page = + PageInfo(name); } class ExtendingVolumeRouteArgs { @@ -717,3 +582,55 @@ class ExtendingVolumeRouteArgs { return 'ExtendingVolumeRouteArgs{diskVolumeToResize: $diskVolumeToResize, diskStatus: $diskStatus, key: $key}'; } } + +/// generated route for +/// [ServerStoragePage] +class ServerStorageRoute extends PageRouteInfo { + ServerStorageRoute({ + required DiskStatus diskStatus, + Key? key, + List? children, + }) : super( + ServerStorageRoute.name, + args: ServerStorageRouteArgs( + diskStatus: diskStatus, + key: key, + ), + initialChildren: children, + ); + + static const String name = 'ServerStorageRoute'; + + static const PageInfo page = + PageInfo(name); +} + +class ServerStorageRouteArgs { + const ServerStorageRouteArgs({ + required this.diskStatus, + this.key, + }); + + final DiskStatus diskStatus; + + final Key? key; + + @override + String toString() { + return 'ServerStorageRouteArgs{diskStatus: $diskStatus, key: $key}'; + } +} + +/// generated route for +/// [RootPage] +class RootRoute extends PageRouteInfo { + const RootRoute({List? children}) + : super( + RootRoute.name, + initialChildren: children, + ); + + static const String name = 'RootRoute'; + + static const PageInfo page = PageInfo(name); +}