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;
-    bool newDrawerIsExpanded = false;
-    if (withMediaQuery) {
-      newDrawerIsCollapsed = MediaQuery.of(context).size.width < 450;
-      newDrawerIsExpanded = MediaQuery.of(context).size.width >= 451;
-    } else {
     final rpb = ResponsiveBreakpoints.of(context);
-      newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
+    final newDrawerIsCollapsed = rpb.smallerOrEqualTo(MOBILE);
-      newDrawerIsCollapsed = rpb.largerThan(TABLET)
+    final newDrawerIsExpanded = rpb.largerThan(TABLET)
         ? (prefs.getBool(kAppDrawerPreferCollapse) ?? false)
             ? false
             : true
         : false;
-    }
-
     if (newDrawerIsExpanded != drawerIsExpanded || newDrawerIsCollapsed != drawerIsCollapsed) {
       drawerIsExpanded = newDrawerIsExpanded;
       drawerIsCollapsed = newDrawerIsCollapsed;

lib/router.dart

@@ -34,30 +34,21 @@ 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) => CustomTransitionPage(
+        pageBuilder: (context, state) => NoTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
           child: const HomeScreen(),
         ),
       ),
       GoRoute(
         path: '/posts',
         name: 'explore',
-    pageBuilder: (context, state) => CustomTransitionPage(
+        pageBuilder: (context, state) => NoTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
           child: const ExploreScreen(),
         ),
         routes: [
@@ -105,15 +96,30 @@ final _appRoutes = [
         path: '/account',
         name: 'account',
         pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
+          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+            return FadeThroughTransition(
+              animation: animation,
+              secondaryAnimation: secondaryAnimation,
+              fillColor: Colors.transparent,
+              child: child,
+            );
+          },
           child: const AccountScreen(),
         ),
+        routes: [],
       ),
       GoRoute(
         path: '/chat',
         name: 'chat',
         pageBuilder: (context, state) => CustomTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
+          transitionsBuilder: (context, animation, secondaryAnimation, child) {
+            return FadeThroughTransition(
+              animation: animation,
+              secondaryAnimation: secondaryAnimation,
+              fillColor: Colors.transparent,
+              child: child,
+            );
+          },
           child: const ChatScreen(),
         ),
         routes: [
@@ -159,34 +165,46 @@ 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) => CustomTransitionPage(
+        pageBuilder: (context, state) => NoTransitionPage(
-      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,
+                  ),
+                );
+              },
             ),
           ),
         ],
@@ -194,8 +212,7 @@ final _appRoutes = [
       GoRoute(
         path: '/album',
         name: 'album',
-    pageBuilder: (context, state) => CustomTransitionPage(
+        pageBuilder: (context, state) => NoTransitionPage(
-      transitionsBuilder: _fadeThroughTransition,
           child: const AlbumScreen(),
         ),
       ),
@@ -213,6 +230,11 @@ final _appRoutes = [
           child: const NotificationScreen(),
         ),
       ),
+    ],
+  ),
+  ShellRoute(
+    builder: (context, state, child) => child,
+    routes: [
       GoRoute(
         path: '/auth/login',
         name: 'authLogin',
@@ -250,6 +272,8 @@ final _appRoutes = [
           name: state.pathParameters['name']!,
         ),
       ),
+    ],
+  ),
   GoRoute(
     path: '/account/:name',
     name: 'accountProfilePage',
@@ -257,16 +281,26 @@ 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(

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';