Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Search bookmarks and highlights and fold each book's list away

Barnabasb28cfb3f38f4
diff --git a/lib/screens/bookmarks_screen.dart b/lib/screens/bookmarks_screen.dart
index c51c3981..fb775ba0 100644
--- a/lib/screens/bookmarks_screen.dart
+++ b/lib/screens/bookmarks_screen.dart
@@ -51,6 +51,12 @@ class _BookmarksScreenState extends State<BookmarksScreen>
// speed-adjusted-time setting at that book's own speed.
final Map<String, double> _bookSpeeds = {};
double _defaultSpeed = 1.0;
+ final TextEditingController _searchCtl = TextEditingController();
+ String _query = '';
+ // Books opened on the bookmarks tab; all start folded. Kept while the screen is open.
+ final Set<String> _expanded = {};
+ // Same for the highlights tab; kept apart since a book can be in both.
+ final Set<String> _expandedHighlights = {};
static const _titleCacheKey = 'bookmark_book_titles';
@@ -74,9 +80,52 @@ class _BookmarksScreenState extends State<BookmarksScreen>
@override
void dispose() {
_tabs.dispose();
+ _searchCtl.dispose();
super.dispose();
}
+ /// A book matching the search keeps all its bookmarks; otherwise only the
+ /// bookmarks whose title or note match stay, and empty books drop out.
+ Map<String, List<Bookmark>> _filteredBookmarks() {
+ if (_query.isEmpty) return _allBookmarks;
+ final out = <String, List<Bookmark>>{};
+ for (final entry in _allBookmarks.entries) {
+ final book = '${_resolveTitle(entry.key) ?? ''} ${_resolveShowTitle(entry.key) ?? ''}'
+ .toLowerCase();
+ if (book.contains(_query)) {
+ out[entry.key] = entry.value;
+ continue;
+ }
+ final hits = entry.value
+ .where((b) =>
+ b.title.toLowerCase().contains(_query) ||
+ (b.note ?? '').toLowerCase().contains(_query))
+ .toList();
+ if (hits.isNotEmpty) out[entry.key] = hits;
+ }
+ return out;
+ }
+
+ /// Same rule as bookmarks: a matching book keeps all its highlights,
+ /// otherwise only highlights whose text or note match.
+ Map<String, List<EbookAnnotation>> _filteredHighlights() {
+ if (_query.isEmpty) return _highlights;
+ final out = <String, List<EbookAnnotation>>{};
+ for (final entry in _highlights.entries) {
+ if ((_resolveTitle(entry.key) ?? '').toLowerCase().contains(_query)) {
+ out[entry.key] = entry.value;
+ continue;
+ }
+ final hits = entry.value
+ .where((h) =>
+ (h.selectedText ?? '').toLowerCase().contains(_query) ||
+ (h.note ?? '').toLowerCase().contains(_query))
+ .toList();
+ if (hits.isNotEmpty) out[entry.key] = hits;
+ }
+ return out;
+ }
+
Future<void> _loadHighlights() async {
final highlights = await EbookAnnotationService().getAllHighlights();
if (!mounted) return;
@@ -731,16 +780,26 @@ class _BookmarksScreenState extends State<BookmarksScreen>
return _emptyState(
cs, tt, Icons.bookmark_border_rounded, l.bookmarksNoBookmarks);
}
+ final groups = _filteredBookmarks();
+ if (groups.isEmpty) {
+ return _emptyState(
+ cs, tt, Icons.search_off_rounded, l.bookmarksNoMatches);
+ }
return ListView.builder(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
- itemCount: _allBookmarks.length,
+ itemCount: groups.length,
itemBuilder: (ctx, i) {
final lib = context.read<LibraryProvider>();
- final itemId = _allBookmarks.keys.elementAt(i);
- final bookmarks = _allBookmarks[itemId]!;
+ final itemId = groups.keys.elementAt(i);
+ final bookmarks = groups[itemId]!;
final resolvedTitle = _resolveTitle(itemId);
final coverUrl = lib.getCoverUrl(itemId, width: 400);
return _BookGroup(
+ // A search keeps every match in view, folded or not.
+ expanded: _query.isNotEmpty || _expanded.contains(itemId),
+ onToggleExpanded: () => setState(() {
+ if (!_expanded.remove(itemId)) _expanded.add(itemId);
+ }),
itemId: itemId,
title: resolvedTitle,
subtitle: _resolveShowTitle(itemId),
@@ -766,14 +825,25 @@ class _BookmarksScreenState extends State<BookmarksScreen>
return _emptyState(
cs, tt, Icons.format_quote_rounded, l.readerNoHighlights);
}
+ final groups = _filteredHighlights();
+ if (groups.isEmpty) {
+ return _emptyState(
+ cs, tt, Icons.search_off_rounded, l.bookmarksNoMatches);
+ }
return ListView.builder(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
- itemCount: _highlights.length,
+ itemCount: groups.length,
itemBuilder: (ctx, i) {
final lib = context.read<LibraryProvider>();
- final itemId = _highlights.keys.elementAt(i);
- final highlights = _highlights[itemId]!;
+ final itemId = groups.keys.elementAt(i);
+ final highlights = groups[itemId]!;
return _HighlightGroup(
+ expanded: _query.isNotEmpty || _expandedHighlights.contains(itemId),
+ onToggleExpanded: () => setState(() {
+ if (!_expandedHighlights.remove(itemId)) {
+ _expandedHighlights.add(itemId);
+ }
+ }),
itemId: itemId,
title: _resolveTitle(itemId),
coverUrl: lib.getCoverUrl(itemId, width: 400),
@@ -871,6 +941,37 @@ class _BookmarksScreenState extends State<BookmarksScreen>
),
const SizedBox(height: 12),
+ if (_allBookmarks.isNotEmpty || _highlights.isNotEmpty)
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 10),
+ child: TextField(
+ controller: _searchCtl,
+ onChanged: (v) =>
+ setState(() => _query = v.trim().toLowerCase()),
+ textInputAction: TextInputAction.search,
+ decoration: InputDecoration(
+ hintText: l.bookmarksSearchHint,
+ prefixIcon: const Icon(Icons.search_rounded),
+ suffixIcon: _query.isEmpty
+ ? null
+ : IconButton(
+ icon: const Icon(Icons.close_rounded),
+ onPressed: () {
+ _searchCtl.clear();
+ setState(() => _query = '');
+ },
+ ),
+ isDense: true,
+ filled: true,
+ fillColor: cs.surfaceContainerHigh,
+ border: OutlineInputBorder(
+ borderRadius: BorderRadius.circular(14),
+ borderSide: BorderSide.none,
+ ),
+ ),
+ ),
+ ),
+
// Audiobook bookmarks and ebook highlights, tabbed only once
// there's at least one highlight to show.
if (_highlights.isNotEmpty)
@@ -958,8 +1059,12 @@ class _BookGroup extends StatelessWidget {
final VoidCallback onToggleGroup;
final void Function(String itemId, String bookmarkId) onLongPress;
final void Function(String itemId, Bookmark bookmark) onJump;
+ final bool expanded;
+ final VoidCallback onToggleExpanded;
const _BookGroup({
+ required this.expanded,
+ required this.onToggleExpanded,
required this.itemId,
required this.title,
this.subtitle,
@@ -997,7 +1102,8 @@ class _BookGroup extends StatelessWidget {
children: [
// Book header with cover + title
GestureDetector(
- onTap: selecting ? onToggleGroup : null,
+ behavior: HitTestBehavior.opaque,
+ onTap: selecting ? onToggleGroup : onToggleExpanded,
child: Row(children: [
if (selecting)
Padding(
@@ -1045,10 +1151,18 @@ class _BookGroup extends StatelessWidget {
'${bookmarks.length}',
style: tt.labelSmall?.copyWith(color: cs.onSurfaceVariant),
),
+ if (!selecting)
+ AnimatedRotation(
+ turns: expanded ? 0 : -0.25,
+ duration: const Duration(milliseconds: 150),
+ child: Icon(Icons.expand_more_rounded,
+ size: 20, color: cs.onSurfaceVariant),
+ ),
]),
),
- const SizedBox(height: 8),
+ if (expanded) const SizedBox(height: 8),
// Bookmark rows
+ if (expanded)
for (var j = 0; j < bookmarks.length; j++) ...[
if (j > 0) Divider(height: 1, indent: selecting ? 32 : 28, endIndent: 0, color: cs.outlineVariant.withValues(alpha: 0.3)),
_BookmarkRow(
@@ -1225,8 +1339,12 @@ class _HighlightGroup extends StatelessWidget {
final void Function(String itemId, String annotationId) onToggle;
final VoidCallback onToggleGroup;
final void Function(String itemId, String annotationId) onLongPress;
+ final bool expanded;
+ final VoidCallback onToggleExpanded;
const _HighlightGroup({
+ required this.expanded,
+ required this.onToggleExpanded,
required this.itemId,
required this.title,
this.coverUrl,
@@ -1261,7 +1379,8 @@ class _HighlightGroup extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
- onTap: selecting ? onToggleGroup : null,
+ behavior: HitTestBehavior.opaque,
+ onTap: selecting ? onToggleGroup : onToggleExpanded,
child: Row(children: [
if (selecting)
Padding(
@@ -1303,9 +1422,17 @@ class _HighlightGroup extends StatelessWidget {
'${highlights.length}',
style: tt.labelSmall?.copyWith(color: cs.onSurfaceVariant),
),
+ if (!selecting)
+ AnimatedRotation(
+ turns: expanded ? 0 : -0.25,
+ duration: const Duration(milliseconds: 150),
+ child: Icon(Icons.expand_more_rounded,
+ size: 20, color: cs.onSurfaceVariant),
+ ),
]),
),
- const SizedBox(height: 8),
+ if (expanded) const SizedBox(height: 8),
+ if (expanded)
for (var j = 0; j < highlights.length; j++) ...[
if (j > 0)
Divider(height: 1, indent: 14, color: cs.outlineVariant.withValues(alpha: 0.3)),