luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-25 19:29:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-10-29 03:04:45 +01:00
parent f966ab7fc5
commit 5c50a486c4
2 changed files with 50 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

56
lib/routes/routes.dart
View file

@ -1,3 +1,4 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:adguard_home_manager/screens/home/home.dart'; import 'package:adguard_home_manager/screens/home/home.dart';
@ -8,6 +9,7 @@ import 'package:adguard_home_manager/screens/logs/logs.dart';
import 'package:adguard_home_manager/screens/settings/settings.dart'; import 'package:adguard_home_manager/screens/settings/settings.dart';
import 'package:adguard_home_manager/widgets/layout.dart'; import 'package:adguard_home_manager/widgets/layout.dart';
import 'package:adguard_home_manager/functions/desktop_mode.dart';
import 'package:adguard_home_manager/routes/router_globals.dart'; import 'package:adguard_home_manager/routes/router_globals.dart';
import 'package:adguard_home_manager/constants/routes_names.dart'; import 'package:adguard_home_manager/constants/routes_names.dart';
@ -27,7 +29,14 @@ final List<RouteBase> routes = [
GoRoute( GoRoute(
parentNavigatorKey: homeNavigatorKey, parentNavigatorKey: homeNavigatorKey,
path: RoutesNames.home, path: RoutesNames.home,
builder: (context, state) => const Home(), pageBuilder: (context, state) {
if (isDesktop(MediaQuery.of(context).size.width)) {
return const NoTransitionPage(child: Home());
}
else {
return const MaterialPage(child: Home());
}
},
), ),
] ]
), ),
@ -37,7 +46,14 @@ final List<RouteBase> routes = [
GoRoute( GoRoute(
parentNavigatorKey: clientsNavigatorKey, parentNavigatorKey: clientsNavigatorKey,
path: RoutesNames.clients, path: RoutesNames.clients,
builder: (context, state) => const Clients(), pageBuilder: (context, state) {
if (isDesktop(MediaQuery.of(context).size.width)) {
return const NoTransitionPage(child: Clients());
}
else {
return const MaterialPage(child: Clients());
}
},
) )
] ]
), ),
@ -47,7 +63,14 @@ final List<RouteBase> routes = [
GoRoute( GoRoute(
parentNavigatorKey: logsNavigatorKey, parentNavigatorKey: logsNavigatorKey,
path: RoutesNames.logs, path: RoutesNames.logs,
builder: (context, state) => const Logs(), pageBuilder: (context, state) {
if (isDesktop(MediaQuery.of(context).size.width)) {
return const NoTransitionPage(child: Logs());
}
else {
return const MaterialPage(child: Logs());
}
},
) )
] ]
), ),
@ -57,7 +80,14 @@ final List<RouteBase> routes = [
GoRoute( GoRoute(
parentNavigatorKey: filtersNavigatorKey, parentNavigatorKey: filtersNavigatorKey,
path: RoutesNames.filters, path: RoutesNames.filters,
builder: (context, state) => const Filters(), pageBuilder: (context, state) {
if (isDesktop(MediaQuery.of(context).size.width)) {
return const NoTransitionPage(child: Filters());
}
else {
return const MaterialPage(child: Filters());
}
},
) )
] ]
), ),
@ -67,7 +97,14 @@ final List<RouteBase> routes = [
GoRoute( GoRoute(
parentNavigatorKey: settingsNavigatorKey, parentNavigatorKey: settingsNavigatorKey,
path: RoutesNames.settings, path: RoutesNames.settings,
builder: (context, state) => const Settings(), pageBuilder: (context, state) {
if (isDesktop(MediaQuery.of(context).size.width)) {
return const NoTransitionPage(child: Settings());
}
else {
return const MaterialPage(child: Settings());
}
},
) )
] ]
), ),
@ -76,7 +113,14 @@ final List<RouteBase> routes = [
routes: [ routes: [
GoRoute( GoRoute(
path: RoutesNames.connect, path: RoutesNames.connect,
builder: (context, state) => const Connect(), pageBuilder: (context, state) {
if (isDesktop(MediaQuery.of(context).size.width)) {
return const NoTransitionPage(child: Connect());
}
else {
return const MaterialPage(child: Connect());
}
},
) )
] ]
), ),

15
lib/widgets/bottom_nav_bar.dart
View file

@ -82,21 +82,6 @@ class BottomNavBar extends StatelessWidget {
), ),
label: translatedName(screen.name) label: translatedName(screen.name)
)).toList(), )).toList(),
// onDestinationSelected: (value) {
// // Reset clients tab to 0 when changing screen
// if (value != 1) {
// appConfigProvider.setSelectedClientsTab(0);
// }
// // Reset logs filters when changing screen
// if (value != 2) {
// logsProvider.resetFilters();
// }
// // Reset settings selected screen
// if (value != screens.length-1) {
// appConfigProvider.setSelectedSettingsScreen(screen: null);
// }
// appConfigProvider.setSelectedScreen(value);
// },
); );
} }
} }