vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

Fix mobile routing behavior

Browse Source
This commit is contained in:
problematicconsumer
2024-02-01 12:25:47 +03:30
parent 36781c4856
commit 7f5183414e
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/router/routes.dart
View File

@@ -269,7 +269,6 @@ class LogsOverviewRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) { Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) { if (useMobileRouter) {
return const MaterialPage( return const MaterialPage(
fullscreenDialog: true,
name: name, name: name,
child: LogsOverviewPage(), child: LogsOverviewPage(),
); );
@@ -288,7 +287,6 @@ class SettingsRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) { Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) { if (useMobileRouter) {
return const MaterialPage( return const MaterialPage(
fullscreenDialog: true,
name: name, name: name,
child: SettingsOverviewPage(), child: SettingsOverviewPage(),
); );
@@ -307,7 +305,6 @@ class ConfigOptionsRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) { Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) { if (useMobileRouter) {
return const MaterialPage( return const MaterialPage(
fullscreenDialog: true,
name: name, name: name,
child: ConfigOptionsPage(), child: ConfigOptionsPage(),
); );
@@ -346,7 +343,6 @@ class GeoAssetsRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) { Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) { if (useMobileRouter) {
return const MaterialPage( return const MaterialPage(
fullscreenDialog: true,
name: name, name: name,
child: GeoAssetsOverviewPage(), child: GeoAssetsOverviewPage(),
); );
@@ -369,7 +365,6 @@ class AboutRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) { Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) { if (useMobileRouter) {
return const MaterialPage( return const MaterialPage(
fullscreenDialog: true,
name: name, name: name,
child: AboutPage(), child: AboutPage(),
); );

4
lib/features/common/adaptive_root_scaffold.dart
View File

@@ -106,8 +106,7 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
return Scaffold( return Scaffold(
key: RootScaffold.stateKey, key: RootScaffold.stateKey,
drawer: Breakpoints.small.isActive(context) drawer: Breakpoints.small.isActive(context)
? SafeArea( ? Drawer(
child: Drawer(
width: (MediaQuery.sizeOf(context).width * 0.88).clamp(0, 304), width: (MediaQuery.sizeOf(context).width * 0.88).clamp(0, 304),
child: NavigationRail( child: NavigationRail(
extended: true, extended: true,
@@ -118,7 +117,6 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
onDestinationSelected: (index) => onDestinationSelected: (index) =>
selectWithOffset(index, drawerDestinationRange), selectWithOffset(index, drawerDestinationRange),
), ),
),
) )
: null, : null,
body: AdaptiveLayout( body: AdaptiveLayout(