HyperNet/Surface
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

♻️ Refactored router

Browse Source
This commit is contained in:
LittleSheep 2025-01-25 14:35:04 +08:00
parent 950612dc07
commit cb4a2598c8
3 changed files with 197 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
lib/router.dart
View File

@ -34,21 +34,30 @@ import 'package:surface/widgets/about.dart';
import 'package:surface/widgets/navigation/app_background.dart';
import 'package:surface/widgets/navigation/app_scaffold.dart';
Widget _fadeThroughTransition(
BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
return FadeThroughTransition(
animation: animation,
secondaryAnimation: secondaryAnimation,
fillColor: Colors.transparent,
child: child,
);
}
final _appRoutes = [
ShellRoute(
builder: (context, state, child) => child,
routes: [
GoRoute(
path: '/',
name: 'home',
pageBuilder: (context, state) => NoTransitionPage(
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: _fadeThroughTransition,
child: const HomeScreen(),
),
),
GoRoute(
path: '/posts',
name: 'explore',
pageBuilder: (context, state) => NoTransitionPage(
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: _fadeThroughTransition,
child: const ExploreScreen(),
),
routes: [
@ -96,30 +105,15 @@ final _appRoutes = [
path: '/account',
name: 'account',
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: (context, animation, secondaryAnimation, child) {
return FadeThroughTransition(
animation: animation,
secondaryAnimation: secondaryAnimation,
fillColor: Colors.transparent,
child: child,
);
},
transitionsBuilder: _fadeThroughTransition,
child: const AccountScreen(),
),
routes: [],
),
GoRoute(
path: '/chat',
name: 'chat',
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: (context, animation, secondaryAnimation, child) {
return FadeThroughTransition(
animation: animation,
secondaryAnimation: secondaryAnimation,
fillColor: Colors.transparent,
child: child,
);
},
transitionsBuilder: _fadeThroughTransition,
child: const ChatScreen(),
),
routes: [
@ -165,46 +159,34 @@ final _appRoutes = [
animation: animation,
secondaryAnimation: secondaryAnimation,
fillColor: Colors.transparent,
child: AppBackground(
child: child,
),
);
},
),
),
GoRoute(
path: '/:alias',
name: 'realmDetail',
builder: (context, state) => AppBackground(
child: RealmDetailScreen(alias: state.pathParameters['alias']!),
),
),
],
),
GoRoute(
path: '/realm',
name: 'realm',
pageBuilder: (context, state) => NoTransitionPage(
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: _fadeThroughTransition,
child: const RealmScreen(),
),
routes: [
GoRoute(
path: '/:alias',
name: 'realmDetail',
builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
),
GoRoute(
path: '/manage',
name: 'realmManage',
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: _fadeThroughTransition,
child: RealmManageScreen(
editingRealmAlias: state.uri.queryParameters['editing'],
),
transitionsBuilder: (context, animation, secondaryAnimation, child) {
return FadeThroughTransition(
animation: animation,
secondaryAnimation: secondaryAnimation,
fillColor: Colors.transparent,
child: AppBackground(
child: child,
),
);
},
),
),
],
@ -212,7 +194,8 @@ final _appRoutes = [
GoRoute(
path: '/album',
name: 'album',
pageBuilder: (context, state) => NoTransitionPage(
pageBuilder: (context, state) => CustomTransitionPage(
transitionsBuilder: _fadeThroughTransition,
child: const AlbumScreen(),
),
),
@ -230,11 +213,6 @@ final _appRoutes = [
child: const NotificationScreen(),
),
),
],
),
ShellRoute(
builder: (context, state, child) => child,
routes: [
GoRoute(
path: '/auth/login',
name: 'authLogin',
@ -272,8 +250,6 @@ final _appRoutes = [
name: state.pathParameters['name']!,
),
),
],
),
GoRoute(
path: '/account/:name',
name: 'accountProfilePage',
@ -281,26 +257,16 @@ final _appRoutes = [
child: UserScreen(name: state.pathParameters['name']!),
),
),
ShellRoute(
builder: (context, state, child) => child,
routes: [
GoRoute(
path: '/settings',
name: 'settings',
builder: (context, state) => SettingsScreen(),
),
],
),
ShellRoute(
builder: (context, state, child) => child,
routes: [
GoRoute(
path: '/about',
name: 'about',
builder: (context, state) => AboutScreen(),
),
],
),
];
final appRouter = GoRouter(

1
lib/screens/account/profile_page.dart
View File

@ -19,7 +19,6 @@ import 'package:surface/types/check_in.dart';
import 'package:surface/types/post.dart';
import 'package:surface/widgets/account/account_image.dart';
import 'package:surface/widgets/dialog.dart';
import 'package:surface/widgets/navigation/app_scaffold.dart';
import 'package:surface/widgets/universal_image.dart';
const Map<String, (String, IconData, Color)> kBadgesMeta = {

2
lib/widgets/navigation/app_scaffold.dart
View File

@ -1,7 +1,6 @@
import 'dart:io';
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@ -12,7 +11,6 @@ import 'package:styled_widget/styled_widget.dart';
import 'package:surface/providers/config.dart';
import 'package:surface/providers/navigation.dart';
import 'package:surface/widgets/connection_indicator.dart';
import 'package:surface/widgets/dialog.dart';
import 'package:surface/widgets/navigation/app_background.dart';
import 'package:surface/widgets/navigation/app_bottom_navigation.dart';
import 'package:surface/widgets/navigation/app_drawer_navigation.dart';