♻️ Updated nav & account page two column design

lib/providers/navigation.dart

@@ -60,11 +60,6 @@ class NavigationProvider extends ChangeNotifier {
       screen: 'chat',
       label: 'screenChat',
     ),
-    AppNavDestination(
-      icon: Icon(Symbols.account_circle, weight: 400, opticalSize: 20),
-      screen: 'account',
-      label: 'screenAccount',
-    ),
     AppNavDestination(
       icon: Icon(Symbols.group, weight: 400, opticalSize: 20),
       screen: 'realm',

lib/router.dart

@@ -127,102 +127,111 @@ final _appRoutes = [
       ),
     ],
   ),
-  GoRoute(
+  ShellRoute(
-    path: '/account',
+    builder: (context, state, child) => ResponsiveScaffold(
-    name: 'account',
+      aside: const AccountScreen(),
-    builder: (context, state) => const AccountScreen(),
+      child: child,
+    ),
     routes: [
       GoRoute(
-        path: '/punishments',
+          path: '/account',
-        name: 'accountPunishments',
+          name: 'account',
-        builder: (context, state) => const PunishmentsScreen(),
+          builder: (context, state) =>
-      ),
+              const ResponsiveScaffoldLanding(child: AccountScreen()),
-      GoRoute(
+          routes: [
-        path: '/programs',
+            GoRoute(
-        name: 'accountProgram',
+              path: '/punishments',
-        builder: (context, state) => const AccountProgramScreen(),
+              name: 'accountPunishments',
-      ),
+              builder: (context, state) => const PunishmentsScreen(),
-      GoRoute(
+            ),
-        path: '/contacts',
+            GoRoute(
-        name: 'accountContactMethods',
+              path: '/programs',
-        builder: (context, state) => const AccountContactMethod(),
+              name: 'accountProgram',
-      ),
+              builder: (context, state) => const AccountProgramScreen(),
-      GoRoute(
+            ),
-        path: '/events',
+            GoRoute(
-        name: 'accountActionEvents',
+              path: '/contacts',
-        builder: (context, state) => const ActionEventScreen(),
+              name: 'accountContactMethods',
-      ),
+              builder: (context, state) => const AccountContactMethod(),
-      GoRoute(
+            ),
-        path: '/tickets',
+            GoRoute(
-        name: 'accountAuthTickets',
+              path: '/events',
-        builder: (context, state) => const AccountAuthTicket(),
+              name: 'accountActionEvents',
-      ),
+              builder: (context, state) => const ActionEventScreen(),
-      GoRoute(
+            ),
-        path: '/badges',
+            GoRoute(
-        name: 'accountBadges',
+              path: '/tickets',
-        builder: (context, state) => const AccountBadgesScreen(),
+              name: 'accountAuthTickets',
-      ),
+              builder: (context, state) => const AccountAuthTicket(),
-      GoRoute(
+            ),
-        path: '/wallet',
+            GoRoute(
-        name: 'accountWallet',
+              path: '/badges',
-        builder: (context, state) => const WalletScreen(),
+              name: 'accountBadges',
-      ),
+              builder: (context, state) => const AccountBadgesScreen(),
-      GoRoute(
+            ),
-        path: '/keypairs',
+            GoRoute(
-        name: 'accountKeyPairs',
+              path: '/wallet',
-        builder: (context, state) => const KeyPairScreen(),
+              name: 'accountWallet',
-      ),
+              builder: (context, state) => const WalletScreen(),
-      GoRoute(
+            ),
-        path: '/settings',
+            GoRoute(
-        name: 'accountSettings',
+              path: '/keypairs',
-        builder: (context, state) => AccountSettingsScreen(),
+              name: 'accountKeyPairs',
-        routes: [
+              builder: (context, state) => const KeyPairScreen(),
-          GoRoute(
+            ),
-            path: '/notify',
+            GoRoute(
-            name: 'accountSettingsNotify',
+              path: '/settings',
-            builder: (context, state) => const AccountNotifyPrefsScreen(),
+              name: 'accountSettings',
-          ),
+              builder: (context, state) => AccountSettingsScreen(),
-          GoRoute(
+              routes: [
-            path: '/auth',
+                GoRoute(
-            name: 'accountSettingsSecurity',
+                  path: '/notify',
-            builder: (context, state) => const AccountSecurityPrefsScreen(),
+                  name: 'accountSettingsNotify',
-          ),
+                  builder: (context, state) => const AccountNotifyPrefsScreen(),
-        ],
+                ),
-      ),
+                GoRoute(
-      GoRoute(
+                  path: '/auth',
-        path: '/settings/factors',
+                  name: 'accountSettingsSecurity',
-        name: 'factorSettings',
+                  builder: (context, state) =>
-        builder: (context, state) => FactorSettingsScreen(),
+                      const AccountSecurityPrefsScreen(),
-      ),
+                ),
-      GoRoute(
+              ],
-        path: '/profile/edit',
+            ),
-        name: 'accountProfileEdit',
+            GoRoute(
-        builder: (context, state) => ProfileEditScreen(),
+              path: '/settings/factors',
-      ),
+              name: 'factorSettings',
-      GoRoute(
+              builder: (context, state) => FactorSettingsScreen(),
-        path: '/publishers',
+            ),
-        name: 'accountPublishers',
+            GoRoute(
-        builder: (context, state) => PublisherScreen(),
+              path: '/profile/edit',
-      ),
+              name: 'accountProfileEdit',
-      GoRoute(
+              builder: (context, state) => ProfileEditScreen(),
-        path: '/publishers/new',
+            ),
-        name: 'accountPublisherNew',
+            GoRoute(
-        builder: (context, state) => AccountPublisherNewScreen(),
+              path: '/publishers',
-      ),
+              name: 'accountPublishers',
-      GoRoute(
+              builder: (context, state) => PublisherScreen(),
-        path: '/publishers/edit/:name',
+            ),
-        name: 'accountPublisherEdit',
+            GoRoute(
-        builder: (context, state) => AccountPublisherEditScreen(
+              path: '/publishers/new',
-          name: state.pathParameters['name']!,
+              name: 'accountPublisherNew',
-        ),
+              builder: (context, state) => AccountPublisherNewScreen(),
-      ),
+            ),
-      GoRoute(
+            GoRoute(
-        path: '/profile/:name',
+              path: '/publishers/edit/:name',
-        name: 'accountProfilePage',
+              name: 'accountPublisherEdit',
-        pageBuilder: (context, state) => NoTransitionPage(
+              builder: (context, state) => AccountPublisherEditScreen(
-          child: UserScreen(name: state.pathParameters['name']!),
+                name: state.pathParameters['name']!,
-        ),
+              ),
-      ),
+            ),
+            GoRoute(
+              path: '/profile/:name',
+              name: 'accountProfilePage',
+              pageBuilder: (context, state) => NoTransitionPage(
+                child: UserScreen(name: state.pathParameters['name']!),
+              ),
+            ),
+          ]),
     ],
   ),
   GoRoute(

lib/screens/account.dart

@@ -141,15 +141,6 @@ class AccountScreen extends StatelessWidget {
                 ],
               )
             : null,
