mirror of
https://github.com/gabehf/Fladder.git
synced 2026-03-12 17:00:29 -07:00
[Feature] Replace go_router with auto_route
This commit is contained in:
parent
b31cc86ae8
commit
144c8faf70
42 changed files with 1181 additions and 980 deletions
|
|
@ -1,14 +1,13 @@
|
|||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:auto_route/auto_route.dart';
|
||||
import 'package:ficonsax/ficonsax.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import 'package:fladder/models/collection_types.dart';
|
||||
import 'package:fladder/models/view_model.dart';
|
||||
import 'package:fladder/routes/build_routes/home_routes.dart';
|
||||
import 'package:fladder/routes/build_routes/route_builder.dart';
|
||||
import 'package:fladder/routes/build_routes/settings_routes.dart';
|
||||
import 'package:fladder/routes/auto_router.gr.dart';
|
||||
import 'package:fladder/screens/metadata/refresh_metadata.dart';
|
||||
import 'package:fladder/screens/shared/animated_fade_size.dart';
|
||||
import 'package:fladder/util/adaptive_layout.dart';
|
||||
|
|
@ -74,7 +73,7 @@ class NestedNavigationDrawer extends ConsumerWidget {
|
|||
),
|
||||
...destinations.map((destination) => DrawerListButton(
|
||||
label: destination.label,
|
||||
selected: destination.route?.route == currentLocation,
|
||||
selected: context.router.current.name == destination.route?.routeName,
|
||||
selectedIcon: destination.selectedIcon!,
|
||||
icon: destination.icon!,
|
||||
onPressed: () {
|
||||
|
|
@ -93,7 +92,8 @@ class NestedNavigationDrawer extends ConsumerWidget {
|
|||
),
|
||||
...views.map((library) => DrawerListButton(
|
||||
label: library.name,
|
||||
selected: currentLocation.contains(library.id),
|
||||
selected: context.router.current.name == LibrarySearchRoute().routeName &&
|
||||
context.routeData.queryParams.getString('parentId') == library.id,
|
||||
actions: [
|
||||
ItemActionButton(
|
||||
label: Text(context.localized.scanLibrary),
|
||||
|
|
@ -102,7 +102,7 @@ class NestedNavigationDrawer extends ConsumerWidget {
|
|||
),
|
||||
],
|
||||
onPressed: () {
|
||||
context.routePushOrGo(LibrarySearchRoute(id: library.id));
|
||||
context.router.push(LibrarySearchRoute(viewModelId: library.id));
|
||||
Scaffold.of(context).closeDrawer();
|
||||
},
|
||||
selectedIcon: Icon(library.collectionType.icon),
|
||||
|
|
@ -115,15 +115,15 @@ class NestedNavigationDrawer extends ConsumerWidget {
|
|||
child: DrawerListButton(
|
||||
label: context.localized.settings,
|
||||
selectedIcon: const Icon(IconsaxBold.setting_3),
|
||||
selected: currentLocation.contains(SettingsRoute().basePath),
|
||||
selected: currentLocation.contains(const SettingsRoute().routeName),
|
||||
icon: const SizedBox(width: 35, height: 35, child: SettingsUserIcon()),
|
||||
onPressed: () {
|
||||
switch (AdaptiveLayout.of(context).size) {
|
||||
case ScreenLayout.single:
|
||||
context.routePush(SettingsRoute());
|
||||
const SettingsRoute().push(context);
|
||||
break;
|
||||
case ScreenLayout.dual:
|
||||
context.routeGo(ClientSettingsRoute());
|
||||
context.router.push(const ClientSettingsRoute());
|
||||
break;
|
||||
}
|
||||
Scaffold.of(context).closeDrawer();
|
||||
|
|
@ -135,14 +135,14 @@ class NestedNavigationDrawer extends ConsumerWidget {
|
|||
label: context.localized.settings,
|
||||
selectedIcon: const Icon(IconsaxBold.setting_2),
|
||||
icon: const Icon(IconsaxOutline.setting_2),
|
||||
selected: currentLocation.contains(SettingsRoute().basePath),
|
||||
selected: currentLocation.contains(const SettingsRoute().routeName),
|
||||
onPressed: () {
|
||||
switch (AdaptiveLayout.of(context).size) {
|
||||
case ScreenLayout.single:
|
||||
context.routePush(SettingsRoute());
|
||||
const SettingsRoute().push(context);
|
||||
break;
|
||||
case ScreenLayout.dual:
|
||||
context.routeGo(ClientSettingsRoute());
|
||||
context.router.push(const ClientSettingsRoute());
|
||||
break;
|
||||
}
|
||||
Scaffold.of(context).closeDrawer();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue