feat: click artist to search

ProjectAnni · Sep 16, 2024 · b3b3d60 · b3b3d60
1 parent d8408d1
commit b3b3d60
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/lib/ui/page/search.dart b/lib/ui/page/search.dart
@@ -14,7 +14,9 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 class SearchPage extends HookConsumerWidget {
-  const SearchPage({super.key});
+  final String? keyword;
+
+  const SearchPage({super.key, this.keyword});
 
   @override
   Widget build(BuildContext context, final WidgetRef ref) {
@@ -43,6 +45,13 @@ class SearchPage extends HookConsumerWidget {
       }
     }
 
+    useEffect(() {
+      if (keyword != null) {
+        search(anniv.client!, keyword!);
+      }
+      return null;
+    }, [keyword]);
+
     return Scaffold(
       body: SafeArea(
         child: Padding(
@@ -55,6 +64,7 @@ class SearchPage extends HookConsumerWidget {
                   icon: const Icon(Icons.search),
                   hintText: t.search,
                 ),
+                controller: TextEditingController(text: keyword),
                 onSubmitted: (final keyword) => search(anniv.client!, keyword),
               ),
               Expanded(
@@ -100,6 +110,7 @@ class _SearchResultWidget extends HookConsumerWidget {
           padding: const EdgeInsets.all(8.0),
           child: OverflowBar(
             alignment: MainAxisAlignment.start,
+            spacing: 8.0,
             children: [
               if ((result.value?.tracks?.length ?? 0) > 0)
                 FilterChip(

diff --git a/lib/ui/route/delegate.dart b/lib/ui/route/delegate.dart
@@ -231,7 +231,8 @@ class AnnixRouterDelegate extends RouterDelegate<List<RouteSettings>>
             playlistInfo: routeSettings.arguments as PlaylistInfo);
         break;
       case '/search':
-        child = const SearchPage();
+        final keyword = routeSettings.arguments as String?;
+        child = SearchPage(keyword: keyword);
         break;
       case '/settings':
         child = const SettingsScreen();

diff --git a/lib/ui/widgets/artist_text.dart b/lib/ui/widgets/artist_text.dart
@@ -1,3 +1,4 @@
+import 'package:annix/ui/route/delegate.dart';
 import 'package:annix/utils/context_extension.dart';
 import 'package:flutter/material.dart';
 
@@ -94,6 +95,10 @@ class _ArtistTextState extends State<ArtistText> {
   @override
   Widget build(final BuildContext context) {
     return GestureDetector(
+      onTap: () {
+        AnnixRouterDelegate.of(context)
+            .off(name: '/search', arguments: widget.artist);
+      },
       onLongPress: toggleExtend,
       child: Row(
         mainAxisSize: MainAxisSize.min,