-        actions: [
-          IconButton(
-            icon: const Icon(Symbols.settings, fill: 1),
-            onPressed: () {
-              GoRouter.of(context).pushNamed('settings');
-            },
-          ),
-          const Gap(8),
-        ],
       ),
       body: SingleChildScrollView(
         child: ua.isAuthorized

lib/widgets/navigation/app_rail_navigation.dart

@@ -1,10 +1,12 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
-import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/navigation.dart';
+import 'package:surface/providers/userinfo.dart';
+import 'package:surface/widgets/account/account_image.dart';
 
 class AppRailNavigation extends StatefulWidget {
   const AppRailNavigation({super.key});
@@ -18,43 +20,59 @@ class _AppRailNavigationState extends State<AppRailNavigation> {
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      context.read<NavigationProvider>().autoDetectIndex(GoRouter.maybeOf(context));
+      context
+          .read<NavigationProvider>()
+          .autoDetectIndex(GoRouter.maybeOf(context));
     });
   }
 
   @override
   Widget build(BuildContext context) {
+    final ua = context.watch<UserProvider>();
     final nav = context.watch<NavigationProvider>();
 
     return ListenableBuilder(
       listenable: nav,
       builder: (context, _) {
-        final destinations = nav.destinations.where((ele) => ele.isPinned).toList();
+        final destinations = nav.destinations.toList();
 
         return SizedBox(
           width: 80,
           child: NavigationRail(
-            selectedIndex:
+            labelType: NavigationRailLabelType.selected,
-                nav.currentIndex != null && nav.currentIndex! < nav.pinnedDestinationCount ? nav.currentIndex : null,
+            backgroundColor: Theme.of(context)
+                .colorScheme
+                .surfaceContainerLow
+                .withOpacity(0.5),
+            selectedIndex: nav.currentIndex != null &&
+                    nav.currentIndex! < nav.destinations.length
+                ? nav.currentIndex
+                : null,
             destinations: [
-              ...destinations.where((ele) => ele.isPinned).map((ele) {
+              ...destinations.map((ele) {
                 return NavigationRailDestination(
                   icon: ele.icon,
                   label: Text(ele.label).tr(),
                 );
               }),
             ],
+            leading: const Gap(4),
             trailing: Expanded(
               child: Align(
                 alignment: Alignment.bottomCenter,
-                child: StyledWidget(
+                child: Padding(
-                  IconButton(
+                  padding: EdgeInsets.only(bottom: 24),
-                    icon: const Icon(Symbols.menu),
+                  child: GestureDetector(
-                    onPressed: () {
+                    child: AccountImage(
-                      Scaffold.of(context).openDrawer();
+                      content: ua.user?.avatar,
+                      fallbackWidget:
+                          ua.isAuthorized ? null : const Icon(Symbols.login),
+                    ),
+                    onTap: () {
+                      GoRouter.of(context).goNamed('account');
                     },
                   ),
-                ).padding(bottom: 16),
+                ),
               ),
             ),
             onDestinationSelected: (idx) {

lib/widgets/navigation/app_scaffold.dart

@@ -13,7 +13,6 @@ import 'package:surface/providers/navigation.dart';
 import 'package:surface/widgets/connection_indicator.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';
 import 'package:surface/widgets/navigation/app_rail_navigation.dart';
 import 'package:surface/widgets/notify_indicator.dart';
 
@@ -111,7 +110,6 @@ class AppRootScaffold extends StatelessWidget {
     final devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
 
     final isCollapseDrawer = cfg.drawerIsCollapsed;
-    final isExpandedDrawer = cfg.drawerIsExpanded;
 
     final routeName = GoRouter.of(context)
         .routerDelegate
@@ -132,19 +130,7 @@ class AppRootScaffold extends StatelessWidget {
         ? body
         : Row(
             children: [
-              Container(
+              AppRailNavigation(),
-                decoration: BoxDecoration(
-                  border: Border(
-                    right: BorderSide(
-                      color: Theme.of(context).dividerColor,
-                      width: 1 / devicePixelRatio,
-                    ),
-                  ),
-                ),
-                child: isExpandedDrawer
-                    ? AppNavigationDrawer(elevation: 0)
-                    : AppRailNavigation(),
-              ),
               Expanded(child: body),
             ],
           );
@@ -232,10 +218,57 @@ class AppRootScaffold extends StatelessWidget {
             ),
         ],
       ),
-      drawer: !isExpandedDrawer ? AppNavigationDrawer() : null,
       drawerEdgeDragWidth: isPopable ? 0 : null,
       bottomNavigationBar:
           isShowBottomNavigation ? AppBottomNavigationBar() : null,
     );
   }
 }
+
+class ResponsiveScaffold extends StatelessWidget {
+  final Widget aside;
+  final Widget? child;
+  const ResponsiveScaffold(
+      {super.key, required this.aside, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    if (ResponsiveBreakpoints.of(context).largerOrEqualTo(TABLET)) {
+      return Row(
+        children: [
+          Flexible(
+            flex: 1,
+            child: aside,
+          ),
+          VerticalDivider(width: 1),
+          if (child != null && child != aside)
+            Flexible(flex: 2, child: child!)
+          else
+            const Flexible(
+              flex: 2,
+              child: ResponsiveScaffoldLanding(child: null),
+            ),
+        ],
+      );
+    }
+
+    return child ?? aside;
+  }
+}
+
+class ResponsiveScaffoldLanding extends StatelessWidget {
+  final Widget? child;
+  const ResponsiveScaffoldLanding({super.key, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    if (ResponsiveBreakpoints.of(context).largerOrEqualTo(TABLET) ||
+        child == null) {
+      return AppScaffold(
+        appBar: AppBar(),
+        body: const SizedBox.shrink(),
+      );
+    }
+    return child!;
+  }
+}