feat: search history support #1236

This commit is contained in:
Kingkor Roy Tirtho 2024-03-23 20:19:34 +06:00
parent e99f32b610
commit 82b1cfa0d7
3 changed files with 91 additions and 12 deletions

View File

@ -115,4 +115,5 @@ abstract class SpotubeIcons {
static const github = SimpleIcons.github; static const github = SimpleIcons.github;
static const openCollective = SimpleIcons.opencollective; static const openCollective = SimpleIcons.opencollective;
static const anonymous = FeatherIcons.user; static const anonymous = FeatherIcons.user;
static const history = FeatherIcons.clock;
} }

View File

@ -1,7 +1,9 @@
import 'dart:async'; import 'dart:async';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart' hide Page; import 'package:flutter/material.dart' hide Page;
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:fuzzywuzzy/fuzzywuzzy.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -12,15 +14,16 @@ import 'package:spotube/components/shared/fallbacks/anonymous_fallback.dart';
import 'package:spotube/components/shared/page_window_title_bar.dart'; import 'package:spotube/components/shared/page_window_title_bar.dart';
import 'package:spotube/extensions/constrains.dart'; import 'package:spotube/extensions/constrains.dart';
import 'package:spotube/extensions/context.dart'; import 'package:spotube/extensions/context.dart';
import 'package:spotube/hooks/utils/use_force_update.dart';
import 'package:spotube/pages/search/sections/albums.dart'; import 'package:spotube/pages/search/sections/albums.dart';
import 'package:spotube/pages/search/sections/artists.dart'; import 'package:spotube/pages/search/sections/artists.dart';
import 'package:spotube/pages/search/sections/playlists.dart'; import 'package:spotube/pages/search/sections/playlists.dart';
import 'package:spotube/pages/search/sections/tracks.dart'; import 'package:spotube/pages/search/sections/tracks.dart';
import 'package:spotube/provider/authentication_provider.dart'; import 'package:spotube/provider/authentication_provider.dart';
import 'package:spotube/provider/spotify/spotify.dart'; import 'package:spotube/provider/spotify/spotify.dart';
import 'package:spotube/services/kv_store/kv_store.dart';
import 'package:spotube/utils/platform.dart'; import 'package:spotube/utils/platform.dart';
import 'package:collection/collection.dart';
class SearchPage extends HookConsumerWidget { class SearchPage extends HookConsumerWidget {
const SearchPage({super.key}); const SearchPage({super.key});
@ -29,7 +32,7 @@ class SearchPage extends HookConsumerWidget {
Widget build(BuildContext context, ref) { Widget build(BuildContext context, ref) {
final theme = Theme.of(context); final theme = Theme.of(context);
final searchTerm = ref.watch(searchTermStateProvider); final searchTerm = ref.watch(searchTermStateProvider);
final controller = useTextEditingController(text: searchTerm); final controller = useSearchController();
ref.watch(AuthenticationNotifier.provider); ref.watch(AuthenticationNotifier.provider);
final authenticationNotifier = final authenticationNotifier =
@ -45,6 +48,12 @@ class SearchPage extends HookConsumerWidget {
final isFetching = queries.every((s) => s.isLoading); final isFetching = queries.every((s) => s.isLoading);
useEffect(() {
controller.text = searchTerm;
return null;
}, []);
final resultWidget = HookBuilder( final resultWidget = HookBuilder(
builder: (context) { builder: (context) {
final controller = useScrollController(); final controller = useScrollController();
@ -88,24 +97,87 @@ class SearchPage extends HookConsumerWidget {
vertical: 10, vertical: 10,
), ),
color: theme.scaffoldBackgroundColor, color: theme.scaffoldBackgroundColor,
child: TextField( child: SearchAnchor(
controller: controller, searchController: controller,
autofocus: viewBuilder: (_) => HookBuilder(builder: (context) {
queries.none((s) => s.value != null && !s.hasError) && final searchController = useListenable(controller);
!kIsMobile, final update = useForceUpdate();
decoration: InputDecoration( final suggestions = searchController.text.isEmpty
prefixIcon: const Icon(SpotubeIcons.search), ? KVStoreService.recentSearches
hintText: "${context.l10n.search}...", : KVStoreService.recentSearches
), .where(
onSubmitted: (value) async { (s) =>
weightedRatio(
s.toLowerCase(),
searchController.text.toLowerCase(),
) >
50,
)
.toList();
return ListView.builder(
itemCount: suggestions.length,
itemBuilder: (context, index) {
final suggestion = suggestions[index];
return ListTile(
leading: const Icon(SpotubeIcons.history),
title: Text(suggestion),
trailing: IconButton(
icon: const Icon(SpotubeIcons.trash),
onPressed: () {
KVStoreService.setRecentSearches(
KVStoreService.recentSearches
.where((s) => s != suggestion)
.toList(),
);
update();
},
),
onTap: () {
controller.closeView(suggestion);
ref
.read(searchTermStateProvider.notifier)
.state = suggestion;
},
);
},
);
}),
suggestionsBuilder: (context, controller) {
return [];
},
viewOnSubmitted: (value) async {
controller.closeView(value);
Timer( Timer(
const Duration(milliseconds: 50), const Duration(milliseconds: 50),
() { () {
ref.read(searchTermStateProvider.notifier).state = ref.read(searchTermStateProvider.notifier).state =
value; value;
if (value.trim().isEmpty) {
return;
}
KVStoreService.setRecentSearches(
{
value,
...KVStoreService.recentSearches,
}.toList(),
);
}, },
); );
}, },
builder: (context, controller) {
return SearchBar(
autoFocus: queries.none(
(s) => s.value != null && !s.hasError) &&
!kIsMobile,
controller: controller,
leading: const Icon(SpotubeIcons.search),
hintText: "${context.l10n.search}...",
onTap: controller.openView,
onChanged: (_) => controller.openView(),
);
},
), ),
), ),
Expanded( Expanded(

View File

@ -17,4 +17,10 @@ abstract class KVStoreService {
sharedPreferences.getBool('askedForBatteryOptimization') ?? false; sharedPreferences.getBool('askedForBatteryOptimization') ?? false;
static Future<void> setAskedForBatteryOptimization(bool value) async => static Future<void> setAskedForBatteryOptimization(bool value) async =>
await sharedPreferences.setBool('askedForBatteryOptimization', value); await sharedPreferences.setBool('askedForBatteryOptimization', value);
static List<String> get recentSearches =>
sharedPreferences.getStringList('recentSearches') ?? [];
static Future<void> setRecentSearches(List<String> value) async =>
await sharedPreferences.setStringList('recentSearches', value);
} }