A cross platform Audiobookshelf client for Android and iOS
Dart
Add a search-and-tap way to bulk add books to collections and playlists
Barnabasba6cd4f711d8
diff --git a/lib/widgets/add_books_search_sheet.dart b/lib/widgets/add_books_search_sheet.dartnew file mode 100644index 00000000..701ba816--- /dev/null+++ b/lib/widgets/add_books_search_sheet.dart@@ -0,0 +1,358 @@+import 'dart:async';+import 'package:flutter/material.dart';+import 'package:flutter/services.dart';+import 'package:cached_network_image/cached_network_image.dart';+import 'package:provider/provider.dart';+import '../l10n/app_localizations.dart';+import '../providers/auth_provider.dart';+import '../providers/library_provider.dart';+import '../services/book_search_index.dart';+import 'overlay_toast.dart';+import 'stackable_sheet.dart';++/// A stay-open search picker for bulk-adding books to a target (collection or+/// playlist). Type to search the library, tap a result to add it (or tap an+/// already-added one to remove) without the sheet closing, then search again.+///+/// Membership is tracked locally and updated optimistically so taps feel+/// instant; the actual add/remove runs through [onAdd]/[onRemove].+class AddBooksSearchSheet extends StatefulWidget {+ final String title;+ final String libraryId;+ final Set<String> initialMemberIds;+ final Future<bool> Function(String libraryItemId) onAdd;+ final Future<bool> Function(String libraryItemId) onRemove;++ const AddBooksSearchSheet({+ super.key,+ required this.title,+ required this.libraryId,+ required this.initialMemberIds,+ required this.onAdd,+ required this.onRemove,+ });++ static void show(+ BuildContext context, {+ required String title,+ required String libraryId,+ required Set<String> initialMemberIds,+ required Future<bool> Function(String libraryItemId) onAdd,+ required Future<bool> Function(String libraryItemId) onRemove,+ }) {+ showStackableSheet(+ context: context,+ showHandle: true,+ useSafeArea: true,+ initialChildSize: 0.92,+ maxChildSize: 0.95,+ builder: (_, scrollController) => AddBooksSearchSheet(+ title: title,+ libraryId: libraryId,+ initialMemberIds: initialMemberIds,+ onAdd: onAdd,+ onRemove: onRemove,+ ),+ );+ }++ @override+ State<AddBooksSearchSheet> createState() => _AddBooksSearchSheetState();+}++class _AddBooksSearchSheetState extends State<AddBooksSearchSheet> {+ final _controller = TextEditingController();+ final _scrollController = ScrollController();+ Timer? _debounce;++ List<Map<String, dynamic>> _results = [];+ bool _isSearching = false;+ bool _hasSearched = false;++ late final Set<String> _memberIds = {...widget.initialMemberIds};+ final Set<String> _busyIds = {};+ int _addedCount = 0;++ @override+ void initState() {+ super.initState();+ // Warm the search index so results are fuzzy and instant by the time the+ // user has typed a few characters.+ WidgetsBinding.instance.addPostFrameCallback((_) {+ final api = context.read<AuthProvider>().apiService;+ if (api != null) BookSearchIndex().ensureIndex(api, widget.libraryId);+ });+ }++ @override+ void dispose() {+ _debounce?.cancel();+ _controller.dispose();+ _scrollController.dispose();+ super.dispose();+ }++ void _onQueryChanged(String value) {+ _debounce?.cancel();+ final query = value.trim();+ if (query.isEmpty) {+ setState(() {+ _results = [];+ _hasSearched = false;+ _isSearching = false;+ });+ return;+ }+ setState(() => _isSearching = true);+ _debounce = Timer(const Duration(milliseconds: 400), () => _search(query));+ }++ Future<void> _search(String query) async {+ final api = context.read<AuthProvider>().apiService;+ if (api == null) {+ if (mounted) setState(() => _isSearching = false);+ return;+ }+ await BookSearchIndex().ensureIndex(api, widget.libraryId);+ if (!mounted || _controller.text.trim() != query) return;++ List<Map<String, dynamic>> results;+ if (BookSearchIndex().isReady(widget.libraryId)) {+ results = BookSearchIndex()+ .search(widget.libraryId, query)+ .map((h) => h.item)+ .toList();+ } else {+ // Index didn't build (e.g. offline) - fall back to the server search.+ final result = await api.searchLibrary(widget.libraryId, query);+ if (!mounted || _controller.text.trim() != query) return;+ results = ((result?['book'] as List<dynamic>?) ?? []).map((r) {+ final m = r as Map<String, dynamic>;+ return (m['libraryItem'] as Map<String, dynamic>?) ?? m;+ }).toList();+ }+ setState(() {+ _results = results;+ _isSearching = false;+ _hasSearched = true;+ });+ }++ Future<void> _toggle(String itemId) async {+ if (itemId.isEmpty || _busyIds.contains(itemId)) return;+ final wasMember = _memberIds.contains(itemId);+ setState(() {+ _busyIds.add(itemId);+ if (wasMember) {+ _memberIds.remove(itemId);+ } else {+ _memberIds.add(itemId);+ _addedCount++;+ }+ });+ HapticFeedback.selectionClick();++ final ok = wasMember+ ? await widget.onRemove(itemId)+ : await widget.onAdd(itemId);+ if (!mounted) return;++ setState(() {+ _busyIds.remove(itemId);+ if (!ok) {+ // Revert the optimistic change+ if (wasMember) {+ _memberIds.add(itemId);+ } else {+ _memberIds.remove(itemId);+ _addedCount--;+ }+ }+ });+ if (!ok) {+ showOverlayToast(context, AppLocalizations.of(context)!.failedToAdd,+ icon: Icons.error_outline_rounded);+ }+ }++ @override+ Widget build(BuildContext context) {+ final cs = Theme.of(context).colorScheme;+ final tt = Theme.of(context).textTheme;+ final l = AppLocalizations.of(context)!;++ return Column(children: [+ Padding(+ padding: const EdgeInsets.fromLTRB(20, 0, 20, 8),+ child: Row(children: [+ Expanded(+ child: Text(widget.title,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: tt.titleMedium+ ?.copyWith(fontWeight: FontWeight.w600, color: cs.onSurface)),+ ),+ if (_addedCount > 0)+ Text('$_addedCount added',+ style: tt.labelMedium+ ?.copyWith(color: cs.primary, fontWeight: FontWeight.w600)),+ ]),+ ),+ Padding(+ padding: const EdgeInsets.symmetric(horizontal: 16),+ child: TextField(+ controller: _controller,+ autofocus: true,+ textInputAction: TextInputAction.search,+ style: TextStyle(color: cs.onSurface, fontSize: 15),+ onChanged: _onQueryChanged,+ decoration: InputDecoration(+ hintText: l.librarySearchBooksHint,+ prefixIcon: Icon(Icons.search_rounded, color: cs.onSurfaceVariant),+ suffixIcon: _controller.text.isNotEmpty+ ? IconButton(+ icon: Icon(Icons.close_rounded, color: cs.onSurfaceVariant),+ onPressed: () {+ _controller.clear();+ _onQueryChanged('');+ setState(() {});+ },+ )+ : null,+ filled: true,+ fillColor: cs.surfaceContainerHigh,+ isDense: true,+ contentPadding: const EdgeInsets.symmetric(vertical: 12),+ border: OutlineInputBorder(+ borderRadius: BorderRadius.circular(14),+ borderSide: BorderSide.none,+ ),+ ),+ ),+ ),+ const SizedBox(height: 8),+ Expanded(child: _buildBody(cs, tt, l)),+ ]);+ }++ Widget _buildBody(ColorScheme cs, TextTheme tt, AppLocalizations l) {+ if (_isSearching && _results.isEmpty) {+ return const Center(child: CircularProgressIndicator());+ }+ if (!_hasSearched) {+ // Hardcoded English (l10n follow-up, matches other new-feature strings).+ return _hint(cs, tt, Icons.search_rounded, 'Search your library to add books');+ }+ if (_results.isEmpty) {+ return _hint(cs, tt, Icons.search_off_rounded, l.noBooksFound);+ }+ final lib = context.read<LibraryProvider>();+ return ListView.builder(+ controller: _scrollController,+ padding: EdgeInsets.fromLTRB(+ 12, 0, 12, 24 + MediaQuery.of(context).viewInsets.bottom),+ itemCount: _results.length,+ itemBuilder: (context, index) => _resultRow(cs, tt, l, lib, _results[index]),+ );+ }++ Widget _resultRow(ColorScheme cs, TextTheme tt, AppLocalizations l,+ LibraryProvider lib, Map<String, dynamic> item) {+ final itemId = item['id'] as String? ?? '';+ final media = item['media'] as Map<String, dynamic>? ?? {};+ final metadata = media['metadata'] as Map<String, dynamic>? ?? {};+ final title = metadata['title'] as String? ?? l.unknown;+ final author = metadata['authorName'] as String? ?? '';+ final coverUrl = lib.getCoverUrl(itemId);+ final isMember = _memberIds.contains(itemId);+ final isBusy = _busyIds.contains(itemId);++ return Padding(+ padding: const EdgeInsets.only(bottom: 6),+ child: Material(+ color: cs.surfaceContainerHigh,+ borderRadius: BorderRadius.circular(12),+ clipBehavior: Clip.antiAlias,+ child: InkWell(+ onTap: isBusy ? null : () => _toggle(itemId),+ child: Padding(+ padding: const EdgeInsets.all(8),+ child: Row(children: [+ ClipRRect(+ borderRadius: BorderRadius.circular(6),+ child: SizedBox(+ width: 44,+ height: 44,+ child: coverUrl != null && !coverUrl.startsWith('/')+ ? CachedNetworkImage(+ imageUrl: coverUrl,+ fit: BoxFit.cover,+ httpHeaders: lib.mediaHeaders,+ placeholder: (_, __) => _coverPh(cs),+ errorWidget: (_, __, ___) => _coverPh(cs),+ )+ : _coverPh(cs),+ ),+ ),+ const SizedBox(width: 12),+ Expanded(+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ mainAxisSize: MainAxisSize.min,+ children: [+ Text(title,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: tt.bodyMedium?.copyWith(+ fontWeight: FontWeight.w600, color: cs.onSurface)),+ if (author.isNotEmpty)+ Text(author,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: tt.bodySmall+ ?.copyWith(color: cs.onSurfaceVariant)),+ ],+ ),+ ),+ const SizedBox(width: 8),+ SizedBox(+ width: 32,+ height: 32,+ child: isBusy+ ? Padding(+ padding: const EdgeInsets.all(7),+ child: CircularProgressIndicator(+ strokeWidth: 2, color: cs.primary),+ )+ : Icon(+ isMember+ ? Icons.check_circle_rounded+ : Icons.add_circle_outline_rounded,+ color: isMember ? cs.primary : cs.onSurfaceVariant,+ ),+ ),+ ]),+ ),+ ),+ ),+ );+ }++ Widget _coverPh(ColorScheme cs) => Container(+ color: cs.surfaceContainerHighest,+ child: Icon(Icons.book_rounded,+ size: 18, color: cs.onSurfaceVariant.withValues(alpha: 0.3)),+ );++ Widget _hint(ColorScheme cs, TextTheme tt, IconData icon, String text) {+ return Center(+ child: Column(mainAxisSize: MainAxisSize.min, children: [+ Icon(icon, size: 40, color: cs.onSurfaceVariant.withValues(alpha: 0.4)),+ const SizedBox(height: 12),+ Text(text,+ textAlign: TextAlign.center,+ style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant)),+ ]),+ );+ }+}diff --git a/lib/widgets/collection_detail_sheet.dart b/lib/widgets/collection_detail_sheet.dartindex 785b0351..0fd61d14 100644--- a/lib/widgets/collection_detail_sheet.dart+++ b/lib/widgets/collection_detail_sheet.dart@@ -11,6 +11,7 @@ import '../providers/auth_provider.dart';import '../providers/library_provider.dart';import '../services/audio_player_service.dart';import '../services/download_service.dart';+import 'add_books_search_sheet.dart';import 'book_detail_sheet.dart';import 'stackable_sheet.dart';import '../screens/app_shell.dart';@@ -51,6 +52,25 @@ class _CollectionDetailSheetState extends State<CollectionDetailSheet> {await lib.removeFromCollection(widget.collectionId, libraryItemId);}+ void _openAddBooks(LibraryProvider lib, Map<String, dynamic> collection,+ String name, List<dynamic> books) {+ final libraryId = collection['libraryId'] as String? ?? lib.selectedLibraryId;+ if (libraryId == null) return;+ final memberIds = books+ .whereType<Map<String, dynamic>>()+ .map((b) => b['id'] as String? ?? '')+ .where((id) => id.isNotEmpty)+ .toSet();+ AddBooksSearchSheet.show(+ context,+ title: name,+ libraryId: libraryId,+ initialMemberIds: memberIds,+ onAdd: (id) => lib.addToCollection(widget.collectionId, id),+ onRemove: (id) => lib.removeFromCollection(widget.collectionId, id),+ );+ }+Future<void> _deleteCollection(BuildContext context, LibraryProvider lib) async {final l = AppLocalizations.of(context)!;final confirmed = await showDialog<bool>(@@ -178,6 +198,14 @@ class _CollectionDetailSheetState extends State<CollectionDetailSheet> {Text(l.collectionDetailBookCount(books.length),style: tt.labelSmall?.copyWith(color: cs.onSurfaceVariant),),+ if (canEditCollection) ...[+ const SizedBox(width: 12),+ GestureDetector(+ onTap: () => _openAddBooks(lib, collection, name, books),+ child: Icon(Icons.library_add_rounded, size: 20,+ color: cs.onSurfaceVariant),+ ),+ ],const SizedBox(width: 12),GestureDetector(onTap: () => setState(() => _gridView = !_gridView),diff --git a/lib/widgets/playlist_detail_sheet.dart b/lib/widgets/playlist_detail_sheet.dartindex 5d9170cf..52de6281 100644--- a/lib/widgets/playlist_detail_sheet.dart+++ b/lib/widgets/playlist_detail_sheet.dart@@ -12,6 +12,7 @@ import '../providers/library_provider.dart';import '../services/audio_player_service.dart';import '../services/download_service.dart';import '../screens/app_shell.dart';+import 'add_books_search_sheet.dart';import 'book_detail_sheet.dart';import 'episode_list_sheet.dart';import 'stackable_sheet.dart';@@ -201,6 +202,27 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {);}+ void _openAddBooks(LibraryProvider lib, Map<String, dynamic> playlist,+ String name, List<dynamic> items) {+ final libraryId = playlist['libraryId'] as String? ?? lib.selectedLibraryId;+ if (libraryId == null) return;+ // Only plain books count as members here (episodes use a different add flow).+ final memberIds = items+ .whereType<Map<String, dynamic>>()+ .where((i) => i['episodeId'] == null)+ .map((i) => i['libraryItemId'] as String? ?? '')+ .where((id) => id.isNotEmpty)+ .toSet();+ AddBooksSearchSheet.show(+ context,+ title: name,+ libraryId: libraryId,+ initialMemberIds: memberIds,+ onAdd: (id) => lib.addToPlaylist(widget.playlistId, id),+ onRemove: (id) => lib.removeFromPlaylist(widget.playlistId, id),+ );+ }+Future<void> _deletePlaylist(BuildContext context, LibraryProvider lib) async {final l = AppLocalizations.of(context)!;final confirmed = await showDialog<bool>(@@ -269,6 +291,13 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {final name = playlist['name'] as String? ?? l.playlistDetailDefaultName;final items = (playlist['items'] as List<dynamic>?) ?? [];+ // The add-books search only finds books, so hide it for podcast playlists.+ final isPodcastPlaylist = lib.libraries+ .cast<Map<String, dynamic>>()+ .where((lb) => lb['id'] == playlist['libraryId'])+ .map((lb) => (lb['mediaType'] as String? ?? 'book') == 'podcast')+ .firstOrNull ??+ lib.isPodcastLibrary;return Column(children: [const SizedBox(height: 4),@@ -339,6 +368,14 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {Text(l.playlistDetailItemCount(items.length),style: tt.labelSmall?.copyWith(color: cs.onSurfaceVariant),),+ if (!isPodcastPlaylist) ...[+ const SizedBox(width: 8),+ GestureDetector(+ onTap: () => _openAddBooks(lib, playlist, name, items),+ child: Icon(Icons.library_add_rounded, size: 20,+ color: cs.onSurfaceVariant),+ ),+ ],const SizedBox(width: 8),GestureDetector(onTap: () => setState(() => _gridView = !_gridView),