fix: page order

This commit is contained in:
Simon Ding
2024-11-04 11:30:48 +08:00
parent bb6da47efb
commit 3739f2c960

View File

@@ -102,13 +102,6 @@ class _MyAppState extends ConsumerState<MyApp> {
context: context, state: state, child: const ActivityPage()), context: context, state: state, child: const ActivityPage()),
), ),
]), ]),
StatefulShellBranch(routes: [
GoRoute(
path: SystemPage.route,
pageBuilder: (context, state) => buildPageWithDefaultTransition(
context: context, state: state, child: const SystemPage()),
)
]),
StatefulShellBranch(routes: [ StatefulShellBranch(routes: [
GoRoute( GoRoute(
path: SystemSettingsPage.route, path: SystemSettingsPage.route,
@@ -118,6 +111,13 @@ class _MyAppState extends ConsumerState<MyApp> {
child: const SystemSettingsPage()), child: const SystemSettingsPage()),
), ),
]), ]),
StatefulShellBranch(routes: [
GoRoute(
path: SystemPage.route,
pageBuilder: (context, state) => buildPageWithDefaultTransition(
context: context, state: state, child: const SystemPage()),
)
]),
], ],
); );
@@ -168,10 +168,8 @@ class MainSkeleton extends StatefulWidget {
} }
class _MainSkeletonState extends State<MainSkeleton> { class _MainSkeletonState extends State<MainSkeleton> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var padding = isSmallScreen(context) ? 5.0 : 20.0; var padding = isSmallScreen(context) ? 5.0 : 20.0;
return AdaptiveScaffold( return AdaptiveScaffold(
appBarBreakpoint: Breakpoints.standard, appBarBreakpoint: Breakpoints.standard,