neon,neon_news,neon_notes: Migrate to router

packages/neon/neon/lib/neon.dart

@@ -66,6 +66,7 @@ part 'src/platform/abstract.dart';
 part 'src/platform/android.dart';
 part 'src/platform/linux.dart';
 part 'src/platform/platform.dart';
+part 'src/router.dart';
 part 'src/utils/account_options.dart';
 part 'src/utils/app_implementation.dart';
 part 'src/utils/bloc.dart';

packages/neon/neon/lib/src/app.dart

@@ -25,7 +25,15 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
   late NeonPlatform _platform;
   late GlobalOptions _globalOptions;
   late AccountsBloc _accountsBloc;
-  final _globalPopups = const GlobalPopups();
+  late final _routerDelegate = AppRouter(
+    navigatorKey: _navigatorKey,
+    accountsBloc: _accountsBloc,
+    onThemeChanged: (final nextcloudTheme) {
+      setState(() {
+        _nextcloudTheme = nextcloudTheme;
+      });
+    },
+  );
 
   NextcloudCoreServerCapabilities_Ocs_Data_Capabilities_Theming? _nextcloudTheme;
   final _platformBrightness = BehaviorSubject<Brightness>.seeded(WidgetsBinding.instance.window.platformBrightness);
@@ -55,50 +63,6 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
     }
 
     WidgetsBinding.instance.addPostFrameCallback((final _) async {
-      widget.accountsBloc.activeAccount.listen((final activeAccount) async {
-        FlutterNativeSplash.remove();
-
-        if (activeAccount == null) {
-          await _navigatorKey.currentState!.pushAndRemoveUntil(
-            MaterialPageRoute(
-              builder: (final context) => const LoginPage(),
-            ),
-            (final _) => false,
-          );
-        } else {
-          const settings = RouteSettings(
-            name: 'home',
-          );
-          Widget builder(final context) => Scaffold(
-                resizeToAvoidBottomInset: false,
-                body: Stack(
-                  children: [
-                    _globalPopups,
-                    HomePage(
-                      account: activeAccount,
-                      onThemeChanged: (final nextcloudTheme) {
-                        setState(() {
-                          _nextcloudTheme = nextcloudTheme;
-                        });
-                      },
-                    ),
-                  ],
-                ),
-              );
-          await _navigatorKey.currentState!.pushAndRemoveUntil(
-            widget.globalOptions.navigationMode.value == NavigationMode.drawer
-                ? MaterialPageRoute(
-                    settings: settings,
-                    builder: builder,
-                  )
-                : _NoAnimationPageRoute(
-                    settings: settings,
-                    builder: builder,
-                  ),
-            (final _) => false,
-          );
-        }
-      });
       final localizations = await appLocalizationsFromSystem();
 
       if (!mounted) {
@@ -310,14 +274,17 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
             option: widget.globalOptions.themeOLEDAsDark,
             builder: (final context, final themeOLEDAsDark) => OptionBuilder(
               option: widget.globalOptions.themeKeepOriginalAccentColor,
-              builder: (final context, final themeKeepOriginalAccentColor) {
+              builder: (final context, final themeKeepOriginalAccentColor) => StreamBuilder<Account?>(
+                stream: widget.accountsBloc.activeAccount,
+                builder: (final context, final activeAccountSnapshot) {
                   if (themeMode == null || !platformBrightnessSnapshot.hasData || themeOLEDAsDark == null) {
                     return Container();
                   }
-                return MaterialApp(
+
+                  FlutterNativeSplash.remove();
+                  return MaterialApp.router(
                     localizationsDelegates: AppLocalizations.localizationsDelegates,
                     supportedLocales: AppLocalizations.supportedLocales,
-                  navigatorKey: _navigatorKey,
                     theme: getThemeFromNextcloudTheme(
                       _nextcloudTheme,
                       themeMode,
@@ -325,21 +292,12 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
                       oledAsDark: themeOLEDAsDark,
                       keepOriginalAccentColor: _nextcloudTheme == null || (themeKeepOriginalAccentColor ?? false),
                     ),
-                  home: Container(),
+                    routerDelegate: _routerDelegate,
                   );
                 },
               ),
             ),
           ),
+        ),
       );
 }
-
-class _NoAnimationPageRoute extends MaterialPageRoute {
-  _NoAnimationPageRoute({
-    required super.builder,
-    super.settings,
-  });
-
-  @override
-  Duration get transitionDuration => Duration.zero;
-}

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

@@ -202,15 +202,15 @@ class _HomePageState extends State<HomePage> {
                 ) =>
                     OptionBuilder<NavigationMode>(
                   option: _globalOptions.navigationMode,
-                  builder: (final context, final navigationMode) => WillPopScope(
-                    onWillPop: () async {
+                  builder: (final context, final navigationMode) => BackButtonListener(
+                    onBackButtonPressed: () async {
                       if (_scaffoldKey.currentState!.isDrawerOpen) {
                         Navigator.pop(context);
-                        return true;
+                        return false;
                       }
 
                       _scaffoldKey.currentState!.openDrawer();
-                      return false;
+                      return true;
                     },
                     child: Builder(
                       builder: (final context) {

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

@@ -90,18 +90,18 @@ class _LoginPageState extends State<LoginPage> {
   @override
   Widget build(final BuildContext context) => StreamBuilder<List<Account>>(
         stream: _accountsBloc.accounts,
-        builder: (final context, final accountsSnapshot) => WillPopScope(
-          onWillPop: () async {
+        builder: (final context, final accountsSnapshot) => BackButtonListener(
+          onBackButtonPressed: () async {
             if (accountsSnapshot.data?.isNotEmpty ?? false) {
-              return true;
+              return false;
             }
 
             if ((await _loginBloc.serverURL.first) == null) {
-              return true;
+              return false;
             }
 
             _loginBloc.setServerURL(null);
-            return false;
+            return true;
           },
           child: StreamBuilder<String?>(
             stream: _loginBloc.serverURL,

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

@@ -0,0 +1,51 @@
+part of '../neon.dart';
+
+// ignore: prefer_mixin
+class AppRouter extends RouterDelegate<Account> with ChangeNotifier, PopNavigatorRouterDelegateMixin<Account> {
+  AppRouter({
+    required this.navigatorKey,
+    required this.accountsBloc,
+    required this.onThemeChanged,
+  });
+
+  final AccountsBloc accountsBloc;
+  final Function(NextcloudTheme? theme) onThemeChanged;
+  final _globalPopups = const GlobalPopups();
+
+  @override
+  final GlobalKey<NavigatorState> navigatorKey;
+
+  @override
+  Future setNewRoutePath(final Account? configuration) async {}
+
+  @override
+  Account? get currentConfiguration => accountsBloc.activeAccount.valueOrNull;
+
+  @override
+  Widget build(final BuildContext context) => Navigator(
+        key: navigatorKey,
+        onPopPage: (final route, final result) => route.didPop(result),
+        pages: [
+          if (currentConfiguration == null) ...[
+            const MaterialPage(
+              child: LoginPage(),
+            ),
+          ] else ...[
+            MaterialPage(
+              child: Scaffold(
+                resizeToAvoidBottomInset: false,
+                body: Stack(
+                  children: [
+                    _globalPopups,
+                    HomePage(
+                      account: currentConfiguration!,
+                      onThemeChanged: onThemeChanged,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ],
+      );
+}

packages/neon/neon_news/lib/pages/article.dart

@@ -81,17 +81,17 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
   }
 
   @override
-  Widget build(final BuildContext context) => WillPopScope(
-        onWillPop: () async {
+  Widget build(final BuildContext context) => BackButtonListener(
+        onBackButtonPressed: () async {
           if (_webviewController != null && await _webviewController!.canGoBack()) {
             await _webviewController!.goBack();
-            return false;
+            return true;
           }
 
           if (mounted && Provider.of<NeonPlatform>(context, listen: false).canUseWakelock) {
             await Wakelock.disable();
           }
-          return true;
+          return false;
         },
         child: Scaffold(
           resizeToAvoidBottomInset: false,

packages/neon/neon_notes/lib/pages/note.dart

@@ -63,12 +63,12 @@ class _NotesNotePageState extends State<NotesNotePage> {
   }
 
   @override
-  Widget build(final BuildContext context) => WillPopScope(
-        onWillPop: () async {
+  Widget build(final BuildContext context) => BackButtonListener(
+        onBackButtonPressed: () async {
           if (Provider.of<NeonPlatform>(context, listen: false).canUseWakelock) {
             await Wakelock.disable();
           }
-          return true;
+          return false;
         },
         child: Scaffold(
           resizeToAvoidBottomInset: true,