lib/main.dart

@@ -260,7 +260,7 @@ class _AppSplashScreenState extends State<_AppSplashScreen> {
     try {
       final cfg = context.read<ConfigProvider>();
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        cfg.calcDrawerSize(context, withMediaQuery: true);
+        cfg.calcDrawerSize(context);
       });
       final home = context.read<HomeWidgetProvider>();
       await home.initialize();

lib/providers/config.dart

@@ -41,22 +41,14 @@ class ConfigProvider extends ChangeNotifier {
   bool drawerIsCollapsed = false;
   bool drawerIsExpanded = false;
 
-  void calcDrawerSize(BuildContext context, {bool withMediaQuery = false}) {
+  void calcDrawerSize(BuildContext context) {
-    bool newDrawerIsCollapsed = false;
+    final rpb = ResponsiveBreakpoints.of(context);
-    bool newDrawerIsExpanded = false;
+    final newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
-    if (withMediaQuery) {
+    final newDrawerIsExpanded = rpb.largerThan(TABLET)
-      newDrawerIsCollapsed = MediaQuery.of(context).size.width < 450;
+        ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
-      newDrawerIsExpanded = MediaQuery.of(context).size.width >= 451;
+            ? false
-    } else {
+            : true
-      final rpb = ResponsiveBreakpoints.of(context);
+        : false;
-      newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
-      newDrawerIsCollapsed = rpb.largerThan(TABLET)
-          ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
-              ? false
-              : true
-          : false;
-    }
-
     if (newDrawerIsExpanded != drawerIsExpanded || newDrawerIsCollapsed != drawerIsCollapsed) {
       drawerIsExpanded = newDrawerIsExpanded;
       drawerIsCollapsed = newDrawerIsCollapsed;

lib/router.dart

@@ -34,126 +34,68 @@ 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 = [
-  GoRoute(
+  ShellRoute(
-    path: '/',
+    builder: (context, state, child) => child,
-    name: 'home',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const HomeScreen(),
-    ),
-  ),
-  GoRoute(
-    path: '/posts',
-    name: 'explore',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const ExploreScreen(),
-    ),
     routes: [
       GoRoute(
-        path: '/write/:mode',
+        path: '/',
-        name: 'postEditor',
+        name: 'home',
-        builder: (context, state) => PostEditorScreen(
+        pageBuilder: (context, state) => NoTransitionPage(
-          mode: state.pathParameters['mode']!,
+          child: const HomeScreen(),
-          postEditId: int.tryParse(
-            state.uri.queryParameters['editing'] ?? '',
-          ),
-          postReplyId: int.tryParse(
-            state.uri.queryParameters['replying'] ?? '',
-          ),
-          postRepostId: int.tryParse(
-            state.uri.queryParameters['reposting'] ?? '',
-          ),
-          extraProps: state.extra as PostEditorExtraProps?,
         ),
       ),
       GoRoute(
-        path: '/search',
+        path: '/posts',
-        name: 'postSearch',
+        name: 'explore',
-        builder: (context, state) => PostSearchScreen(
+        pageBuilder: (context, state) => NoTransitionPage(
-          initialTags: state.uri.queryParameters['tags']?.split(','),
+          child: const ExploreScreen(),
-          initialCategories: state.uri.queryParameters['categories']?.split(','),
         ),
-      ),
+        routes: [
-      GoRoute(
+          GoRoute(
-        path: '/publishers/:name',
+            path: '/write/:mode',
-        name: 'postPublisher',
+            name: 'postEditor',
-        builder: (context, state) => PostPublisherScreen(name: state.pathParameters['name']!),
+            builder: (context, state) => PostEditorScreen(
-      ),
+              mode: state.pathParameters['mode']!,
-      GoRoute(
+              postEditId: int.tryParse(
-        path: '/:slug',
+                state.uri.queryParameters['editing'] ?? '',
-        name: 'postDetail',
+              ),
-        builder: (context, state) => PostDetailScreen(
+              postReplyId: int.tryParse(
-          slug: state.pathParameters['slug']!,
+                state.uri.queryParameters['replying'] ?? '',
-          preload: state.extra as SnPost?,
+              ),
-        ),
+              postRepostId: int.tryParse(
-      ),
+                state.uri.queryParameters['reposting'] ?? '',
-    ],
+              ),
-  ),
+              extraProps: state.extra as PostEditorExtraProps?,
-  GoRoute(
+            ),
-    path: '/account',
-    name: 'account',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const AccountScreen(),
-    ),
-  ),
-  GoRoute(
-    path: '/chat',
-    name: 'chat',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const ChatScreen(),
-    ),
-    routes: [
-      GoRoute(
-        path: '/:scope/:alias',
-        name: 'chatRoom',
-        builder: (context, state) => AppBackground(
-          child: ChatRoomScreen(
-            scope: state.pathParameters['scope']!,
-            alias: state.pathParameters['alias']!,
           ),
-        ),
+          GoRoute(
-      ),
+            path: '/search',
-      GoRoute(
+            name: 'postSearch',
-        path: '/:scope/:alias/call',
+            builder: (context, state) => PostSearchScreen(
-        name: 'chatCallRoom',
+              initialTags: state.uri.queryParameters['tags']?.split(','),
-        builder: (context, state) => AppBackground(
+              initialCategories: state.uri.queryParameters['categories']?.split(','),
-          child: CallRoomScreen(
+            ),
-            scope: state.pathParameters['scope']!,
-            alias: state.pathParameters['alias']!,
           ),
-        ),
+          GoRoute(
-      ),
+            path: '/publishers/:name',
-      GoRoute(
+            name: 'postPublisher',
-        path: '/:scope/:alias/detail',
+            builder: (context, state) => PostPublisherScreen(name: state.pathParameters['name']!),
-        name: 'channelDetail',
-        builder: (context, state) => AppBackground(
-          child: ChannelDetailScreen(
-            scope: state.pathParameters['scope']!,
-            alias: state.pathParameters['alias']!,
           ),
-        ),
+          GoRoute(
+            path: '/:slug',
+            name: 'postDetail',
+            builder: (context, state) => PostDetailScreen(
+              slug: state.pathParameters['slug']!,
+              preload: state.extra as SnPost?,
+            ),
+          ),
+        ],
       ),
       GoRoute(
-        path: '/manage',
+        path: '/account',
-        name: 'chatManage',
+        name: 'account',
         pageBuilder: (context, state) => CustomTransitionPage(
-          child: ChatManageScreen(
-            editingChannelAlias: state.uri.queryParameters['editing'],
-          ),
           transitionsBuilder: (context, animation, secondaryAnimation, child) {
             return FadeThroughTransition(
               animation: animation,
@@ -162,94 +104,176 @@ final _appRoutes = [
               child: child,
             );
           },
+          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,
+            );
+          },
+          child: const ChatScreen(),
+        ),
+        routes: [
+          GoRoute(
+            path: '/:scope/:alias',
+            name: 'chatRoom',
+            builder: (context, state) => AppBackground(
+              child: ChatRoomScreen(
+                scope: state.pathParameters['scope']!,
+                alias: state.pathParameters['alias']!,
+              ),
+            ),
+          ),
+          GoRoute(
+            path: '/:scope/:alias/call',
+            name: 'chatCallRoom',
+            builder: (context, state) => AppBackground(
+              child: CallRoomScreen(
+                scope: state.pathParameters['scope']!,
+                alias: state.pathParameters['alias']!,
+              ),
+            ),
+          ),
+          GoRoute(
+            path: '/:scope/:alias/detail',
+            name: 'channelDetail',
+            builder: (context, state) => AppBackground(
+              child: ChannelDetailScreen(
+                scope: state.pathParameters['scope']!,
+                alias: state.pathParameters['alias']!,
+              ),
+            ),
+          ),
+          GoRoute(
+            path: '/manage',
+            name: 'chatManage',
+            pageBuilder: (context, state) => CustomTransitionPage(
+              child: ChatManageScreen(
+                editingChannelAlias: state.uri.queryParameters['editing'],
+              ),
+              transitionsBuilder: (context, animation, secondaryAnimation, child) {
+                return FadeThroughTransition(
+                  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(
+          child: const RealmScreen(),
+        ),
+        routes: [
+          GoRoute(
+            path: '/manage',
+            name: 'realmManage',
+            pageBuilder: (context, state) => CustomTransitionPage(
+              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,
+                  ),
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+      GoRoute(
+        path: '/album',
+        name: 'album',
+        pageBuilder: (context, state) => NoTransitionPage(
+          child: const AlbumScreen(),
+        ),
+      ),
+      GoRoute(
+        path: '/friend',
+        name: 'friend',
+        pageBuilder: (context, state) => NoTransitionPage(
+          child: const FriendScreen(),
+        ),
+      ),
+      GoRoute(
+        path: '/notification',
+        name: 'notification',
+        pageBuilder: (context, state) => NoTransitionPage(
+          child: const NotificationScreen(),
         ),
       ),
     ],
   ),
-  GoRoute(
+  ShellRoute(
-    path: '/realm',
+    builder: (context, state, child) => child,
-    name: 'realm',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const RealmScreen(),
-    ),
     routes: [
       GoRoute(
-        path: '/:alias',
+        path: '/auth/login',
-        name: 'realmDetail',
+        name: 'authLogin',
-        builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
+        builder: (context, state) => LoginScreen(),
       ),
       GoRoute(
-        path: '/manage',
+        path: '/auth/register',
-        name: 'realmManage',
+        name: 'authRegister',
-        pageBuilder: (context, state) => CustomTransitionPage(
+        builder: (context, state) => RegisterScreen(),
-          transitionsBuilder: _fadeThroughTransition,
+      ),
-          child: RealmManageScreen(
+      GoRoute(
-            editingRealmAlias: state.uri.queryParameters['editing'],
+        path: '/reports',
-          ),
+        name: 'abuseReport',
+        builder: (context, state) => AbuseReportScreen(),
+      ),
+      GoRoute(
+        path: '/account/profile/edit',
+        name: 'accountProfileEdit',
+        builder: (context, state) => ProfileEditScreen(),
+      ),
+      GoRoute(
+        path: '/account/publishers',
+        name: 'accountPublishers',
+        builder: (context, state) => PublisherScreen(),
+      ),
+      GoRoute(
+        path: '/account/publishers/new',
+        name: 'accountPublisherNew',
+        builder: (context, state) => AccountPublisherNewScreen(),
+      ),
+      GoRoute(
+        path: '/account/publishers/edit/:name',
+        name: 'accountPublisherEdit',
+        builder: (context, state) => AccountPublisherEditScreen(
+          name: state.pathParameters['name']!,
         ),
       ),
     ],
   ),
-  GoRoute(
-    path: '/album',
-    name: 'album',
-    pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
-      child: const AlbumScreen(),
-    ),
-  ),
-  GoRoute(
-    path: '/friend',
-    name: 'friend',
-    pageBuilder: (context, state) => NoTransitionPage(
-      child: const FriendScreen(),
-    ),
-  ),
-  GoRoute(
-    path: '/notification',
-    name: 'notification',
-    pageBuilder: (context, state) => NoTransitionPage(
-      child: const NotificationScreen(),
-    ),
-  ),
-  GoRoute(
-    path: '/auth/login',
-    name: 'authLogin',
-    builder: (context, state) => LoginScreen(),
-  ),
-  GoRoute(
-    path: '/auth/register',
-    name: 'authRegister',
-    builder: (context, state) => RegisterScreen(),
-  ),
-  GoRoute(
-    path: '/reports',
-    name: 'abuseReport',
-    builder: (context, state) => AbuseReportScreen(),
-  ),
-  GoRoute(
-    path: '/account/profile/edit',
-    name: 'accountProfileEdit',
-    builder: (context, state) => ProfileEditScreen(),
-  ),
-  GoRoute(
-    path: '/account/publishers',
-    name: 'accountPublishers',
-    builder: (context, state) => PublisherScreen(),
-  ),
-  GoRoute(
-    path: '/account/publishers/new',
-    name: 'accountPublisherNew',
-    builder: (context, state) => AccountPublisherNewScreen(),
-  ),
-  GoRoute(
-    path: '/account/publishers/edit/:name',
-    name: 'accountPublisherEdit',
-    builder: (context, state) => AccountPublisherEditScreen(
-      name: state.pathParameters['name']!,
-    ),
-  ),
   GoRoute(
     path: '/account/:name',
     name: 'accountProfilePage',
@@ -257,15 +281,25 @@ final _appRoutes = [
       child: UserScreen(name: state.pathParameters['name']!),
     ),
   ),
-  GoRoute(
+  ShellRoute(
-    path: '/settings',
+    builder: (context, state, child) => child,
-    name: 'settings',
+    routes: [
-    builder: (context, state) => SettingsScreen(),
+      GoRoute(
+        path: '/settings',
+        name: 'settings',
+        builder: (context, state) => SettingsScreen(),
+      ),
+    ],
   ),
-  GoRoute(
+  ShellRoute(
-    path: '/about',
+    builder: (context, state, child) => child,
-    name: 'about',
+    routes: [
-    builder: (context, state) => AboutScreen(),
+      GoRoute(
+        path: '/about',
+        name: 'about',
+        builder: (context, state) => AboutScreen(),
+      ),
+    ],
   ),
 ];
 

lib/screens/account/profile_page.dart

@@ -19,6 +19,7 @@ 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 = {
@@ -595,7 +596,7 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM
                 subtitle: Text('@${ele.name}'),
                 trailing: const Icon(Symbols.chevron_right),
                 onTap: () {
-                  GoRouter.of(context).goNamed(
+                  GoRouter.of(context).pushNamed(
                     'postPublisher',
                     pathParameters: {'name': ele.name},
                   );

lib/widgets/link_preview.dart

@@ -7,11 +7,12 @@ import 'package:marquee/marquee.dart';
 import 'package:provider/provider.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:surface/providers/link_preview.dart';
 import 'package:surface/types/link.dart';
 import 'package:surface/widgets/universal_image.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
+import '../providers/link_preview.dart';
+
 class LinkPreviewWidget extends StatefulWidget {
   final String text;
 

lib/widgets/navigation/app_scaffold.dart

@@ -1,6 +1,7 @@
 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';
@@ -11,6 +12,7 @@ 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';