Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Make Siri play the book you ask for instead of a podcast, show Download to Absorb on narrated EPUBs, put narrated books you're listening to in Continue Listening, give Continue Reading the big cards with an option to open details on tap, and close the gap under the iPad library header

Barnabas23d90f800510
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index adfcdeb6..ff1078bc 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -95,6 +95,21 @@
<string>INMediaCategoryAudiobooks</string>
<string>INMediaCategoryPodcasts</string>
</array>
+ <key>INAlternativeAppNames</key>
+ <array>
+ <dict>
+ <key>INAlternativeAppName</key>
+ <string>Absorb Audiobooks</string>
+ <key>INAlternativeAppNamePronunciationHint</key>
+ <string>ab sorb audio books</string>
+ </dict>
+ <dict>
+ <key>INAlternativeAppName</key>
+ <string>Absorb Player</string>
+ <key>INAlternativeAppNamePronunciationHint</key>
+ <string>ab sorb player</string>
+ </dict>
+ </array>
<key>NSUserActivityTypes</key>
<array>
<string>INPlayMediaIntent</string>
diff --git a/ios/Runner/SiriMedia.swift b/ios/Runner/SiriMedia.swift
index 57604cb6..cbab38ba 100644
--- a/ios/Runner/SiriMedia.swift
+++ b/ios/Runner/SiriMedia.swift
@@ -231,18 +231,28 @@ enum SiriLibrary {
let query = normalize(name ?? artist ?? "")
if query.isEmpty { return [] }
let byAuthor = name == nil
- let hits = catalog().filter { entry in
+ func fits(_ entry: [String: Any], _ type: String) -> Bool {
let kind = entry["kind"] as? String ?? "book"
switch type {
- case "book": if kind != "book" && kind != "series" { return false }
- case "podcast", "episode": if kind != "podcast" && kind != "episode" { return false }
- default: break
+ case "book": return kind == "book" || kind == "series"
+ case "podcast", "episode": return kind == "podcast" || kind == "episode"
+ default: return true
}
+ }
+ // Siri's media type is often its own guess (a book title it also knows as
+ // a podcast show comes in as a podcast), so it only orders the hits,
+ // unless "podcast" or "episode" was said.
+ let saysPodcast = (name ?? "").range(
+ of: #"\b(podcast|episode)s?\b"#, options: [.regularExpression, .caseInsensitive]) != nil
+ let hits = catalog().filter { entry in
+ if saysPodcast && !fits(entry, "podcast") { return false }
let field = normalize(entry[byAuthor ? "author" : "title"] as? String ?? "")
return !field.isEmpty && (field == query || field.contains(query))
}
let exact = hits.filter { normalize($0[byAuthor ? "author" : "title"] as? String ?? "") == query }
- return Array((exact.isEmpty ? hits : exact).prefix(4))
+ let pool = exact.isEmpty ? hits : exact
+ let ordered = pool.filter { fits($0, type) } + pool.filter { !fits($0, type) }
+ return Array(ordered.prefix(4))
}
}
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 0a044d16..969369b9 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -44,6 +44,7 @@
"stay": "Stay",
"homeTitle": "Home",
"continueListening": "Continue Listening",
+ "continueReading": "Continue Reading",
"continueSeries": "Continue Series",
"recentlyAdded": "Recently Added",
"listenAgain": "Listen Again",
@@ -1642,6 +1643,9 @@
"hideEbookOnlyTitles": "Hide eBook-only titles",
"hideEbookOnlyOnSubtitle": "Books with no audio files are hidden",
"hideEbookOnlyOffSubtitle": "Off - all library items shown",
+ "homeCardsOpenDetails": "Open details from Home",
+ "homeCardsOpenDetailsOnSubtitle": "Tapping a Continue Listening or Continue Reading card opens its details",
+ "homeCardsOpenDetailsOffSubtitle": "Tapping a Continue Listening or Continue Reading card picks up where you left off",
"showGoodreadsButton": "Show Goodreads button",
"showGoodreadsOnSubtitle": "Book detail sheet shows a link to Goodreads",
"showGoodreadsOffSubtitle": "Off - Goodreads button hidden",
@@ -5894,6 +5898,7 @@
"narrationDownloadTitle": "Download to listen",
"narrationDownloadBody": "This book is an EPUB3 that reads itself aloud. Audiobookshelf can't stream its narration, so the audio needs to be downloaded before it plays.",
"narrationDownloadStarted": "Downloading the narration. Tap Absorb when it finishes.",
+ "downloadToAbsorb": "Download to Absorb",
"narrationUpNextTitle": "Download what's up next",
"narrationUpNextBody": "{title} is next in your queue. It's an EPUB3 that reads itself aloud, so it needs to be downloaded before it can play.",
"@narrationUpNextBody": {
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 087cc21f..eb1bb787 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -352,6 +352,12 @@ abstract class AppLocalizations {
/// **'Continue Listening'**
String get continueListening;
+ /// No description provided for @continueReading.
+ ///
+ /// In en, this message translates to:
+ /// **'Continue Reading'**
+ String get continueReading;
+
/// No description provided for @continueSeries.
///
/// In en, this message translates to:
@@ -5554,6 +5560,24 @@ abstract class AppLocalizations {
/// **'Off - all library items shown'**
String get hideEbookOnlyOffSubtitle;
+ /// No description provided for @homeCardsOpenDetails.
+ ///
+ /// In en, this message translates to:
+ /// **'Open details from Home'**
+ String get homeCardsOpenDetails;
+
+ /// No description provided for @homeCardsOpenDetailsOnSubtitle.
+ ///
+ /// In en, this message translates to:
+ /// **'Tapping a Continue Listening or Continue Reading card opens its details'**
+ String get homeCardsOpenDetailsOnSubtitle;
+
+ /// No description provided for @homeCardsOpenDetailsOffSubtitle.
+ ///
+ /// In en, this message translates to:
+ /// **'Tapping a Continue Listening or Continue Reading card picks up where you left off'**
+ String get homeCardsOpenDetailsOffSubtitle;
+
/// No description provided for @showGoodreadsButton.
///
/// In en, this message translates to:
@@ -18423,6 +18447,12 @@ abstract class AppLocalizations {
/// **'Downloading the narration. Tap Absorb when it finishes.'**
String get narrationDownloadStarted;
+ /// No description provided for @downloadToAbsorb.
+ ///
+ /// In en, this message translates to:
+ /// **'Download to Absorb'**
+ String get downloadToAbsorb;
+
/// No description provided for @narrationUpNextTitle.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 4f72fa67..02bc0f76 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -132,6 +132,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get continueListening => 'Weiterhören';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Serie fortsetzen';
@@ -3156,6 +3159,17 @@ class AppLocalizationsDe extends AppLocalizations {
String get hideEbookOnlyOffSubtitle =>
'Aus - alle Bibliothekselemente werden angezeigt';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Goodreads-Button anzeigen';
@@ -10823,6 +10837,9 @@ class AppLocalizationsDe extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dart
index 597ea060..c0e43259 100644
--- a/lib/l10n/app_localizations_el.dart
+++ b/lib/l10n/app_localizations_el.dart
@@ -131,6 +131,9 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsEl extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index cd5efd08..99783646 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -131,6 +131,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsEn extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 61afba72..36ec8964 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -131,6 +131,9 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get continueListening => 'Continuar escuchando';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continuar Serie';
@@ -3132,6 +3135,17 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10704,6 +10718,9 @@ class AppLocalizationsEs extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index c81863e9..57c45e5a 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -132,6 +132,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get continueListening => 'Continuer l\'écoute';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continuer les séries';
@@ -3163,6 +3166,17 @@ class AppLocalizationsFr extends AppLocalizations {
String get hideEbookOnlyOffSubtitle =>
'Désactivé - tous les éléments de la bibliothèque sont affichés';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Afficher le bouton Goodreads';
@@ -10755,6 +10769,9 @@ class AppLocalizationsFr extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 831a8119..acab530e 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -131,6 +131,9 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsIt extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 5ad37acb..4cfbf32a 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -131,6 +131,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsJa extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dart
index bb3b2435..b8080f58 100644
--- a/lib/l10n/app_localizations_no.dart
+++ b/lib/l10n/app_localizations_no.dart
@@ -131,6 +131,9 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsNo extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index d9d801fe..da87dc37 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -131,6 +131,9 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsPt extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dart
index 8c76b884..0f309f6b 100644
--- a/lib/l10n/app_localizations_ro.dart
+++ b/lib/l10n/app_localizations_ro.dart
@@ -131,6 +131,9 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3130,6 +3133,17 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10702,6 +10716,9 @@ class AppLocalizationsRo extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 070711d3..66ac3e60 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -132,6 +132,9 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get continueListening => 'Continue Listening';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => 'Continue Series';
@@ -3134,6 +3137,17 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => 'Off - all library items shown';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle =>
+ 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => 'Show Goodreads button';
@@ -10707,6 +10721,9 @@ class AppLocalizationsRu extends AppLocalizations {
String get narrationDownloadStarted =>
'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 0b410649..a3f1e174 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -127,6 +127,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get continueListening => '继续收听';
+ @override
+ String get continueReading => 'Continue Reading';
+
@override
String get continueSeries => '继续收听系列';
@@ -3025,6 +3028,15 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get hideEbookOnlyOffSubtitle => '关 - 显示所有媒体库项目';
+ @override
+ String get homeCardsOpenDetails => 'Open details from Home';
+
+ @override
+ String get homeCardsOpenDetailsOnSubtitle => 'Tapping a Continue Listening or Continue Reading card opens its details';
+
+ @override
+ String get homeCardsOpenDetailsOffSubtitle => 'Tapping a Continue Listening or Continue Reading card picks up where you left off';
+
@override
String get showGoodreadsButton => '显示 Goodreads 按钮';
@@ -10296,6 +10308,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get narrationDownloadStarted => 'Downloading the narration. Tap Absorb when it finishes.';
+ @override
+ String get downloadToAbsorb => 'Download to Absorb';
+
@override
String get narrationUpNextTitle => 'Download what\'s up next';
diff --git a/lib/providers/_lp_core.dart b/lib/providers/_lp_core.dart
index c4484c5e..9d5ca205 100644
--- a/lib/providers/_lp_core.dart
+++ b/lib/providers/_lp_core.dart
@@ -1959,6 +1959,7 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {
}
}
}
+ _narratedToContinueListening();
await (this as _AbsorbingMixin)._updateAbsorbingCache();
_injectDownloadedSection();
@@ -2090,6 +2091,68 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {
}
_personalizedSections = merged;
+ _narratedToContinueListening();
+ }
+
+ /// Audiobookshelf sees only an ebook in an EPUB that reads itself aloud, so
+ /// one being listened to comes back under Continue Reading. Absorb plays it
+ /// as an audiobook, so while it has listening progress it moves to Continue
+ /// Listening. One only being read stays where it is.
+ void _narratedToContinueListening() {
+ final api = _api;
+ if (api == null || api.isBookOrbit || isPodcastLibrary) return;
+ final sections = _personalizedSections;
+ final ri = sections.indexWhere((s) => s is Map<String, dynamic> && s['id'] == 'continue-reading');
+ if (ri < 0) return;
+ final reading = sections[ri] as Map<String, dynamic>;
+ final keep = <dynamic>[];
+ final moved = <Map<String, dynamic>>[];
+ for (final e in (reading['entities'] as List<dynamic>? ?? const [])) {
+ final id = e is Map<String, dynamic> ? e['id'] as String? : null;
+ final listened = id != null &&
+ NarratedBooks.contains(id) &&
+ _progressMap[id]?['isFinished'] != true &&
+ (((_progressMap[id]?['currentTime'] as num?) ?? 0) > 0 ||
+ (_localProgressOverrides[id] ?? 0) > 0);
+ if (listened) {
+ moved.add(e as Map<String, dynamic>);
+ } else {
+ keep.add(e);
+ }
+ }
+ if (moved.isEmpty) return;
+
+ final li = sections.indexWhere((s) => s is Map<String, dynamic> && s['id'] == 'continue-listening');
+ final listening = li < 0 ? null : sections[li] as Map<String, dynamic>;
+ final entities = List<dynamic>.from(listening?['entities'] as List<dynamic>? ?? const []);
+ int at(dynamic e) {
+ if (e is! Map<String, dynamic>) return 0;
+ final v = e['progressLastUpdate'] ?? _progressMap[e['id']]?['lastUpdate'];
+ return v is num ? v.toInt() : 0;
+ }
+ for (final m in moved) {
+ if (entities.any((e) => e is Map<String, dynamic> && e['id'] == m['id'])) continue;
+ final when = at(m);
+ final i = entities.indexWhere((e) => at(e) < when);
+ entities.insert(i < 0 ? entities.length : i, m);
+ }
+
+ final next = List<dynamic>.from(sections);
+ next[ri] = {...reading, 'entities': keep};
+ final shelf = <String, dynamic>{
+ ...?listening,
+ 'id': 'continue-listening',
+ 'label': listening?['label'] ?? 'Continue Listening',
+ 'type': listening?['type'] ?? 'book',
+ 'entities': entities,
+ };
+ if (li < 0) {
+ next.insert(0, shelf);
+ } else {
+ next[li] = shelf;
+ }
+ _personalizedSections = next;
+ debugPrint('[Narration] ${moved.length} narrated book(s) moved from Continue Reading to Continue Listening');
}
void _hydrateRssFeedFieldsDeferred() {
diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dart
index 0b1da534..f7f8f57c 100644
--- a/lib/providers/library_provider.dart
+++ b/lib/providers/library_provider.dart
@@ -31,6 +31,7 @@ import '../widgets/overlay_toast.dart';
import '../services/ebook_cache.dart';
import '../services/screen_wake.dart';
import '../services/up_next_narration.dart';
+import '../services/narrated_books.dart';
part '_lp_state.dart';
part '_lp_core.dart';
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index ad5dd818..f6b329e4 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -12,8 +12,11 @@ import '../providers/library_provider.dart';
import '../services/audio_player_service.dart';
import '../services/download_service.dart';
import '../services/ebook_cache.dart';
+import '../services/narrated_books.dart';
+import '../services/narration_service.dart';
import '../widgets/ebook_router.dart';
import '../widgets/overlay_toast.dart';
+import '../widgets/narration_download_dialog.dart';
import '../widgets/desktop_batch_actions.dart';
import '../widgets/home_section.dart';
import '../widgets/absorb_page_header.dart';
@@ -47,6 +50,7 @@ class HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateMi
bool _hideEbookOnly = false;
bool _rectangleCovers = false;
bool _showSubtitles = false;
+ bool _cardsOpenDetails = false;
// ── Batch selection ──
bool _selectionMode = false;
@@ -216,11 +220,13 @@ class HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateMi
PlayerSettings.getHideEbookOnly(),
PlayerSettings.getRectangleCoversFor(libId),
PlayerSettings.getShowSubtitlesFor(libId),
+ PlayerSettings.getHomeCardsOpenDetails(),
]);
if (mounted) setState(() {
_hideEbookOnly = results[0];
_rectangleCovers = results[1];
_showSubtitles = results[2];
+ _cardsOpenDetails = results[3];
});
}
@@ -330,8 +336,99 @@ class HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateMi
}
}
+ /// A heading that opens the whole shelf, over a row of big cover cards.
+ /// Reading cards open the reader instead of playing.
+ List<Widget> _heroShelf({
+ required LibraryProvider lib,
+ required String title,
+ required IconData icon,
+ required List<dynamic> items,
+ required bool reading,
+ required bool selectionAvailable,
+ }) {
+ if (items.isEmpty) return const <Widget>[];
+ final cs = Theme.of(context).colorScheme;
+ final tt = Theme.of(context).textTheme;
+ return <Widget>[
+ SliverToBoxAdapter(
+ child: GestureDetector(
+ onTap: () => SectionDetailSheet.show(
+ context,
+ title: title,
+ icon: icon,
+ entities: items,
+ coverAspectRatio: _rectangleCovers ? 2 / 3 : 1.0,
+ ),
+ behavior: HitTestBehavior.opaque,
+ child: Padding(
+ padding: const EdgeInsets.fromLTRB(20, 24, 20, 0),
+ child: Row(children: [
+ Icon(icon, size: 16, color: cs.primary.withValues(alpha: 0.7)),
+ const SizedBox(width: 8),
+ Text(title,
+ style: tt.titleSmall?.copyWith(
+ fontWeight: FontWeight.w500,
+ color: cs.onSurface.withValues(alpha: 0.8),
+ letterSpacing: 0.3,
+ )),
+ const SizedBox(width: 4),
+ Icon(Icons.chevron_right_rounded, size: 16,
+ color: cs.onSurfaceVariant.withValues(alpha: 0.4)),
+ const SizedBox(width: 12),
+ Expanded(child: Container(height: 0.5,
+ color: cs.outlineVariant.withValues(alpha: 0.2))),
+ ]),
+ ),
+ ),
+ ),
+ if (!reading && !_cardsOpenDetails)
+ const SliverToBoxAdapter(
+ child: FeatureHint(
+ prefKey: 'hint_continue_listening_gestures',
+ message:
+ 'Tap a card to resume. Press and hold to see details.',
+ ),
+ ),
+ SliverToBoxAdapter(
+ child: Padding(
+ padding: const EdgeInsets.only(top: 12),
+ child: SizedBox(
+ // Taller row when 2:3 covers are on; the card's
+ // cover alone is ~225 with rectangle covers.
+ height: _rectangleCovers ? 320 : 250,
+ child: ListView.separated(
+ scrollDirection: Axis.horizontal,
+ padding: const EdgeInsets.symmetric(horizontal: 20),
+ physics: const BouncingScrollPhysics(),
+ itemCount: items.length,
+ separatorBuilder: (_, __) => const SizedBox(width: 10),
+ itemBuilder: (context, i) {
+ final item = items[i] as Map<String, dynamic>;
+ return RepaintBoundary(child: _ContinueListeningCard(
+ item: item, lib: lib, player: _player,
+ rectangleCovers: _rectangleCovers,
+ reading: reading,
+ tapOpensDetails: _cardsOpenDetails,
+ selectionMode: selectionAvailable && _selectionMode,
+ selected: _selectedItemIds
+ .contains(item['id'] as String?),
+ onSelectionToggle: selectionAvailable &&
+ item['recentEpisode'] == null &&
+ item['id'] is String
+ ? () => _toggleSelection(item)
+ : null,
+ ));
+ },
+ ),
+ ),
+ ),
+ ),
+ ];
+ }
+
static const _sectionIcons = {
'continue-listening': Icons.play_circle_outline_rounded,
+ 'continue-reading': Icons.menu_book_rounded,
'continue-series': Icons.auto_stories_rounded,
'recently-added': Icons.new_releases_outlined,
'listen-again': Icons.replay_rounded,
@@ -653,83 +750,29 @@ class HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateMi
// Playlists/collections are server-only; hide when offline
if ((isPlaylist || isCollection) && lib.isOffline) return <Widget>[];
- // Continue Listening gets its own compact card layout
+ // Continue Listening and Continue Reading get the big
+ // cover cards.
if (id == 'continue-listening') {
- final clItems = _cachedClItems ?? [];
- if (clItems.isEmpty) return <Widget>[];
- return <Widget>[
- SliverToBoxAdapter(
- child: GestureDetector(
- onTap: () => SectionDetailSheet.show(
- context,
- title: l.continueListening,
- icon: Icons.play_circle_outline_rounded,
- entities: clItems,
- coverAspectRatio: _rectangleCovers ? 2 / 3 : 1.0,
- ),
- behavior: HitTestBehavior.opaque,
- child: Padding(
- padding: const EdgeInsets.fromLTRB(20, 24, 20, 0),
- child: Row(children: [
- Icon(Icons.play_circle_outline_rounded,
- size: 16, color: cs.primary.withValues(alpha: 0.7)),
- const SizedBox(width: 8),
- Text(l.continueListening,
- style: tt.titleSmall?.copyWith(
- fontWeight: FontWeight.w500,
- color: cs.onSurface.withValues(alpha: 0.8),
- letterSpacing: 0.3,
- )),
- const SizedBox(width: 4),
- Icon(Icons.chevron_right_rounded, size: 16,
- color: cs.onSurfaceVariant.withValues(alpha: 0.4)),
- const SizedBox(width: 12),
- Expanded(child: Container(height: 0.5,
- color: cs.outlineVariant.withValues(alpha: 0.2))),
- ]),
- ),
- ),
- ),
- const SliverToBoxAdapter(
- child: FeatureHint(
- prefKey: 'hint_continue_listening_gestures',
- message:
- 'Tap a card to resume. Press and hold to see details.',
- ),
- ),
- SliverToBoxAdapter(
- child: Padding(
- padding: const EdgeInsets.only(top: 12),
- child: SizedBox(
- // Taller row when 2:3 covers are on; the card's
- // cover alone is ~225 with rectangle covers.
- height: _rectangleCovers ? 320 : 250,
- child: ListView.separated(
- scrollDirection: Axis.horizontal,
- padding: const EdgeInsets.symmetric(horizontal: 20),
- physics: const BouncingScrollPhysics(),
- itemCount: clItems.length,
- separatorBuilder: (_, __) => const SizedBox(width: 10),
- itemBuilder: (context, i) {
- final item = clItems[i] as Map<String, dynamic>;
- return RepaintBoundary(child: _ContinueListeningCard(
- item: item, lib: lib, player: _player,
- rectangleCovers: _rectangleCovers,
- selectionMode: selectionAvailable && _selectionMode,
- selected: _selectedItemIds
- .contains(item['id'] as String?),
- onSelectionToggle: selectionAvailable &&
- item['recentEpisode'] == null &&
- item['id'] is String
- ? () => _toggleSelection(item)
- : null,
- ));
- },
- ),
- ),
- ),
- ),
- ];
+ return _heroShelf(
+ lib: lib,
+ title: l.continueListening,
+ icon: Icons.play_circle_outline_rounded,
+ items: _cachedClItems ?? const [],
+ reading: false,
+ selectionAvailable: selectionAvailable,
+ );
+ }
+ if (id == 'continue-reading') {
+ return _heroShelf(
+ lib: lib,
+ title: sectionLabel(id, section['label'] as String?, l),
+ icon: Icons.menu_book_rounded,
+ items: _filterEbookOnly(
+ (section['entities'] as List<dynamic>?) ?? [],
+ sectionType: section['type'] as String?),
+ reading: true,
+ selectionAvailable: selectionAvailable,
+ );
}
final label = sectionLabel(id, section['label'] as String?, l);
@@ -823,6 +866,9 @@ class _ContinueListeningCard extends StatefulWidget {
final LibraryProvider lib;
final AudioPlayerService player;
final bool rectangleCovers;
+ // A Continue Reading card: reading progress, and opens the reader.
+ final bool reading;
+ final bool tapOpensDetails;
final bool selectionMode;
final bool selected;
final VoidCallback? onSelectionToggle;
@@ -832,6 +878,8 @@ class _ContinueListeningCard extends StatefulWidget {
required this.lib,
required this.player,
required this.rectangleCovers,
+ this.reading = false,
+ this.tapOpensDetails = false,
this.selectionMode = false,
this.selected = false,
this.onSelectionToggle,
@@ -855,7 +903,8 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
Widget _buildCoverImage(String? coverUrl, ColorScheme cs, Map<String, String> headers) {
final fallback = Container(
color: cs.surfaceContainerHighest,
- child: Icon(Icons.headphones_rounded, size: 32, color: cs.onSurfaceVariant),
+ child: Icon(widget.reading ? Icons.menu_book_rounded : Icons.headphones_rounded,
+ size: 32, color: cs.onSurfaceVariant),
);
if (coverUrl == null) return fallback;
@@ -959,7 +1008,7 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
final progressData = episodeId != null
? lib.getEpisodeProgressData(itemId, episodeId)
: lib.getProgressData(itemId);
- final isCurrentItem = player.currentItemId == itemId;
+ final isCurrentItem = !widget.reading && player.currentItemId == itemId;
final serverCurrentTime = (progressData?['currentTime'] as num?)?.toDouble() ?? 0;
double currentTime;
@@ -1005,14 +1054,18 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
HSLColor.fromColor(accent).saturation.clamp(0.35, 1.0))
.toColor()
: accent;
- final progressValue =
- (totalDuration > 0 ? currentTime / totalDuration : progress).clamp(0.0, 1.0);
- final remaining = totalDuration > 0 ? totalDuration - currentTime : 0.0;
+ // BookOrbit carries an ebook-only book's reading percent as its plain
+ // progress, with no ebook field.
+ final readSaved = widget.reading ? lib.getEbookProgress(itemId) : 0.0;
+ final progressValue = widget.reading
+ ? (readSaved > 0 ? readSaved : (PlayerSettings.isEbookOnly(item) ? progress : 0.0)).clamp(0.0, 1.0)
+ : (totalDuration > 0 ? currentTime / totalDuration : progress).clamp(0.0, 1.0);
+ final remaining = !widget.reading && totalDuration > 0 ? totalDuration - currentTime : 0.0;
void resume() {
if (_isLoading) return;
// Nothing to play: an ebook-only book continues in the reader.
- if (recentEpisode == null && PlayerSettings.isEbookOnly(item)) {
+ if (recentEpisode == null && (widget.reading || PlayerSettings.isEbookOnly(item))) {
_openEbook(context, itemId, title);
return;
}
@@ -1071,7 +1124,11 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
),
),
child: InkWell(
- onTap: widget.selectionMode ? widget.onSelectionToggle : resume,
+ onTap: widget.selectionMode
+ ? widget.onSelectionToggle
+ : widget.tapOpensDetails
+ ? openDetails
+ : resume,
onLongPress: widget.selectionMode ? null : openQuickActions,
borderRadius: BorderRadius.circular(14),
child: SizedBox(
@@ -1304,6 +1361,30 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
return;
}
+ // An Audiobookshelf EPUB that reads itself aloud plays from the phone, so
+ // its narration is downloaded first.
+ if (!auth.isBookOrbit &&
+ NarratedBooks.contains(itemId) &&
+ !NarrationService.instance.hasLocalAudio(itemId)) {
+ setState(() => _isLoading = false);
+ if (DownloadService().isDownloading(itemId)) {
+ showOverlayToast(context, AppLocalizations.of(context)!.narrationDownloadStarted,
+ icon: Icons.download_rounded);
+ return;
+ }
+ final media = widget.item['media'] as Map<String, dynamic>? ?? {};
+ final metadata = media['metadata'] as Map<String, dynamic>? ?? {};
+ await showNarrationDownloadDialog(
+ context,
+ itemId: itemId,
+ title: metadata['title'] as String? ?? '',
+ author: metadata['authorName'] as String?,
+ coverUrl: widget.lib.getCoverUrl(itemId),
+ libraryId: widget.item['libraryId'] as String?,
+ );
+ return;
+ }
+
final String title;
final String author;
double duration;
diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dart
index 44d2893d..bd0ac57c 100644
--- a/lib/screens/library_screen.dart
+++ b/lib/screens/library_screen.dart
@@ -3081,8 +3081,11 @@ class LibraryScreenState extends State<LibraryScreen>
elevation: 0,
scrolledUnderElevation: 0,
automaticallyImplyLeading: false,
+ // The bar is laid out loosely, so the header fills its full height
+ // itself rather than leaving a bare strip under the count row.
flexibleSpace: ClipRect(
child: Stack(
+ fit: StackFit.expand,
children: [
Positioned.fill(child: headerBackground),
Column(
@@ -3160,6 +3163,9 @@ class LibraryScreenState extends State<LibraryScreen>
),
),
),
+ // Holds the row at the select button's height on
+ // tabs without it, so the search bar doesn't jump.
+ if (!canSelectItems) const SizedBox(height: 48),
if (canSelectItems)
Tooltip(
message: _selectionMode
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 7c0517cb..3668d395 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -150,6 +150,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
int _maxConcurrentDownloads = 1;
bool _hideEbookOnly = false;
bool _showGoodreadsButton = false;
+ bool _homeCardsOpenDetails = false;
bool _showExplicitBadge = true;
bool _showEbookBadge = true;
bool _loggingEnabled = false;
@@ -1206,6 +1207,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
_loaded = true;
});
+ final cardsOpenDetails = await PlayerSettings.getHomeCardsOpenDetails();
+ if (mounted) setState(() => _homeCardsOpenDetails = cardsOpenDetails);
final libId = mounted ? context.read<LibraryProvider>().selectedLibraryId : null;
if (libId != null) _loadCurrentLibraryOverrides(libId);
if (Platform.isIOS) _refreshSiriStatus();
@@ -3962,6 +3965,20 @@ class _SettingsScreenState extends State<SettingsScreen> {
} : null,
),
const Divider(height: 1, indent: 16, endIndent: 16),
+ SwitchListTile(
+ title: Text(l.homeCardsOpenDetails),
+ subtitle: Text(
+ _homeCardsOpenDetails
+ ? l.homeCardsOpenDetailsOnSubtitle
+ : l.homeCardsOpenDetailsOffSubtitle,
+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),
+ value: _homeCardsOpenDetails,
+ onChanged: _loaded ? (v) {
+ setState(() => _homeCardsOpenDetails = v);
+ PlayerSettings.setHomeCardsOpenDetails(v);
+ } : null,
+ ),
+ const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
title: Text(l.showGoodreadsButton),
subtitle: Text(
diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart
index 4b9c17c9..265d5e95 100644
--- a/lib/services/backup_service.dart
+++ b/lib/services/backup_service.dart
@@ -47,6 +47,7 @@ class BackupService {
'sleepChime': await PlayerSettings.getSleepChime(),
'sleepChimeVolume': await PlayerSettings.getSleepChimeVolume(),
'hideEbookOnly': await PlayerSettings.getHideEbookOnly(),
+ 'homeCardsOpenDetails': await PlayerSettings.getHomeCardsOpenDetails(),
'collapseSeries': await PlayerSettings.getCollapseSeries(),
'librarySort': await PlayerSettings.getLibrarySort(),
'librarySortAsc': await PlayerSettings.getLibrarySortAsc(),
@@ -559,6 +560,7 @@ class BackupService {
if (s['sleepChime'] != null) PlayerSettings.setSleepChime(s['sleepChime'] as bool);
if (s['sleepChimeVolume'] != null) PlayerSettings.setSleepChimeVolume((s['sleepChimeVolume'] as num).toDouble());
if (s['hideEbookOnly'] != null) PlayerSettings.setHideEbookOnly(s['hideEbookOnly'] as bool);
+ if (s['homeCardsOpenDetails'] != null) PlayerSettings.setHomeCardsOpenDetails(s['homeCardsOpenDetails'] as bool);
if (s['collapseSeries'] != null) PlayerSettings.setCollapseSeries(s['collapseSeries'] as bool);
if (s['librarySort'] != null) PlayerSettings.setLibrarySort(s['librarySort'] as String);
if (s['librarySortAsc'] != null) PlayerSettings.setLibrarySortAsc(s['librarySortAsc'] as bool);
diff --git a/lib/services/narrated_books.dart b/lib/services/narrated_books.dart
index 6ee7d603..11257a72 100644
--- a/lib/services/narrated_books.dart
+++ b/lib/services/narrated_books.dart
@@ -4,14 +4,18 @@ import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
/// Audiobookshelf books whose EPUB reads itself aloud, as found on this
-/// phone (the server only sees an ebook). Held in memory so the quick "is
-/// this ebook only" checks can count them as audiobooks. Item ids are unique
-/// across servers, so one list serves every account.
+/// phone (the server only sees an ebook), and the EPUBs looked into that
+/// don't. Held in memory so the quick "is this ebook only" checks can count
+/// them as audiobooks, and the detail sheet knows straight away which
+/// buttons a book gets. Item ids are unique across servers, so one list
+/// serves every account.
class NarratedBooks {
NarratedBooks._();
static const _key = 'narrated_books';
+ static const _plainKey = 'plain_epubs';
static final Map<String, double> _durations = {};
+ static final Set<String> _plain = {};
static Future<void>? _loading;
static Future<void> load() => _loading ??= _load();
@@ -26,10 +30,18 @@ class NarratedBooks {
} catch (e) {
debugPrint('[Narration] reading the narrated books failed: $e');
}
+ try {
+ _plain.addAll((await SharedPreferences.getInstance()).getStringList(_plainKey) ?? const []);
+ } catch (e) {
+ debugPrint('[Narration] reading the narrated books failed: $e');
+ }
}
static bool contains(Object? itemId) => itemId is String && _durations.containsKey(itemId);
+ /// Whether this phone has looked into [itemId]'s EPUB, either way.
+ static bool checked(Object? itemId) => itemId is String && (_durations.containsKey(itemId) || _plain.contains(itemId));
+
static double? duration(String itemId) => _durations[itemId];
/// Notes [itemId] as narrated with [duration] seconds, or as not narrated.
@@ -38,11 +50,15 @@ class NarratedBooks {
if (duration != null && duration > 0) {
if (_durations[itemId] == duration) return;
_durations[itemId] = duration;
- } else if (_durations.remove(itemId) == null) {
- return;
+ _plain.remove(itemId);
+ } else {
+ final dropped = _durations.remove(itemId) != null;
+ if (!_plain.add(itemId) && !dropped) return;
}
try {
- await (await SharedPreferences.getInstance()).setString(_key, jsonEncode(_durations));
+ final prefs = await SharedPreferences.getInstance();
+ await prefs.setString(_key, jsonEncode(_durations));
+ await prefs.setStringList(_plainKey, _plain.toList());
} catch (e) {
debugPrint('[Narration] saving the narrated books failed: $e');
}
@@ -51,6 +67,7 @@ class NarratedBooks {
@visibleForTesting
static void debugSet(Map<String, double> durations) {
_loading = Future.value();
+ _plain.clear();
_durations
..clear()
..addAll(durations);
diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dart
index 9389994b..b437d945 100644
--- a/lib/services/player_settings.dart
+++ b/lib/services/player_settings.dart
@@ -964,6 +964,11 @@ class PlayerSettings {
static Future<bool> getHideEbookOnly() => _get('hideEbookOnly', false);
static Future<void> setHideEbookOnly(bool value) => _set('hideEbookOnly', value, notify: true);
+ /// Tapping a Continue Listening or Continue Reading card on Home opens its
+ /// details instead of picking up where it left off.
+ static Future<bool> getHomeCardsOpenDetails() => _get('homeCardsOpenDetails', false);
+ static Future<void> setHomeCardsOpenDetails(bool value) => _set('homeCardsOpenDetails', value, notify: true);
+
static Future<bool> getCollapseSeries() => _get('collapseSeries', false);
static Future<void> setCollapseSeries(bool value) => _set('collapseSeries', value, notify: true);
diff --git a/lib/services/siri_matcher.dart b/lib/services/siri_matcher.dart
index 10624da1..ff2ae795 100644
--- a/lib/services/siri_matcher.dart
+++ b/lib/services/siri_matcher.dart
@@ -126,6 +126,9 @@ class SiriQuery {
final key = siriNormalize(_stripNoise(name ?? ''));
return _fillerNames.contains(key) ? '' : key;
}
+
+ /// "Podcast" or "episode" said out loud, rather than Siri's own guess.
+ bool get _saysPodcast => RegExp(r'\b(podcast|episode)s?\b', caseSensitive: false).hasMatch(name ?? '');
}
const _fillerNames = {
@@ -253,7 +256,11 @@ int _rank(SiriEntry e) => e.inProgress ? 2 : (e.finished ? 0 : 1);
SiriMatch siriMatch(SiriQuery query, List<SiriEntry> entries) {
final name = query._nameKey;
final artist = query.artist == null ? '' : siriNormalize(query.artist!);
- final pool = entries.where((e) => _kindFits(e.kind, query.type)).toList();
+ // The kind is Siri's own guess as often as the listener's word (a book
+ // title it also knows as a podcast show gets called a podcast), so it only
+ // settles ties and never hides a better match. Saying "podcast" counts.
+ final saysPodcast = query._saysPodcast;
+ final pool = saysPodcast ? entries.where((e) => _kindFits(e.kind, 'podcast')).toList() : entries;
if (pool.isEmpty) return SiriMatch.none;
if (name.isEmpty) {
@@ -263,7 +270,12 @@ SiriMatch siriMatch(SiriQuery query, List<SiriEntry> entries) {
final scored = <_Scored>[];
for (final e in pool) {
- final titleScore = siriTextScore(name, siriNormalize(e.title));
+ // "The Dungeon Crawler Carl Podcast" is asked for the way the query is
+ // read, with "podcast" dropped. Unless "podcast" was said, a title that
+ // is the name outright beats one that only is without that word.
+ final bare = siriNormalize(_stripNoise(e.title));
+ final bareScore = bare.isEmpty ? 0.0 : siriTextScore(name, bare) * (saysPodcast ? 1.0 : 0.95);
+ final titleScore = max(siriTextScore(name, siriNormalize(e.title)), bareScore);
var seriesScore = 0.0;
for (final s in e.series) {
seriesScore = max(seriesScore, siriTextScore(name, siriNormalize(s)) * 0.96);
@@ -285,9 +297,12 @@ SiriMatch siriMatch(SiriQuery query, List<SiriEntry> entries) {
}
if (scored.isEmpty) return SiriMatch.none;
+ int fits(_Scored s) => _kindFits(s.entry.kind, query.type) ? 1 : 0;
scored.sort((a, b) {
final c = b.score.compareTo(a.score);
if (c != 0) return c;
+ final f = fits(b).compareTo(fits(a));
+ if (f != 0) return f;
final r = _rank(b.entry).compareTo(_rank(a.entry));
if (r != 0) return r;
return b.entry.lastPlayed.compareTo(a.entry.lastPlayed);
@@ -295,6 +310,19 @@ SiriMatch siriMatch(SiriQuery query, List<SiriEntry> entries) {
var top = scored.first;
if (top.score < 60) return SiriMatch.none;
+ // A series named for its first book, which is finished while a later one
+ // is under way: the listener means the series.
+ if (top.entry.kind == 'book' && !top.bySeries && top.entry.finished) {
+ final onNow = scored
+ .map((s) => s.entry)
+ .where((e) =>
+ e.kind == 'book' &&
+ e.inProgress &&
+ e.series.any((x) => siriTextScore(name, siriNormalize(x)) >= 90))
+ .toList()
+ ..sort((a, b) => b.lastPlayed.compareTo(a.lastPlayed));
+ if (onNow.isNotEmpty) return SiriMatch('ok', [onNow.first], top.score, viaSeries: true);
+ }
// A book and its series named the same: the book is the likelier ask.
if (top.entry.kind == 'series') {
final book = scored.firstWhere(
@@ -314,10 +342,14 @@ SiriMatch siriMatch(SiriQuery query, List<SiriEntry> entries) {
return SiriMatch('ok', [_nextInSeries(inSeries)], top.score, viaSeries: true);
}
+ // When the pick is the kind asked for, the other kinds don't make it a
+ // close call.
+ final topFits = fits(top) == 1;
final rivals = scored
.skip(1)
.where((s) =>
s.entry.id != top.entry.id &&
+ (!topFits || fits(s) == 1) &&
!(s.entry.kind == 'series' && top.entry.kind == 'book' && top.score - s.score < 1))
.toList();
if (rivals.isEmpty ||
diff --git a/lib/services/wording.dart b/lib/services/wording.dart
index d3fdf0d9..2a5e7b42 100644
--- a/lib/services/wording.dart
+++ b/lib/services/wording.dart
@@ -26,6 +26,7 @@ class Wording {
String get absorb => classic ? 'Play' : _l.absorb;
String get absorbing => classic ? 'Playing...' : _l.absorbing;
String get absorbAgain => classic ? 'Play Again' : _l.absorbAgain;
+ String get downloadToAbsorb => classic ? 'Download to Play' : _l.downloadToAbsorb;
String get fullyAbsorbed => classic ? 'Finished' : _l.fullyAbsorbed;
String get fullyAbsorbAction => classic ? 'Mark Finished' : _l.fullyAbsorbAction;
diff --git a/lib/widgets/book_detail_sheet.dart b/lib/widgets/book_detail_sheet.dart
index 85632cb6..5a7cf2cc 100644
--- a/lib/widgets/book_detail_sheet.dart
+++ b/lib/widgets/book_detail_sheet.dart
@@ -40,6 +40,7 @@ import '../services/api_service.dart';
import '../services/bookmark_preview_player.dart';
import '../services/bookmark_service.dart';
import '../services/download_service.dart';
+import '../services/narrated_books.dart';
import '../services/ebook_cache.dart';
import '../services/progress_sync_service.dart';
import '../services/metadata_override_service.dart';
@@ -251,6 +252,10 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
// An Audiobookshelf ebook-only book whose EPUB reads itself aloud: the
// sheet shows it as an audiobook, the way BookOrbit's arrive.
MediaOverlay? _localNarration;
+ // An EPUB this phone hasn't looked into yet is being looked at: the main
+ // button waits for the answer rather than showing Read and then switching
+ // to Absorb.
+ bool _lookingForNarration = false;
/// Looks into an Audiobookshelf ebook-only EPUB on the server (its index
/// and timings only) to see whether it reads itself aloud.
@@ -260,16 +265,64 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
final api = auth.apiService;
if (item == null || api == null || auth.isBookOrbit || _localNarration != null) return;
if (!PlayerSettings.isEbookOnly(item, countNarration: false)) return;
- final o = await NarrationService.instance.probe(api, item);
- if (o != null) await NarrationService.instance.markAudiobook(widget.itemId, o);
- final known = await NarrationService.instance.knownNarrated(widget.itemId);
+ final ebookFile = resolveEbookFile(item);
+ final unknown = ebookFile != null &&
+ ebookExtFromFile(ebookFile) == '.epub' &&
+ !NarratedBooks.checked(widget.itemId);
+ if (unknown) {
+ setState(() => _lookingForNarration = true);
+ // A slow server doesn't hold the buttons back for long.
+ Timer(const Duration(seconds: 8), () {
+ if (mounted && _lookingForNarration) {
+ debugPrint('[Narration] ${widget.itemId}: still looking after 8s, showing the ebook buttons');
+ setState(() => _lookingForNarration = false);
+ }
+ });
+ }
+ MediaOverlay? o;
+ bool? known;
+ try {
+ o = await NarrationService.instance.probe(api, item);
+ if (o != null) await NarrationService.instance.markAudiobook(widget.itemId, o);
+ known = await NarrationService.instance.knownNarrated(widget.itemId);
+ // Looked at before the list kept plain EPUBs too.
+ if (o == null && known == false && !NarratedBooks.checked(widget.itemId)) {
+ await NarratedBooks.set(widget.itemId, null);
+ }
+ } catch (e) {
+ debugPrint('[Narration] ${widget.itemId}: looking for narration failed: $e');
+ }
if (!mounted) return;
setState(() {
_localNarration = o;
_knownNarrated = known;
+ _lookingForNarration = false;
});
}
+ /// An Audiobookshelf EPUB that reads itself aloud plays from the phone, so
+ /// until its narration is downloaded the Absorb button offers that instead.
+ bool _needsNarrationDownload(AuthProvider auth) =>
+ !auth.isBookOrbit &&
+ (NarratedBooks.contains(widget.itemId) ||
+ ((_item?['media'] as Map?)?['narration'] as Map?)?['local'] == true) &&
+ !NarrationService.instance.hasLocalAudio(widget.itemId);
+
+ Widget _lookingButton(Color accent, Color onAccent, {double height = 52, double radius = 16}) => SizedBox(
+ height: height,
+ child: Material(
+ color: accent.withValues(alpha: 0.4),
+ borderRadius: BorderRadius.circular(radius),
+ child: Center(
+ child: SizedBox(
+ width: 20,
+ height: 20,
+ child: CircularProgressIndicator(strokeWidth: 2, color: onAccent),
+ ),
+ ),
+ ),
+ );
+
/// Puts the narration on the phone (just the audio, out of the EPUB on the
/// server), with how far along it is. False when there is none.
Future<bool> _prepareNarration() async {
@@ -999,7 +1052,9 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
else
const SizedBox(height: 20),
const SizedBox(height: 12),
- if (isEbookOnly && ebookFile != null && canReadEbook(ebookFile))
+ if (_lookingForNarration)
+ _lookingButton(accent, _coverScheme?.onPrimary ?? cs.onPrimary)
+ else if (isEbookOnly && ebookFile != null && canReadEbook(ebookFile))
// Reading progress fills the button the same way listening progress
// fills Absorb.
Builder(builder: (context) {
@@ -1073,16 +1128,20 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
SizedBox(
height: 52,
child: ListenableBuilder(
- listenable: AudioPlayerService(),
+ listenable: Listenable.merge([AudioPlayerService(), DownloadService()]),
builder: (_, __) {
final player = AudioPlayerService();
final isCurrentPlaying =
player.currentItemId == widget.itemId && player.isPlaying;
final showAbsorbingState = _isAbsorbing || isCurrentPlaying;
final onAccent = _coverScheme?.onPrimary ?? cs.onPrimary;
+ final needsDownload = !showAbsorbingState && _needsNarrationDownload(auth);
+ final fetching = needsDownload && DownloadService().isDownloading(widget.itemId);
// How far into the book you are fills the button from the left,
- // the way the download button fills while it fetches.
- final showFill = progress > 0 && !isFinished;
+ // the way the download button fills while it fetches. A narration
+ // on its way down fills with the download instead.
+ final fill = fetching ? DownloadService().downloadProgress(widget.itemId) : progress;
+ final showFill = fetching || (!needsDownload && progress > 0 && !isFinished);
// Offline with nothing to play: only the ebook may be on the
// phone, and the Read button below still works.
if (lib.isOffline &&
@@ -1142,7 +1201,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
child: Stack(children: [
if (showFill)
FractionallySizedBox(
- widthFactor: progress.clamp(0.0, 1.0),
+ widthFactor: fill.clamp(0.0, 1.0),
child: Container(color: onAccent.withValues(alpha: 0.22)),
),
Center(
@@ -1153,16 +1212,22 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
height: 24,
child: AbsorbingWave(color: onAccent),
)
- : isFinished
- ? AbsorbReplayIcon(size: 24, color: onAccent)
- : Icon(Icons.waves_rounded, size: 24, color: onAccent),
+ : needsDownload
+ ? Icon(Icons.download_rounded, size: 24, color: onAccent)
+ : isFinished
+ ? AbsorbReplayIcon(size: 24, color: onAccent)
+ : Icon(Icons.waves_rounded, size: 24, color: onAccent),
const SizedBox(width: 8),
Text(
showAbsorbingState
? Wording.of(context).absorbing
- : isFinished
- ? Wording.of(context).absorbAgain
- : Wording.of(context).absorb,
+ : fetching
+ ? l.downloadsDownloading
+ : needsDownload
+ ? Wording.of(context).downloadToAbsorb
+ : isFinished
+ ? Wording.of(context).absorbAgain
+ : Wording.of(context).absorb,
style: tt.titleMedium
?.copyWith(fontWeight: FontWeight.w600, color: onAccent),
),
@@ -1175,7 +1240,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
bottom: 0,
child: Center(
child: Text(
- '${(progress * 100).toStringAsFixed(0)}%',
+ '${(fill * 100).toStringAsFixed(0)}%',
style: tt.labelMedium?.copyWith(
fontWeight: FontWeight.w700,
color: onAccent.withValues(alpha: 0.85),
@@ -1222,6 +1287,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
// requests) may read itself aloud; tapping finds out. A checked one
// shows as an audiobook instead.
if (isEbookOnly &&
+ !_lookingForNarration &&
ebookFile != null &&
ebookExtFromFile(ebookFile) == '.epub' &&
!lib.isOffline &&
@@ -1334,7 +1400,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
]),
),
)),
- if (isEbookOnly && ebookFile != null && canReadEbook(ebookFile)) ...[
+ if (isEbookOnly && !_lookingForNarration && ebookFile != null && canReadEbook(ebookFile)) ...[
const SizedBox(width: 8),
// For ebook-only books the big button above is already "Read", so this
// slot is the offline download (matching the audiobook download
@@ -1934,7 +2000,9 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
]),
const SizedBox(height: 18),
// Primary actions: Absorb | Download side by side
- if (!isEbookOnly)
+ if (_lookingForNarration)
+ _lookingButton(accent, onAccent, height: 36, radius: 14)
+ else if (!isEbookOnly)
Row(children: [
Expanded(child: _quickAbsorbButton(context, cs, tt, auth, accent, onAccent, title, authorName, duration, chapters, isFinished, progress)),
const SizedBox(width: 10),
@@ -2105,11 +2173,15 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
Color accent, Color onAccent, String title, String author, double duration, List<dynamic> chapters, bool isFinished,
double progress) {
return ListenableBuilder(
- listenable: AudioPlayerService(),
+ listenable: Listenable.merge([AudioPlayerService(), DownloadService()]),
builder: (_, __) {
final player = AudioPlayerService();
final isCurrentPlaying = player.currentItemId == widget.itemId && player.isPlaying;
final showAbsorbingState = _isAbsorbing || isCurrentPlaying;
+ final needsDownload = !showAbsorbingState && _needsNarrationDownload(auth);
+ final fetching = needsDownload && DownloadService().isDownloading(widget.itemId);
+ final fill = fetching ? DownloadService().downloadProgress(widget.itemId) : progress;
+ final showFill = fetching || (!needsDownload && progress > 0 && !isFinished);
return GestureDetector(
onTap: showAbsorbingState
? () async {
@@ -2132,24 +2204,30 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
clipBehavior: Clip.antiAlias,
decoration: BoxDecoration(color: accent, borderRadius: BorderRadius.circular(14)),
child: Stack(children: [
- if (progress > 0 && !isFinished)
+ if (showFill)
FractionallySizedBox(
- widthFactor: progress.clamp(0.0, 1.0),
+ widthFactor: fill.clamp(0.0, 1.0),
child: Container(color: onAccent.withValues(alpha: 0.22)),
),
Positioned.fill(child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
showAbsorbingState
? SizedBox(width: 16, height: 16, child: AbsorbingWave(color: onAccent))
- : isFinished
- ? AbsorbReplayIcon(size: 16, color: onAccent)
- : Icon(Icons.waves_rounded, size: 16, color: onAccent),
+ : needsDownload
+ ? Icon(Icons.download_rounded, size: 16, color: onAccent)
+ : isFinished
+ ? AbsorbReplayIcon(size: 16, color: onAccent)
+ : Icon(Icons.waves_rounded, size: 16, color: onAccent),
const SizedBox(width: 8),
Flexible(child: Text(
showAbsorbingState
? Wording.of(context).absorbing
- : isFinished
- ? Wording.of(context).absorbAgain
- : Wording.of(context).absorb,
+ : fetching
+ ? AppLocalizations.of(context)!.downloadsDownloading
+ : needsDownload
+ ? Wording.of(context).downloadToAbsorb
+ : isFinished
+ ? Wording.of(context).absorbAgain
+ : Wording.of(context).absorb,
maxLines: 1, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 13, fontWeight: FontWeight.w600, color: onAccent),
)),
@@ -3568,9 +3646,12 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
Future<void> _startAbsorb(BuildContext context, {required AuthProvider auth, required String title, required String author, required String? coverUrl, required double duration, required List<dynamic> chapters, double? startTime}) async {
// An Audiobookshelf narrated EPUB plays once its narration is downloaded:
// asked first, with the reason.
- final narration = (_item?['media'] as Map?)?['narration'] as Map?;
- if (narration?['local'] == true && !NarrationService.instance.hasLocalAudio(widget.itemId)) {
+ if (_needsNarrationDownload(auth)) {
if (mounted) setState(() => _isAbsorbing = false);
+ if (DownloadService().isDownloading(widget.itemId)) {
+ showOverlayToast(context, AppLocalizations.of(context)!.narrationDownloadStarted, icon: Icons.download_rounded);
+ return;
+ }
await showNarrationDownloadDialog(
context,
itemId: widget.itemId,
diff --git a/lib/widgets/section_labels.dart b/lib/widgets/section_labels.dart
index 5988a9db..6223d823 100644
--- a/lib/widgets/section_labels.dart
+++ b/lib/widgets/section_labels.dart
@@ -8,6 +8,8 @@ String sectionLabel(String id, String? fallback, AppLocalizations l) {
switch (id) {
case 'continue-listening':
return l.continueListening;
+ case 'continue-reading':
+ return l.continueReading;
case 'continue-series':
return l.continueSeries;
case 'recently-added':