update routes; small polishments

This commit is contained in:
Fabian Freund
2024-06-16 06:35:05 +02:00
parent 04e8dc7c0e
commit 2007fd2809
7 changed files with 119 additions and 29 deletions
+44 -7
View File
@@ -1,6 +1,7 @@
import 'package:bang_navigator/core/routing/dialog_page.dart';
import 'package:bang_navigator/features/about/presentation/screens/about.dart';
import 'package:bang_navigator/features/bangs/presentation/screens/bang.dart';
import 'package:bang_navigator/features/bangs/presentation/screens/categories.dart';
import 'package:bang_navigator/features/bangs/presentation/screens/list.dart';
import 'package:bang_navigator/features/bangs/presentation/screens/search.dart';
import 'package:bang_navigator/features/chat_archive/presentation/screens/detail.dart';
import 'package:bang_navigator/features/chat_archive/presentation/screens/list.dart';
@@ -19,16 +20,26 @@ part 'routes.g.dart';
name: 'AboutRoute',
path: 'about',
),
TypedGoRoute<BangRoute>(
TypedGoRoute<BangCategoriesRoute>(
name: 'BangRoute',
path: 'bangs',
routes: [
TypedGoRoute<BangSearchRoute>(
name: 'BangSearchRoute',
path: 'search',
TypedGoRoute<BangCategoryRoute>(
name: 'BangCategoryRoute',
path: ':category',
routes: [
TypedGoRoute<BangSubCategoryRoute>(
name: 'BangSubCategoryRoute',
path: ':subCategory',
),
],
),
],
),
TypedGoRoute<BangSearchRoute>(
name: 'BangSearchRoute',
path: 'bang_search',
),
],
)
class KagiRoute extends GoRouteData {
@@ -45,10 +56,36 @@ class AboutRoute extends GoRouteData {
}
}
class BangRoute extends GoRouteData {
class BangCategoriesRoute extends GoRouteData {
@override
Widget build(BuildContext context, GoRouterState state) {
return const BangScreen();
return const BangCategoriesScreen();
}
}
class BangCategoryRoute extends GoRouteData {
final String category;
const BangCategoryRoute({required this.category});
@override
Widget build(BuildContext context, GoRouterState state) {
return BangListScreen(category: category);
}
}
class BangSubCategoryRoute extends GoRouteData {
final String category;
final String subCategory;
const BangSubCategoryRoute({
required this.category,
required this.subCategory,
});
@override
Widget build(BuildContext context, GoRouterState state) {
return BangListScreen(category: category, subCategory: subCategory);
}
}
+60 -7
View File
@@ -25,15 +25,27 @@ RouteBase get $kagiRoute => GoRouteData.$route(
GoRouteData.$route(
path: 'bangs',
name: 'BangRoute',
factory: $BangRouteExtension._fromState,
factory: $BangCategoriesRouteExtension._fromState,
routes: [
GoRouteData.$route(
path: 'search',
name: 'BangSearchRoute',
factory: $BangSearchRouteExtension._fromState,
path: ':category',
name: 'BangCategoryRoute',
factory: $BangCategoryRouteExtension._fromState,
routes: [
GoRouteData.$route(
path: ':subCategory',
name: 'BangSubCategoryRoute',
factory: $BangSubCategoryRouteExtension._fromState,
),
],
),
],
),
GoRouteData.$route(
path: 'bang_search',
name: 'BangSearchRoute',
factory: $BangSearchRouteExtension._fromState,
),
],
);
@@ -71,8 +83,9 @@ extension $AboutRouteExtension on AboutRoute {
void replace(BuildContext context) => context.replace(location);
}
extension $BangRouteExtension on BangRoute {
static BangRoute _fromState(GoRouterState state) => BangRoute();
extension $BangCategoriesRouteExtension on BangCategoriesRoute {
static BangCategoriesRoute _fromState(GoRouterState state) =>
BangCategoriesRoute();
String get location => GoRouteData.$location(
'/bangs',
@@ -88,11 +101,51 @@ extension $BangRouteExtension on BangRoute {
void replace(BuildContext context) => context.replace(location);
}
extension $BangCategoryRouteExtension on BangCategoryRoute {
static BangCategoryRoute _fromState(GoRouterState state) => BangCategoryRoute(
category: state.pathParameters['category']!,
);
String get location => GoRouteData.$location(
'/bangs/${Uri.encodeComponent(category)}',
);
void go(BuildContext context) => context.go(location);
Future<T?> push<T>(BuildContext context) => context.push<T>(location);
void pushReplacement(BuildContext context) =>
context.pushReplacement(location);
void replace(BuildContext context) => context.replace(location);
}
extension $BangSubCategoryRouteExtension on BangSubCategoryRoute {
static BangSubCategoryRoute _fromState(GoRouterState state) =>
BangSubCategoryRoute(
category: state.pathParameters['category']!,
subCategory: state.pathParameters['subCategory']!,
);
String get location => GoRouteData.$location(
'/bangs/${Uri.encodeComponent(category)}/${Uri.encodeComponent(subCategory)}',
);
void go(BuildContext context) => context.go(location);
Future<T?> push<T>(BuildContext context) => context.push<T>(location);
void pushReplacement(BuildContext context) =>
context.pushReplacement(location);
void replace(BuildContext context) => context.replace(location);
}
extension $BangSearchRouteExtension on BangSearchRoute {
static BangSearchRoute _fromState(GoRouterState state) => BangSearchRoute();
String get location => GoRouteData.$location(
'/bangs/search',
'/bang_search',
);
void go(BuildContext context) => context.go(location);
@@ -138,7 +138,7 @@ class KagiScreen extends HookConsumerWidget {
const Divider(),
MenuItemButton(
onPressed: () async {
await context.push(BangRoute().location);
await context.push(BangCategoriesRoute().location);
},
leadingIcon: const Icon(MdiIcons.exclamationThick),
child: const Text('Bangs'),
@@ -37,7 +37,7 @@ class AppBarTitle extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final activeWebView = ref.watch(webViewTabControllerProvider);
if (activeWebView == null) {
return SizedBox.shrink();
return const SizedBox.shrink();
}
final page = useValueListenable(activeWebView.page);
@@ -18,7 +18,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
class _InputField extends ConsumerWidget {
final TextEditingController? controller;
const _InputField({required this.controller, super.key});
const _InputField({required this.controller});
@override
Widget build(BuildContext context, WidgetRef ref) {
@@ -202,7 +202,7 @@ class SettingsScreen extends HookConsumerWidget {
_buildSection(theme, 'Bangs'),
ButtonListTile(
title: 'Icon Cache',
subtitle: 'Stores favicons for Bangs',
subtitle: 'Stored favicons for Bangs',
button: FilledButton.icon(
onPressed: () async {
await ref
@@ -215,7 +215,7 @@ class SettingsScreen extends HookConsumerWidget {
),
ButtonListTile(
title: 'Bang Frequencies',
subtitle: 'Tracks Bang usage for recommendation history',
subtitle: 'Tracked usage for Bang recommendations',
button: FilledButton.icon(
onPressed: () async {
await ref