Change router for different screen size

lib/core/router/app_router.dart

@@ -1,7 +1,8 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/prefs/prefs.dart';
-import 'package:hiddify/core/router/routes/routes.dart';
+import 'package:hiddify/core/router/routes.dart';
 import 'package:hiddify/services/deep_link_service.dart';
 import 'package:hiddify/utils/utils.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -9,6 +10,12 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 
 part 'app_router.g.dart';
 
+bool _debugMobileRouter = false;
+
+final useMobileRouter =
+    !PlatformUtils.isDesktop || (kDebugMode && _debugMobileRouter);
+final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>();
+
 // TODO: test and improve handling of deep link
 @riverpod
 GoRouter router(RouterRef ref) {
@@ -31,7 +38,7 @@ GoRouter router(RouterRef ref) {
     navigatorKey: rootNavigatorKey,
     initialLocation: initialLocation,
     debugLogDiagnostics: true,
-    routes: $routes,
+    routes: useMobileRouter ? mobileRoutes : desktopRoutes,
     refreshListenable: notifier,
     redirect: notifier.redirect,
     observers: [

lib/core/router/router.dart

@@ -1,2 +1,2 @@
 export 'app_router.dart';
-export 'routes/routes.dart';
+export 'routes.dart';

lib/core/router/routes.dart

@@ -0,0 +1,16 @@
+import 'package:hiddify/core/router/routes/desktop_routes.dart' as desktop;
+import 'package:hiddify/core/router/routes/mobile_routes.dart' as mobile;
+import 'package:hiddify/core/router/routes/shared_routes.dart' as shared;
+
+export 'routes/mobile_routes.dart';
+export 'routes/shared_routes.dart' hide $appRoutes;
+
+final mobileRoutes = [
+  ...shared.$appRoutes,
+  ...mobile.$appRoutes,
+];
+
+final desktopRoutes = [
+  ...shared.$appRoutes,
+  ...desktop.$appRoutes,
+];

lib/core/router/routes/desktop_routes.dart

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hiddify/core/router/routes/shared_routes.dart';
 import 'package:hiddify/features/about/view/view.dart';
+import 'package:hiddify/features/common/adaptive_root_scaffold.dart';
 import 'package:hiddify/features/logs/view/view.dart';
 import 'package:hiddify/features/settings/view/view.dart';
-import 'package:hiddify/features/wrapper/wrapper.dart';
 
 part 'desktop_routes.g.dart';
 
@@ -61,7 +61,7 @@ class DesktopWrapperRoute extends ShellRouteData {
 
   @override
   Widget builder(BuildContext context, GoRouterState state, Widget navigator) {
-    return DesktopWrapper(navigator);
+    return AdaptiveRootScaffold(navigator);
   }
 }
 

lib/core/router/routes/mobile_routes.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:hiddify/core/router/app_router.dart';
 import 'package:hiddify/core/router/routes/shared_routes.dart';
 import 'package:hiddify/features/about/view/view.dart';
+import 'package:hiddify/features/common/adaptive_root_scaffold.dart';
 import 'package:hiddify/features/logs/view/view.dart';
 import 'package:hiddify/features/settings/view/view.dart';
-import 'package:hiddify/features/wrapper/wrapper.dart';
 
 part 'mobile_routes.g.dart';
 
@@ -65,7 +66,7 @@ class MobileWrapperRoute extends ShellRouteData {
 
   @override
   Widget builder(BuildContext context, GoRouterState state, Widget navigator) {
-    return MobileWrapper(navigator);
+    return AdaptiveRootScaffold(navigator);
   }
 }
 

lib/core/router/routes/routes.dart

@@ -1,16 +0,0 @@
-import 'package:go_router/go_router.dart';
-import 'package:hiddify/core/router/routes/desktop_routes.dart' as desktop;
-import 'package:hiddify/core/router/routes/mobile_routes.dart' as mobile;
-import 'package:hiddify/core/router/routes/shared_routes.dart' as shared;
-import 'package:hiddify/utils/utils.dart';
-
-export 'mobile_routes.dart';
-export 'shared_routes.dart' hide $appRoutes;
-
-List<RouteBase> get $routes => [
-      ...shared.$appRoutes,
-      if (PlatformUtils.isDesktop)
-        ...desktop.$appRoutes
-      else
-        ...mobile.$appRoutes,
-    ];

lib/core/router/routes/shared_routes.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:hiddify/core/router/app_router.dart';
 import 'package:hiddify/features/home/view/view.dart';
 import 'package:hiddify/features/intro/view/view.dart';
 import 'package:hiddify/features/profile_detail/view/view.dart';
@@ -9,8 +10,6 @@ import 'package:hiddify/utils/utils.dart';
 
 part 'shared_routes.g.dart';
 
-final GlobalKey<NavigatorState> rootNavigatorKey = GlobalKey<NavigatorState>();
-
 class HomeRoute extends GoRouteData {
   const HomeRoute();
   static const path = '/';