neon: use go_router for all pages

packages/neon/neon/lib/src/pages/account_settings.dart

@@ -29,8 +29,6 @@ class AccountSettingsPage extends StatelessWidget {
                   AppLocalizations.of(context).accountOptionsRemoveConfirm(account.client.humanReadableID),
                 )) {
                   bloc.removeAccount(account);
-                  // ignore: use_build_context_synchronously
-                  Navigator.of(context).pop();
                 }
               },
               tooltip: AppLocalizations.of(context).accountOptionsRemove,

packages/neon/neon/lib/src/pages/home.dart

@@ -127,14 +127,6 @@ class _HomePageState extends State<HomePage> {
     );
   }
 
-  Future _openSettings() async {
-    await Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (final context) => const SettingsPage(),
-      ),
-    );
-  }
-
   Future _openNotifications(
     final NotificationsAppInterface app,
     final List<Account> accounts,
@@ -208,7 +200,8 @@ class _HomePageState extends State<HomePage> {
                           final account = accounts.find(_account.id)!;
 
                           final isQuickBar = navigationMode == NavigationMode.quickBar;
-                          final drawer = Drawer(
+                          final drawer = Builder(
+                            builder: (final context) => Drawer(
                               width: isQuickBar ? kQuickBarWidth : null,
                               child: Container(
                                 padding: isQuickBar ? const EdgeInsets.all(5) : null,
@@ -270,15 +263,18 @@ class _HomePageState extends State<HomePage> {
                                                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                                       children: [
                                                         if (capabilities.data != null) ...[
-                                                        if (capabilities.data!.capabilities.theming?.name != null) ...[
+                                                          if (capabilities.data!.capabilities.theming?.name !=
+                                                              null) ...[
                                                             Text(
                                                               capabilities.data!.capabilities.theming!.name!,
                                                               style: DefaultTextStyle.of(context).style.copyWith(
-                                                                  color: Theme.of(context).appBarTheme.foregroundColor,
+                                                                    color:
+                                                                        Theme.of(context).appBarTheme.foregroundColor,
                                                                   ),
                                                             ),
                                                           ],
-                                                        if (capabilities.data!.capabilities.theming?.logo != null) ...[
+                                                          if (capabilities.data!.capabilities.theming?.logo !=
+                                                              null) ...[
                                                             Flexible(
                                                               child: NeonCachedUrlImage(
                                                                 url: capabilities.data!.capabilities.theming!.logo!,
@@ -309,8 +305,9 @@ class _HomePageState extends State<HomePage> {
                                                                       child: NeonAccountTile(
                                                                         account: account,
                                                                         dense: true,
-                                                                      textColor:
+                                                                        textColor: Theme.of(context)
-                                                                          Theme.of(context).appBarTheme.foregroundColor,
+                                                                            .appBarTheme
+                                                                            .foregroundColor,
                                                                       ),
                                                                     ),
                                                                   )
@@ -380,13 +377,11 @@ class _HomePageState extends State<HomePage> {
                                                       minLeadingWidth: 0,
                                                       onTap: () async {
                                                         await _appsBloc.setActiveApp(appImplementation.id);
-                                                      if (navigationMode == NavigationMode.drawer) {
+
-                                                        // Don't pop when the drawer is always shown
                                                         if (!mounted) {
                                                           return;
                                                         }
-                                                        Navigator.of(context).pop();
+                                                        Scaffold.maybeOf(context)?.closeDrawer();
-                                                      }
                                                       },
                                                     );
                                                   },
@@ -399,7 +394,7 @@ class _HomePageState extends State<HomePage> {
                                     ),
                                     if (isQuickBar) ...[
                                       IconButton(
-                                      onPressed: _openSettings,
+                                        onPressed: () => const SettingsRoute().go(context),
                                         tooltip: AppLocalizations.of(context).settings,
                                         icon: Icon(
                                           Icons.settings,
@@ -413,16 +408,15 @@ class _HomePageState extends State<HomePage> {
                                         leading: const Icon(Icons.settings),
                                         minLeadingWidth: 0,
                                         onTap: () async {
-                                        if (navigationMode == NavigationMode.drawer) {
+                                          Scaffold.maybeOf(context)?.closeDrawer();
-                                          Navigator.of(context).pop();
+                                          const SettingsRoute().go(context);
-                                        }
-                                        await _openSettings();
                                         },
                                       ),
                                     ],
                                   ],
                                 ),
                               ),
+                            ),
                           );
 
                           return Row(
@@ -524,15 +518,8 @@ class _HomePageState extends State<HomePage> {
                                         ),
                                       ],
                                       IconButton(
-                                        onPressed: () async {
+                                        onPressed: () {
-                                          await Navigator.of(context).push(
+                                          AccountSettingsRoute(accountid: account.id).go(context);
-                                            MaterialPageRoute(
-                                              builder: (final context) => AccountSettingsPage(
-                                                bloc: _accountsBloc,
-                                                account: account,
-                                              ),
-                                            ),
-                                          );
                                         },
                                         tooltip: AppLocalizations.of(context).settingsAccount,
                                         icon: IntrinsicWidth(

packages/neon/neon/lib/src/pages/login.dart

@@ -73,7 +73,6 @@ class _LoginPageState extends State<LoginPage> {
 
           if (widget.serverURL != null) {
             _accountsBloc.updateAccount(account);
-            Navigator.of(context).pop();
           } else {
             final existingAccount = _accountsBloc.accounts.value.find(account.id);
             if (existingAccount != null) {

packages/neon/neon/lib/src/pages/settings.dart

@@ -80,14 +80,8 @@ class _SettingsPageState extends State<SettingsPage> {
                           CustomSettingsTile(
                             leading: appImplementation.buildIcon(context),
                             title: Text(appImplementation.name(context)),
-                            onTap: () async {
+                            onTap: () {
-                              await Navigator.of(context).push(
+                              NextcloudAppSettingsRoute(appid: appImplementation.id).go(context);
-                                MaterialPageRoute(
-                                  builder: (final context) => NextcloudAppSettingsPage(
-                                    appImplementation: appImplementation,
-                                  ),
-                                ),
-                              );
                             },
                           ),
                         ],
@@ -181,26 +175,15 @@ class _SettingsPageState extends State<SettingsPage> {
                         for (final account in accountsSnapshot.data!) ...[
                           NeonAccountSettingsTile(
                             account: account,
-                            onTap: () async {
+                            onTap: () {
-                              await Navigator.of(context).push(
+                              AccountSettingsRoute(accountid: account.id).go(context);
-                                MaterialPageRoute(
-                                  builder: (final context) => AccountSettingsPage(
-                                    bloc: accountsBloc,
-                                    account: account,
-                                  ),
-                                ),
-                              );
                             },
                           ),
                         ],
                         CustomSettingsTile(
                           title: ElevatedButton.icon(
-                            onPressed: () async {
+                            onPressed: () {
-                              await Navigator.of(context).push(
+                              const LoginRoute().go(context);
-                                MaterialPageRoute(
-                                  builder: (final context) => const LoginPage(),
-                                ),
-                              );
                             },
                             icon: const Icon(MdiIcons.accountPlus),
                             label: Text(AppLocalizations.of(context).globalOptionsAccountsAdd),

packages/neon/neon/lib/src/router.dart

@@ -31,23 +31,45 @@ class AppRouter extends GoRouter {
         );
 }
 
-@TypedGoRoute<LoginRoute>(
-  path: '/login',
-  name: 'login',
-)
 @immutable
-class LoginRoute extends GoRouteData {
+class AccountSettingsRoute extends GoRouteData {
-  const LoginRoute({this.server});
+  const AccountSettingsRoute({
+    required this.accountid,
+  });
 
-  final String? server;
+  final String accountid;
 
   @override
-  Widget build(final BuildContext context, final GoRouterState state) => LoginPage(serverURL: server);
+  Widget build(final BuildContext context, final GoRouterState state) {
+    final bloc = Provider.of<AccountsBloc>(context, listen: false);
+    final account = bloc.accounts.value.find(accountid)!;
+
+    return AccountSettingsPage(
+      bloc: bloc,
+      account: account,
+    );
+  }
 }
 
 @TypedGoRoute<HomeRoute>(
   path: '/',
   name: 'home',
+  routes: [
+    TypedGoRoute<SettingsRoute>(
+      path: 'settings',
+      name: 'Settings',
+      routes: [
+        TypedGoRoute<NextcloudAppSettingsRoute>(
+          path: ':appid',
+          name: 'NextcloudAppSettings',
+        ),
+        TypedGoRoute<AccountSettingsRoute>(
+          path: 'account/:accountid',
+          name: 'AccountSettings',
+        ),
+      ],
+    )
+  ],
 )
 @immutable
 class HomeRoute extends GoRouteData {
@@ -61,3 +83,42 @@ class HomeRoute extends GoRouteData {
     return HomePage(key: Key(account.id));
   }
 }
+
+@TypedGoRoute<LoginRoute>(
+  path: '/login',
+  name: 'login',
+)
+@immutable
+class LoginRoute extends GoRouteData {
+  const LoginRoute({this.server});
+
+  final String? server;
+
+  @override
+  Widget build(final BuildContext context, final GoRouterState state) => LoginPage(serverURL: server);
+}
+
+@immutable
+class NextcloudAppSettingsRoute extends GoRouteData {
+  const NextcloudAppSettingsRoute({
+    required this.appid,
+  });
+
+  final String appid;
+
+  @override
+  Widget build(final BuildContext context, final GoRouterState state) {
+    final appImplementations = Provider.of<List<AppImplementation>>(context, listen: false);
+    final appImplementation = appImplementations.firstWhere((final app) => app.id == appid);
+
+    return NextcloudAppSettingsPage(appImplementation: appImplementation);
+  }
+}
+
+@immutable
+class SettingsRoute extends GoRouteData {
+  const SettingsRoute();
+
+  @override
+  Widget build(final BuildContext context, final GoRouterState state) => const SettingsPage();
+}

packages/neon/neon/lib/src/router.g.dart

@@ -7,26 +7,54 @@ part of 'router.dart';
 // **************************************************************************
 
 List<RouteBase> get $appRoutes => [
-      $loginRoute,
       $homeRoute,
+      $loginRoute,
     ];
 
-RouteBase get $loginRoute => GoRouteData.$route(
+RouteBase get $homeRoute => GoRouteData.$route(
-      path: '/login',
+      path: '/',
-      name: 'login',
+      name: 'home',
-      factory: $LoginRouteExtension._fromState,
+      factory: $HomeRouteExtension._fromState,
+      routes: [
+        GoRouteData.$route(
+          path: 'settings',
+          name: 'Settings',
+          factory: $SettingsRouteExtension._fromState,
+          routes: [
+            GoRouteData.$route(
+              path: ':appid',
+              name: 'NextcloudAppSettings',
+              factory: $NextcloudAppSettingsRouteExtension._fromState,
+            ),
+            GoRouteData.$route(
+              path: 'account/:accountid',
+              name: 'AccountSettings',
+              factory: $AccountSettingsRouteExtension._fromState,
+            ),
+          ],
+        ),
+      ],
     );
 
-extension $LoginRouteExtension on LoginRoute {
+extension $HomeRouteExtension on HomeRoute {
-  static LoginRoute _fromState(GoRouterState state) => LoginRoute(
+  static HomeRoute _fromState(GoRouterState state) => const HomeRoute();
-        server: state.queryParameters['server'],
+
+  String get location => GoRouteData.$location(
+        '/',
       );
 
+  void go(BuildContext context) => context.go(location);
+
+  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
+
+  void pushReplacement(BuildContext context) => context.pushReplacement(location);
+}
+
+extension $SettingsRouteExtension on SettingsRoute {
+  static SettingsRoute _fromState(GoRouterState state) => const SettingsRoute();
+
   String get location => GoRouteData.$location(
-        '/login',
+        '/settings',
-        queryParams: {
-          if (server != null) 'server': server,
-        },
       );
 
   void go(BuildContext context) => context.go(location);
@@ -36,17 +64,54 @@ extension $LoginRouteExtension on LoginRoute {
   void pushReplacement(BuildContext context) => context.pushReplacement(location);
 }
 
-RouteBase get $homeRoute => GoRouteData.$route(
+extension $NextcloudAppSettingsRouteExtension on NextcloudAppSettingsRoute {
-      path: '/',
+  static NextcloudAppSettingsRoute _fromState(GoRouterState state) => NextcloudAppSettingsRoute(
-      name: 'home',
+        appid: state.pathParameters['appid']!,
-      factory: $HomeRouteExtension._fromState,
       );
 
-extension $HomeRouteExtension on HomeRoute {
+  String get location => GoRouteData.$location(
-  static HomeRoute _fromState(GoRouterState state) => const HomeRoute();
+        '/settings/${Uri.encodeComponent(appid)}',
+      );
+
+  void go(BuildContext context) => context.go(location);
+
+  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
+
+  void pushReplacement(BuildContext context) => context.pushReplacement(location);
+}
+
+extension $AccountSettingsRouteExtension on AccountSettingsRoute {
+  static AccountSettingsRoute _fromState(GoRouterState state) => AccountSettingsRoute(
+        accountid: state.pathParameters['accountid']!,
+      );
 
   String get location => GoRouteData.$location(
-        '/',
+        '/settings/account/${Uri.encodeComponent(accountid)}',
+      );
+
+  void go(BuildContext context) => context.go(location);
+
+  Future<T?> push<T>(BuildContext context) => context.push<T>(location);
+
+  void pushReplacement(BuildContext context) => context.pushReplacement(location);
+}
+
+RouteBase get $loginRoute => GoRouteData.$route(
+      path: '/login',
+      name: 'login',
+      factory: $LoginRouteExtension._fromState,
+    );
+
+extension $LoginRouteExtension on LoginRoute {
+  static LoginRoute _fromState(GoRouterState state) => LoginRoute(
+        server: state.queryParameters['server'],
+      );
+
+  String get location => GoRouteData.$location(
+        '/login',
+        queryParams: {
+          if (server != null) 'server': server,
+        },
       );
 
   void go(BuildContext context) => context.go(location);

packages/neon/neon/lib/src/utils/global_popups.dart

@@ -27,12 +27,8 @@ class GlobalPopups {
             content: Text(AppLocalizations.of(context).firstLaunchGoToSettingsToEnablePushNotifications),
             action: SnackBarAction(
               label: AppLocalizations.of(context).settings,
-              onPressed: () async {
+              onPressed: () {
-                await Navigator.of(context).push(
+                const SettingsRoute().go(context);
-                  MaterialPageRoute(
-                    builder: (final context) => const SettingsPage(),
-                  ),
-                );
               },
             ),
           ),