From 0c1768e05e9b85d444cf63c713ef22b5133b571e Mon Sep 17 00:00:00 2001 From: problematicconsumer Date: Sun, 26 Nov 2023 21:59:57 +0330 Subject: [PATCH] Refactor router --- lib/core/router/app_router.dart | 4 +- lib/core/router/routes.dart | 390 +++++++++++++++++- lib/core/router/routes/desktop_routes.dart | 137 ------ lib/core/router/routes/mobile_routes.dart | 178 -------- lib/core/router/routes/shared_routes.dart | 129 ------ lib/features/common/nested_app_bar.dart | 2 +- .../widgets/empty_profiles_home_body.dart | 2 +- lib/features/profile/widget/profile_tile.dart | 2 +- 8 files changed, 383 insertions(+), 461 deletions(-) delete mode 100644 lib/core/router/routes/desktop_routes.dart delete mode 100644 lib/core/router/routes/mobile_routes.dart delete mode 100644 lib/core/router/routes/shared_routes.dart diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart index 5de8f211..74a6587f 100644 --- a/lib/core/router/app_router.dart +++ b/lib/core/router/app_router.dart @@ -38,7 +38,9 @@ GoRouter router(RouterRef ref) { navigatorKey: rootNavigatorKey, initialLocation: initialLocation, debugLogDiagnostics: true, - routes: useMobileRouter ? mobileRoutes : desktopRoutes, + routes: [ + if (useMobileRouter) $mobileWrapperRoute else $desktopWrapperRoute, + ], refreshListenable: notifier, redirect: notifier.redirect, observers: [ diff --git a/lib/core/router/routes.dart b/lib/core/router/routes.dart index 5b9acd92..44a2089a 100644 --- a/lib/core/router/routes.dart +++ b/lib/core/router/routes.dart @@ -1,16 +1,380 @@ -import 'package:hiddify/core/router/routes/desktop_routes.dart' as desktop; -import 'package:hiddify/core/router/routes/mobile_routes.dart' as mobile; -import 'package:hiddify/core/router/routes/shared_routes.dart' as shared; +import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; +import 'package:hiddify/core/router/app_router.dart'; +import 'package:hiddify/features/about/view/about_page.dart'; +import 'package:hiddify/features/common/adaptive_root_scaffold.dart'; +import 'package:hiddify/features/geo_asset/overview/geo_assets_overview_page.dart'; +import 'package:hiddify/features/home/view/view.dart'; +import 'package:hiddify/features/intro/intro_page.dart'; +import 'package:hiddify/features/logs/view/logs_page.dart'; +import 'package:hiddify/features/profile/add/add_profile_modal.dart'; +import 'package:hiddify/features/profile/details/profile_details_page.dart'; +import 'package:hiddify/features/profile/overview/profiles_overview_page.dart'; +import 'package:hiddify/features/proxies/view/view.dart'; +import 'package:hiddify/features/settings/view/config_options_page.dart'; +import 'package:hiddify/features/settings/view/per_app_proxy_page.dart'; +import 'package:hiddify/features/settings/view/settings_page.dart'; +import 'package:hiddify/utils/utils.dart'; -export 'routes/mobile_routes.dart'; -export 'routes/shared_routes.dart' hide $appRoutes; +part 'routes.g.dart'; -final mobileRoutes = [ - ...shared.$appRoutes, - ...mobile.$appRoutes, -]; +GlobalKey? _dynamicRootKey = + useMobileRouter ? rootNavigatorKey : null; -final desktopRoutes = [ - ...shared.$appRoutes, - ...desktop.$appRoutes, -]; +@TypedShellRoute( + routes: [ + TypedGoRoute(path: "/intro", name: IntroRoute.name), + TypedGoRoute( + path: "/", + name: HomeRoute.name, + routes: [ + TypedGoRoute( + path: "add", + name: AddProfileRoute.name, + ), + TypedGoRoute( + path: "profiles", + name: ProfilesOverviewRoute.name, + ), + TypedGoRoute( + path: "profiles/new", + name: NewProfileRoute.name, + ), + TypedGoRoute( + path: "profiles/:id", + name: ProfileDetailsRoute.name, + ), + TypedGoRoute( + path: "logs", + name: LogsRoute.name, + ), + TypedGoRoute( + path: "settings", + name: SettingsRoute.name, + routes: [ + TypedGoRoute( + path: "config-options", + name: ConfigOptionsRoute.name, + ), + TypedGoRoute( + path: "per-app-proxy", + name: PerAppProxyRoute.name, + ), + TypedGoRoute( + path: "routing-assets", + name: GeoAssetsRoute.name, + ), + ], + ), + TypedGoRoute( + path: "about", + name: AboutRoute.name, + ), + ], + ), + TypedGoRoute( + path: "/proxies", + name: ProxiesRoute.name, + ), + ], +) +class MobileWrapperRoute extends ShellRouteData { + const MobileWrapperRoute(); + + @override + Widget builder(BuildContext context, GoRouterState state, Widget navigator) { + return AdaptiveRootScaffold(navigator); + } +} + +@TypedShellRoute( + routes: [ + TypedGoRoute(path: "/intro", name: IntroRoute.name), + TypedGoRoute( + path: "/", + name: HomeRoute.name, + routes: [ + TypedGoRoute( + path: "add", + name: AddProfileRoute.name, + ), + TypedGoRoute( + path: "profiles", + name: ProfilesOverviewRoute.name, + ), + TypedGoRoute( + path: "profiles/new", + name: NewProfileRoute.name, + ), + TypedGoRoute( + path: "profiles/:id", + name: ProfileDetailsRoute.name, + ), + ], + ), + TypedGoRoute( + path: "/proxies", + name: ProxiesRoute.name, + ), + TypedGoRoute( + path: "/logs", + name: LogsRoute.name, + ), + TypedGoRoute( + path: "/settings", + name: SettingsRoute.name, + routes: [ + TypedGoRoute( + path: "config-options", + name: ConfigOptionsRoute.name, + ), + TypedGoRoute( + path: "routing-assets", + name: GeoAssetsRoute.name, + ), + ], + ), + TypedGoRoute( + path: "/about", + name: AboutRoute.name, + ), + ], +) +class DesktopWrapperRoute extends ShellRouteData { + const DesktopWrapperRoute(); + + @override + Widget builder(BuildContext context, GoRouterState state, Widget navigator) { + return AdaptiveRootScaffold(navigator); + } +} + +class IntroRoute extends GoRouteData { + const IntroRoute(); + static const name = "Intro"; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: IntroPage(), + ); + } +} + +class HomeRoute extends GoRouteData { + const HomeRoute(); + static const name = "Home"; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return const NoTransitionPage( + name: name, + child: HomePage(), + ); + } +} + +class ProxiesRoute extends GoRouteData { + const ProxiesRoute(); + static const name = "Proxies"; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return const NoTransitionPage( + name: name, + child: ProxiesPage(), + ); + } +} + +class AddProfileRoute extends GoRouteData { + const AddProfileRoute({this.url}); + + final String? url; + + static const name = "Add Profile"; + + static final GlobalKey $parentNavigatorKey = rootNavigatorKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return BottomSheetPage( + fixed: true, + name: name, + builder: (controller) => AddProfileModal( + url: url, + scrollController: controller, + ), + ); + } +} + +class ProfilesOverviewRoute extends GoRouteData { + const ProfilesOverviewRoute(); + static const name = "Profiles"; + + static final GlobalKey $parentNavigatorKey = rootNavigatorKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return BottomSheetPage( + name: name, + builder: (controller) => + ProfilesOverviewModal(scrollController: controller), + ); + } +} + +class NewProfileRoute extends GoRouteData { + const NewProfileRoute(); + static const name = "New Profile"; + + static final GlobalKey $parentNavigatorKey = rootNavigatorKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: ProfileDetailsPage("new"), + ); + } +} + +class ProfileDetailsRoute extends GoRouteData { + const ProfileDetailsRoute(this.id); + final String id; + static const name = "Profile Details"; + + static final GlobalKey $parentNavigatorKey = rootNavigatorKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return MaterialPage( + fullscreenDialog: true, + name: name, + child: ProfileDetailsPage(id), + ); + } +} + +class LogsRoute extends GoRouteData { + const LogsRoute(); + static const name = "Logs"; + + static final GlobalKey? $parentNavigatorKey = _dynamicRootKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + if (useMobileRouter) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: LogsPage(), + ); + } + return const NoTransitionPage(name: name, child: LogsPage()); + } +} + +class SettingsRoute extends GoRouteData { + const SettingsRoute(); + static const name = "Settings"; + + static final GlobalKey? $parentNavigatorKey = _dynamicRootKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + if (useMobileRouter) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: SettingsPage(), + ); + } + return const NoTransitionPage(name: name, child: SettingsPage()); + } +} + +class ConfigOptionsRoute extends GoRouteData { + const ConfigOptionsRoute(); + static const name = "Config Options"; + + static final GlobalKey? $parentNavigatorKey = _dynamicRootKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + if (useMobileRouter) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: ConfigOptionsPage(), + ); + } + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: ConfigOptionsPage(), + ); + } +} + +class PerAppProxyRoute extends GoRouteData { + const PerAppProxyRoute(); + static const name = "Per-app Proxy"; + + static final GlobalKey $parentNavigatorKey = rootNavigatorKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: PerAppProxyPage(), + ); + } +} + +class GeoAssetsRoute extends GoRouteData { + const GeoAssetsRoute(); + static const name = "Routing Assets"; + + static final GlobalKey? $parentNavigatorKey = _dynamicRootKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + if (useMobileRouter) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: GeoAssetsOverviewPage(), + ); + } + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: GeoAssetsOverviewPage(), + ); + } +} + +class AboutRoute extends GoRouteData { + const AboutRoute(); + static const name = "About"; + + static final GlobalKey? $parentNavigatorKey = _dynamicRootKey; + + @override + Page buildPage(BuildContext context, GoRouterState state) { + if (useMobileRouter) { + return const MaterialPage( + fullscreenDialog: true, + name: name, + child: AboutPage(), + ); + } + return const NoTransitionPage(name: name, child: AboutPage()); + } +} diff --git a/lib/core/router/routes/desktop_routes.dart b/lib/core/router/routes/desktop_routes.dart deleted file mode 100644 index 3830b7c3..00000000 --- a/lib/core/router/routes/desktop_routes.dart +++ /dev/null @@ -1,137 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; -import 'package:hiddify/core/router/routes/shared_routes.dart'; -import 'package:hiddify/features/about/view/view.dart'; -import 'package:hiddify/features/common/adaptive_root_scaffold.dart'; -import 'package:hiddify/features/geo_asset/overview/geo_assets_overview_page.dart'; -import 'package:hiddify/features/logs/view/view.dart'; -import 'package:hiddify/features/settings/view/view.dart'; - -part 'desktop_routes.g.dart'; - -@TypedShellRoute( - routes: [ - TypedGoRoute( - path: HomeRoute.path, - name: HomeRoute.name, - routes: [ - TypedGoRoute( - path: AddProfileRoute.path, - name: AddProfileRoute.name, - ), - TypedGoRoute( - path: ProfilesRoute.path, - name: ProfilesRoute.name, - ), - TypedGoRoute( - path: NewProfileRoute.path, - name: NewProfileRoute.name, - ), - TypedGoRoute( - path: ProfileDetailsRoute.path, - name: ProfileDetailsRoute.name, - ), - ], - ), - TypedGoRoute( - path: ProxiesRoute.path, - name: ProxiesRoute.name, - ), - TypedGoRoute( - path: LogsRoute.path, - name: LogsRoute.name, - ), - TypedGoRoute( - path: SettingsRoute.path, - name: SettingsRoute.name, - routes: [ - TypedGoRoute( - path: ConfigOptionsRoute.path, - name: ConfigOptionsRoute.name, - ), - TypedGoRoute( - path: GeoAssetsRoute.path, - name: GeoAssetsRoute.name, - ), - ], - ), - TypedGoRoute( - path: AboutRoute.path, - name: AboutRoute.name, - ), - ], -) -class DesktopWrapperRoute extends ShellRouteData { - const DesktopWrapperRoute(); - - @override - Widget builder(BuildContext context, GoRouterState state, Widget navigator) { - return AdaptiveRootScaffold(navigator); - } -} - -class LogsRoute extends GoRouteData { - const LogsRoute(); - static const path = '/logs'; - static const name = 'Logs'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const NoTransitionPage(name: name, child: LogsPage()); - } -} - -class SettingsRoute extends GoRouteData { - const SettingsRoute(); - static const path = '/settings'; - static const name = 'Settings'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const NoTransitionPage(name: name, child: SettingsPage()); - } -} - -class ConfigOptionsRoute extends GoRouteData { - const ConfigOptionsRoute(); - static const path = 'config-options'; - static const name = 'Config Options'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: ConfigOptionsPage(), - ); - } -} - -class GeoAssetsRoute extends GoRouteData { - const GeoAssetsRoute(); - static const path = 'routing-assets'; - static const name = 'Routing Assets'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: GeoAssetsOverviewPage(), - ); - } -} - -class AboutRoute extends GoRouteData { - const AboutRoute(); - static const path = '/about'; - static const name = 'About'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const NoTransitionPage( - name: name, - child: AboutPage(), - ); - } -} diff --git a/lib/core/router/routes/mobile_routes.dart b/lib/core/router/routes/mobile_routes.dart deleted file mode 100644 index 5dcf0802..00000000 --- a/lib/core/router/routes/mobile_routes.dart +++ /dev/null @@ -1,178 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; -import 'package:hiddify/core/router/app_router.dart'; -import 'package:hiddify/core/router/routes/shared_routes.dart'; -import 'package:hiddify/features/about/view/view.dart'; -import 'package:hiddify/features/common/adaptive_root_scaffold.dart'; -import 'package:hiddify/features/geo_asset/overview/geo_assets_overview_page.dart'; -import 'package:hiddify/features/logs/view/view.dart'; -import 'package:hiddify/features/settings/view/view.dart'; - -part 'mobile_routes.g.dart'; - -@TypedShellRoute( - routes: [ - TypedGoRoute( - path: HomeRoute.path, - name: HomeRoute.name, - routes: [ - TypedGoRoute( - path: AddProfileRoute.path, - name: AddProfileRoute.name, - ), - TypedGoRoute( - path: ProfilesRoute.path, - name: ProfilesRoute.name, - ), - TypedGoRoute( - path: NewProfileRoute.path, - name: NewProfileRoute.name, - ), - TypedGoRoute( - path: ProfileDetailsRoute.path, - name: ProfileDetailsRoute.name, - ), - TypedGoRoute( - path: LogsRoute.path, - name: LogsRoute.name, - ), - TypedGoRoute( - path: SettingsRoute.path, - name: SettingsRoute.name, - routes: [ - TypedGoRoute( - path: ConfigOptionsRoute.path, - name: ConfigOptionsRoute.name, - ), - TypedGoRoute( - path: PerAppProxyRoute.path, - name: PerAppProxyRoute.name, - ), - TypedGoRoute( - path: GeoAssetsRoute.path, - name: GeoAssetsRoute.name, - ), - ], - ), - TypedGoRoute( - path: AboutRoute.path, - name: AboutRoute.name, - ), - ], - ), - TypedGoRoute( - path: ProxiesRoute.path, - name: ProxiesRoute.name, - ), - ], -) -class MobileWrapperRoute extends ShellRouteData { - const MobileWrapperRoute(); - - @override - Widget builder(BuildContext context, GoRouterState state, Widget navigator) { - return AdaptiveRootScaffold(navigator); - } -} - -class LogsRoute extends GoRouteData { - const LogsRoute(); - static const path = 'logs'; - static const name = 'Logs'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: LogsPage(), - ); - } -} - -class SettingsRoute extends GoRouteData { - const SettingsRoute(); - static const path = 'settings'; - static const name = 'Settings'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: SettingsPage(), - ); - } -} - -class ConfigOptionsRoute extends GoRouteData { - const ConfigOptionsRoute(); - static const path = 'config-options'; - static const name = 'Config Options'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: ConfigOptionsPage(), - ); - } -} - -class PerAppProxyRoute extends GoRouteData { - const PerAppProxyRoute(); - static const path = 'per-app-proxy'; - static const name = 'Per-app Proxy'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: PerAppProxyPage(), - ); - } -} - -class GeoAssetsRoute extends GoRouteData { - const GeoAssetsRoute(); - static const path = 'routing-assets'; - static const name = 'Routing Assets'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: GeoAssetsOverviewPage(), - ); - } -} - -class AboutRoute extends GoRouteData { - const AboutRoute(); - static const path = 'about'; - static const name = 'About'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: AboutPage(), - ); - } -} diff --git a/lib/core/router/routes/shared_routes.dart b/lib/core/router/routes/shared_routes.dart deleted file mode 100644 index 1960b7cc..00000000 --- a/lib/core/router/routes/shared_routes.dart +++ /dev/null @@ -1,129 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:go_router/go_router.dart'; -import 'package:hiddify/core/router/app_router.dart'; -import 'package:hiddify/features/home/view/view.dart'; -import 'package:hiddify/features/intro/intro_page.dart'; -import 'package:hiddify/features/profile/add/add_profile_modal.dart'; -import 'package:hiddify/features/profile/details/profile_details_page.dart'; -import 'package:hiddify/features/profile/overview/profiles_overview_page.dart'; -import 'package:hiddify/features/proxies/view/view.dart'; -import 'package:hiddify/utils/utils.dart'; - -part 'shared_routes.g.dart'; - -class HomeRoute extends GoRouteData { - const HomeRoute(); - static const path = '/'; - static const name = 'Home'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const NoTransitionPage( - name: name, - child: HomePage(), - ); - } -} - -class ProxiesRoute extends GoRouteData { - const ProxiesRoute(); - static const path = '/proxies'; - static const name = 'Proxies'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const NoTransitionPage( - name: name, - child: ProxiesPage(), - ); - } -} - -class AddProfileRoute extends GoRouteData { - const AddProfileRoute({this.url}); - static const path = 'add'; - static const name = 'Add Profile'; - final String? url; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return BottomSheetPage( - fixed: true, - name: name, - builder: (controller) => AddProfileModal( - url: url, - scrollController: controller, - ), - ); - } -} - -@TypedGoRoute(path: IntroRoute.path, name: IntroRoute.name) -class IntroRoute extends GoRouteData { - const IntroRoute(); - static const path = '/intro'; - static const name = 'Intro'; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: IntroPage(), - ); - } -} - -class ProfilesRoute extends GoRouteData { - const ProfilesRoute(); - static const path = 'profiles'; - static const name = 'Profiles'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return BottomSheetPage( - name: name, - builder: (controller) => - ProfilesOverviewModal(scrollController: controller), - ); - } -} - -class NewProfileRoute extends GoRouteData { - const NewProfileRoute(); - static const path = 'profiles/new'; - static const name = 'New Profile'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return const MaterialPage( - fullscreenDialog: true, - name: name, - child: ProfileDetailsPage("new"), - ); - } -} - -class ProfileDetailsRoute extends GoRouteData { - const ProfileDetailsRoute(this.id); - final String id; - static const path = 'profiles/:id'; - static const name = 'Profile Details'; - - static final GlobalKey $parentNavigatorKey = rootNavigatorKey; - - @override - Page buildPage(BuildContext context, GoRouterState state) { - return MaterialPage( - fullscreenDialog: true, - name: name, - child: ProfileDetailsPage(id), - ); - } -} diff --git a/lib/features/common/nested_app_bar.dart b/lib/features/common/nested_app_bar.dart index 0d872532..e9281f03 100644 --- a/lib/features/common/nested_app_bar.dart +++ b/lib/features/common/nested_app_bar.dart @@ -7,7 +7,7 @@ bool showDrawerButton(BuildContext context) { if (!useMobileRouter) return true; final String location = GoRouterState.of(context).uri.path; if (location == const HomeRoute().location || - location == const ProfilesRoute().location) return true; + location == const ProfilesOverviewRoute().location) return true; if (location.startsWith(const ProxiesRoute().location)) return true; return false; } diff --git a/lib/features/home/widgets/empty_profiles_home_body.dart b/lib/features/home/widgets/empty_profiles_home_body.dart index a633dce9..8937ce18 100644 --- a/lib/features/home/widgets/empty_profiles_home_body.dart +++ b/lib/features/home/widgets/empty_profiles_home_body.dart @@ -44,7 +44,7 @@ class EmptyActiveProfileHomeBody extends HookConsumerWidget { Text(t.home.noActiveProfileMsg), const Gap(16), OutlinedButton( - onPressed: () => const ProfilesRoute().push(context), + onPressed: () => const ProfilesOverviewRoute().push(context), child: Text(t.profile.overviewPageTitle), ), ], diff --git a/lib/features/profile/widget/profile_tile.dart b/lib/features/profile/widget/profile_tile.dart index 7d526491..c0000cb4 100644 --- a/lib/features/profile/widget/profile_tile.dart +++ b/lib/features/profile/widget/profile_tile.dart @@ -90,7 +90,7 @@ class ProfileTile extends HookConsumerWidget { child: InkWell( onTap: () { if (isMain) { - const ProfilesRoute().go(context); + const ProfilesOverviewRoute().go(context); } else { if (selectActiveMutation.state.isInProgress) return; if (profile.active) return;