aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Make router static

Browse Source
pull/485/head
Krille 2 years ago
parent d2247018e6
commit d6b48091c4
No known key found for this signature in database
3 changed files with 308 additions and 298 deletions
Show Stats Download Patch File Download Diff File

108
lib/config/routes.dart
Unescape Escape View File

@ -1,7 +1,8 @@
import 'dart:async';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/add_story/add_story.dart'; import 'package:fluffychat/pages/add_story/add_story.dart';
@ -33,18 +34,28 @@ import 'package:fluffychat/widgets/layouts/empty_page.dart';
import 'package:fluffychat/widgets/layouts/side_view_layout.dart'; import 'package:fluffychat/widgets/layouts/side_view_layout.dart';
import 'package:fluffychat/widgets/layouts/two_column_layout.dart'; import 'package:fluffychat/widgets/layouts/two_column_layout.dart';
import 'package:fluffychat/widgets/log_view.dart'; import 'package:fluffychat/widgets/log_view.dart';
import 'package:fluffychat/widgets/matrix.dart';
class AppRoutes { abstract class AppRoutes {
final List<Client> clients; static FutureOr<String?> loggedInRedirect(
BuildContext context,
GoRouterState state,
) =>
Matrix.of(context).client.isLogged() ? '/rooms' : null;
bool get isLoggedIn => clients.any((client) => client.isLogged()); static FutureOr<String?> loggedOutRedirect(
BuildContext context,
GoRouterState state,
) =>
Matrix.of(context).client.isLogged() ? null : '/home';
AppRoutes(this.clients); AppRoutes();
List<RouteBase> get routes => [ static final List<RouteBase> routes = [
GoRoute( GoRoute(
path: '/', path: '/',
redirect: (context, state) => isLoggedIn ? '/rooms' : '/home', redirect: (context, state) =>
Matrix.of(context).client.isLogged() ? '/rooms' : '/home',
), ),
GoRoute( GoRoute(
path: '/home', path: '/home',
@ -52,7 +63,7 @@ class AppRoutes {
context, context,
const HomeserverPicker(), const HomeserverPicker(),
), ),
redirect: (context, state) => isLoggedIn ? '/rooms' : null, redirect: loggedInRedirect,
routes: [ routes: [
GoRoute( GoRoute(
path: 'login', path: 'login',
@ -60,7 +71,7 @@ class AppRoutes {
context, context,
const Login(), const Login(),
), ),
redirect: (context, state) => isLoggedIn ? '/rooms' : null, redirect: loggedInRedirect,
), ),
], ],
), ),
@ -91,7 +102,7 @@ class AppRoutes {
routes: [ routes: [
GoRoute( GoRoute(
path: '/rooms', path: '/rooms',
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder( pageBuilder: (context, state) => defaultPageBuilder(
context, context,
FluffyThemes.isColumnMode(context) FluffyThemes.isColumnMode(context)
@ -107,7 +118,7 @@ class AppRoutes {
context, context,
const AddStoryPage(), const AddStoryPage(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'stories/:roomid', path: 'stories/:roomid',
@ -115,7 +126,7 @@ class AppRoutes {
context, context,
const StoryPage(), const StoryPage(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
routes: [ routes: [
GoRoute( GoRoute(
path: 'share', path: 'share',
@ -123,8 +134,7 @@ class AppRoutes {
context, context,
const AddStoryPage(), const AddStoryPage(),
), ),
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
), ),
], ],
), ),
@ -137,7 +147,7 @@ class AppRoutes {
), ),
), ),
routes: _chatDetailsRoutes, routes: _chatDetailsRoutes,
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'archive', path: 'archive',
@ -154,11 +164,10 @@ class AppRoutes {
roomId: state.pathParameters['roomid']!, roomId: state.pathParameters['roomid']!,
), ),
), ),
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
), ),
], ],
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'newprivatechat', path: 'newprivatechat',
@ -166,7 +175,7 @@ class AppRoutes {
context, context,
const NewPrivateChat(), const NewPrivateChat(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'newgroup', path: 'newgroup',
@ -174,7 +183,7 @@ class AppRoutes {
context, context,
const NewGroup(), const NewGroup(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'newspace', path: 'newspace',
@ -182,7 +191,7 @@ class AppRoutes {
context, context,
const NewSpace(), const NewSpace(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
ShellRoute( ShellRoute(
pageBuilder: (context, state, child) => defaultPageBuilder( pageBuilder: (context, state, child) => defaultPageBuilder(
@ -205,8 +214,7 @@ class AppRoutes {
: const Settings(), : const Settings(),
), ),
routes: _settingsRoutes, routes: _settingsRoutes,
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
), ),
], ],
), ),
@ -217,8 +225,8 @@ class AppRoutes {
mainView: ChatPage( mainView: ChatPage(
roomId: state.pathParameters['roomid']!, roomId: state.pathParameters['roomid']!,
), ),
sideView: sideView: child,
state.fullPath == '/rooms/:roomid' ? null : child, hideSideView: state.fullPath == '/rooms/:roomid',
), ),
), ),
routes: [ routes: [
@ -226,10 +234,9 @@ class AppRoutes {
path: ':roomid', path: ':roomid',
pageBuilder: (context, state) => defaultPageBuilder( pageBuilder: (context, state) => defaultPageBuilder(
context, context,
const EmptyPage(), const SizedBox.shrink(),
), ),
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
routes: [ routes: [
GoRoute( GoRoute(
path: 'encryption', path: 'encryption',
@ -237,8 +244,7 @@ class AppRoutes {
context, context,
const ChatEncryptionSettings(), const ChatEncryptionSettings(),
), ),
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
), ),
GoRoute( GoRoute(
path: 'invite', path: 'invite',
@ -246,8 +252,7 @@ class AppRoutes {
context, context,
const InvitationSelection(), const InvitationSelection(),
), ),
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
), ),
GoRoute( GoRoute(
path: 'details', path: 'details',
@ -258,8 +263,7 @@ class AppRoutes {
), ),
), ),
routes: _chatDetailsRoutes, routes: _chatDetailsRoutes,
redirect: (context, state) => redirect: loggedOutRedirect,
!isLoggedIn ? '/home' : null,
), ),
], ],
), ),
@ -271,14 +275,14 @@ class AppRoutes {
), ),
]; ];
List<RouteBase> get _chatDetailsRoutes => [ static final List<RouteBase> _chatDetailsRoutes = [
GoRoute( GoRoute(
path: 'permissions', path: 'permissions',
pageBuilder: (context, state) => defaultPageBuilder( pageBuilder: (context, state) => defaultPageBuilder(
context, context,
const ChatPermissionsSettings(), const ChatPermissionsSettings(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'invite', path: 'invite',
@ -286,7 +290,7 @@ class AppRoutes {
context, context,
const InvitationSelection(), const InvitationSelection(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'multiple_emotes', path: 'multiple_emotes',
@ -294,7 +298,7 @@ class AppRoutes {
context, context,
const MultipleEmotesSettings(), const MultipleEmotesSettings(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'emotes', path: 'emotes',
@ -302,7 +306,7 @@ class AppRoutes {
context, context,
const EmotesSettings(), const EmotesSettings(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'emotes/:state_key', path: 'emotes/:state_key',
@ -310,18 +314,18 @@ class AppRoutes {
context, context,
const EmotesSettings(), const EmotesSettings(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
]; ];
List<RouteBase> get _settingsRoutes => [ static final List<RouteBase> _settingsRoutes = [
GoRoute( GoRoute(
path: 'notifications', path: 'notifications',
pageBuilder: (context, state) => defaultPageBuilder( pageBuilder: (context, state) => defaultPageBuilder(
context, context,
const SettingsNotifications(), const SettingsNotifications(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'style', path: 'style',
@ -329,7 +333,7 @@ class AppRoutes {
context, context,
const SettingsStyle(), const SettingsStyle(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'devices', path: 'devices',
@ -337,7 +341,7 @@ class AppRoutes {
context, context,
const DevicesSettings(), const DevicesSettings(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'chat', path: 'chat',
@ -354,11 +358,11 @@ class AppRoutes {
), ),
), ),
], ],
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'addaccount', path: 'addaccount',
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder( pageBuilder: (context, state) => defaultPageBuilder(
context, context,
const HomeserverPicker(), const HomeserverPicker(),
@ -370,13 +374,13 @@ class AppRoutes {
context, context,
const Login(), const Login(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
], ],
), ),
GoRoute( GoRoute(
path: 'security', path: 'security',
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
pageBuilder: (context, state) => defaultPageBuilder( pageBuilder: (context, state) => defaultPageBuilder(
context, context,
const SettingsSecurity(), const SettingsSecurity(),
@ -388,7 +392,7 @@ class AppRoutes {
context, context,
const SettingsStories(), const SettingsStories(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: 'ignorelist', path: 'ignorelist',
@ -396,7 +400,7 @@ class AppRoutes {
context, context,
const SettingsIgnoreList(), const SettingsIgnoreList(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
GoRoute( GoRoute(
path: '3pid', path: '3pid',
@ -404,13 +408,13 @@ class AppRoutes {
context, context,
const Settings3Pid(), const Settings3Pid(),
), ),
redirect: (context, state) => !isLoggedIn ? '/home' : null, redirect: loggedOutRedirect,
), ),
], ],
), ),
]; ];
Page defaultPageBuilder(BuildContext context, Widget child) => static Page defaultPageBuilder(BuildContext context, Widget child) =>
CustomTransitionPage( CustomTransitionPage(
child: child, child: child,
transitionsBuilder: (context, animation, secondaryAnimation, child) => transitionsBuilder: (context, animation, secondaryAnimation, child) =>

8
lib/widgets/fluffy_chat_app.dart
Unescape Escape View File

@ -26,6 +26,10 @@ class FluffyChatApp extends StatelessWidget {
/// in with qr code or magic link. /// in with qr code or magic link.
static bool gotInitialLink = false; static bool gotInitialLink = false;
// Router must be outside of build method so that hot reload does not reset
// the current path.
static final GoRouter router = GoRouter(routes: AppRoutes.routes);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ThemeBuilder( return ThemeBuilder(
@ -37,11 +41,11 @@ class FluffyChatApp extends StatelessWidget {
scrollBehavior: CustomScrollBehavior(), scrollBehavior: CustomScrollBehavior(),
localizationsDelegates: L10n.localizationsDelegates, localizationsDelegates: L10n.localizationsDelegates,
supportedLocales: L10n.supportedLocales, supportedLocales: L10n.supportedLocales,
routerConfig: GoRouter(routes: AppRoutes(clients).routes), routerConfig: router,
builder: (context, child) => Matrix( builder: (context, child) => Matrix(
context: context, context: context,
clients: clients, clients: clients,
child: child, child: testWidget ?? child,
), ),
), ),
); );

24
lib/widgets/layouts/side_view_layout.dart
Unescape Escape View File

@ -4,16 +4,20 @@ import 'package:fluffychat/config/themes.dart';
class SideViewLayout extends StatelessWidget { class SideViewLayout extends StatelessWidget {
final Widget mainView; final Widget mainView;
final Widget? sideView; final Widget sideView;
final bool hideSideView;
const SideViewLayout({Key? key, required this.mainView, this.sideView}) const SideViewLayout({
: super(key: key); Key? key,
required this.mainView,
required this.sideView,
required this.hideSideView,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final sideView = this.sideView; final sideView = this.sideView;
final hideSideView =
!FluffyThemes.isThreeColumnMode(context) || sideView == null;
const sideViewWidth = 360.0; const sideViewWidth = 360.0;
final threeColumnMode = FluffyThemes.isThreeColumnMode(context);
return Stack( return Stack(
children: [ children: [
AnimatedPositioned( AnimatedPositioned(
@ -22,7 +26,7 @@ class SideViewLayout extends StatelessWidget {
top: 0, top: 0,
left: 0, left: 0,
bottom: 0, bottom: 0,
right: hideSideView ? 0 : sideViewWidth, right: !threeColumnMode || hideSideView ? 0 : sideViewWidth,
child: ClipRRect(child: mainView), child: ClipRRect(child: mainView),
), ),
AnimatedPositioned( AnimatedPositioned(
@ -31,12 +35,10 @@ class SideViewLayout extends StatelessWidget {
bottom: 0, bottom: 0,
top: 0, top: 0,
right: 0, right: 0,
left: !FluffyThemes.isThreeColumnMode(context) && sideView != null left: !threeColumnMode && !hideSideView ? 0 : null,
width: hideSideView
? 0 ? 0
: null, : !threeColumnMode
width: sideView == null
? 0
: !FluffyThemes.isThreeColumnMode(context)
? null ? null
: sideViewWidth, : sideViewWidth,
child: Container( child: Container(

Write Preview
Loading…
Cancel
Save