vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 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) {
if (useMobileRouter) {
return const MaterialPage(
fullscreenDialog: true,
name: name,
child: LogsOverviewPage(),
);
@@ -288,7 +287,6 @@ class SettingsRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) {
return const MaterialPage(
fullscreenDialog: true,
name: name,
child: SettingsOverviewPage(),
);
@@ -307,7 +305,6 @@ class ConfigOptionsRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) {
return const MaterialPage(
fullscreenDialog: true,
name: name,
child: ConfigOptionsPage(),
);
@@ -346,7 +343,6 @@ class GeoAssetsRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) {
return const MaterialPage(
fullscreenDialog: true,
name: name,
child: GeoAssetsOverviewPage(),
);
@@ -369,7 +365,6 @@ class AboutRoute extends GoRouteData {
Page<void> buildPage(BuildContext context, GoRouterState state) {
if (useMobileRouter) {
return const MaterialPage(
fullscreenDialog: true,
name: name,
child: AboutPage(),
);

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

@@ -106,18 +106,16 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
return Scaffold(
key: RootScaffold.stateKey,
drawer: Breakpoints.small.isActive(context)
? SafeArea(
child: Drawer(
width: (MediaQuery.sizeOf(context).width * 0.88).clamp(0, 304),
child: NavigationRail(
extended: true,
selectedIndex: selectedWithOffset(drawerDestinationRange),
destinations: destinationsSlice(drawerDestinationRange)
.map((dest) => AdaptiveScaffold.toRailDestination(dest))
.toList(),
onDestinationSelected: (index) =>
selectWithOffset(index, drawerDestinationRange),
),
? Drawer(
width: (MediaQuery.sizeOf(context).width * 0.88).clamp(0, 304),
child: NavigationRail(
extended: true,
selectedIndex: selectedWithOffset(drawerDestinationRange),
destinations: destinationsSlice(drawerDestinationRange)
.map((dest) => AdaptiveScaffold.toRailDestination(dest))
.toList(),
onDestinationSelected: (index) =>
selectWithOffset(index, drawerDestinationRange),
),
)
: null,