A cross platform Audiobookshelf client for Android and iOS
Dart
Read PDF ebooks in the app, not just EPUBs
Barnabasfb0405a95736
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 728950f9..68cd223a 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -3802,6 +3802,7 @@"libRemoveFoldersBody": "Removing a folder deletes its items from the library. This can't be undone.","readEbook": "Read",+ "readerFormatUnsupported": "This ebook format can't be opened in the reader yet","moreActions": "More","readerChapters": "Chapters","readerSettings": "Reader Settings",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex c36b3b21..0c8b1e03 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -73,7 +73,7 @@ import 'app_localizations_zh.dart';/// property.abstract class AppLocalizations {AppLocalizations(String locale)- : localeName = intl.Intl.canonicalizedLocale(locale.toString());+ : localeName = intl.Intl.canonicalizedLocale(locale.toString());final String localeName;@@ -96,11 +96,11 @@ abstract class AppLocalizations {/// of delegates is preferred or required.static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =<LocalizationsDelegate<dynamic>>[- delegate,- GlobalMaterialLocalizations.delegate,- GlobalCupertinoLocalizations.delegate,- GlobalWidgetsLocalizations.delegate,- ];+ delegate,+ GlobalMaterialLocalizations.delegate,+ GlobalCupertinoLocalizations.delegate,+ GlobalWidgetsLocalizations.delegate,+ ];/// A list of this localizations delegate's supported locales.static const List<Locale> supportedLocales = <Locale>[@@ -115,7 +115,7 @@ abstract class AppLocalizations {Locale('pt'),Locale('ro'),Locale('ru'),- Locale('zh')+ Locale('zh'),];/// No description provided for @appTitle.@@ -5751,7 +5751,10 @@ abstract class AppLocalizations {/// In en, this message translates to:/// **'{start} – {end} · {duration}'**String autoSleepTimerEnabledSubtitle(- String start, String end, String duration);+ String start,+ String end,+ String duration,+ );/// No description provided for @endOfChapterShort.///@@ -8134,7 +8137,13 @@ abstract class AppLocalizations {/// In en, this message translates to:/// **'{month} {day}, {year} at {hour}:{minute} {ampm}'**String statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm);+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ );/// No description provided for @statsScreenMonthJan.///@@ -11388,6 +11397,12 @@ abstract class AppLocalizations {/// **'Read'**String get readEbook;+ /// No description provided for @readerFormatUnsupported.+ ///+ /// In en, this message translates to:+ /// **'This ebook format can\'t be opened in the reader yet'**+ String get readerFormatUnsupported;+/// No description provided for @moreActions.////// In en, this message translates to:@@ -11592,19 +11607,19 @@ class _AppLocalizationsDelegate@overridebool isSupported(Locale locale) => <String>[- 'de',- 'el',- 'en',- 'es',- 'fr',- 'it',- 'ja',- 'no',- 'pt',- 'ro',- 'ru',- 'zh'- ].contains(locale.languageCode);+ 'de',+ 'el',+ 'en',+ 'es',+ 'fr',+ 'it',+ 'ja',+ 'no',+ 'pt',+ 'ro',+ 'ru',+ 'zh',+ ].contains(locale.languageCode);@overridebool shouldReload(_AppLocalizationsDelegate old) => false;@@ -11640,8 +11655,9 @@ AppLocalizations lookupAppLocalizations(Locale locale) {}throw FlutterError(- 'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '- 'an issue with the localizations generation tool. Please file an issue '- 'on GitHub with a reproducible sample app and the gen-l10n configuration '- 'that was used.');+ 'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '+ 'an issue with the localizations generation tool. Please file an issue '+ 'on GitHub with a reproducible sample app and the gen-l10n configuration '+ 'that was used.',+ );}diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 384427d9..ed4686d0 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -3173,7 +3173,10 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start - $end · $duration';}@@ -4612,7 +4615,13 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$day. $month $year um $hour:$minute $ampm';}@@ -4832,7 +4841,10 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total auf Audible · $missing fehlen · $upcoming kommend';}@@ -5612,7 +5624,10 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Prüfe $seriesName… ($current/$total)';}@@ -6555,6 +6570,10 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 0980f31b..8319c076 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 2d1d4c8f..ffd88818 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 2d45b113..ca667827 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 184ccadc..778c47d5 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -3147,7 +3147,10 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4564,7 +4567,13 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4781,7 +4790,10 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5550,7 +5562,10 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6490,6 +6505,10 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 9bf43112..df3e8537 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 8be777f7..931866d2 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex d370abba..783fc577 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex a91515a1..9b56acdd 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 30a913cd..3a12fd4e 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -3145,7 +3145,10 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4562,7 +4565,13 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4779,7 +4788,10 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5548,7 +5560,10 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6488,6 +6503,10 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex db8b053d..abf52a86 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -3148,7 +3148,10 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4565,7 +4568,13 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4782,7 +4791,10 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5551,7 +5563,10 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6491,6 +6506,10 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 8f9b0752..93a81019 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -3071,7 +3071,10 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString autoSleepTimerEnabledSubtitle(- String start, String end, String duration) {+ String start,+ String end,+ String duration,+ ) {return '$start – $end · $duration';}@@ -4488,7 +4491,13 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString statsScreenDateAtTime(- String month, int day, int year, int hour, String minute, String ampm) {+ String month,+ int day,+ int year,+ int hour,+ String minute,+ String ampm,+ ) {return '$month $day, $year at $hour:$minute $ampm';}@@ -4705,7 +4714,10 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString audibleSeriesSummaryWithUpcoming(- int total, int missing, int upcoming) {+ int total,+ int missing,+ int upcoming,+ ) {return '$total on Audible · $missing missing · $upcoming upcoming';}@@ -5473,7 +5485,10 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString upcomingNotifCheckingSeries(- String seriesName, int current, int total) {+ String seriesName,+ int current,+ int total,+ ) {return 'Checking $seriesName… ($current/$total)';}@@ -6411,6 +6426,10 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get readEbook => 'Read';+ @override+ String get readerFormatUnsupported =>+ 'This ebook format can\'t be opened in the reader yet';+@overrideString get moreActions => 'More';diff --git a/lib/services/ebook_cache.dart b/lib/services/ebook_cache.dartnew file mode 100644index 00000000..a6c72f3c--- /dev/null+++ b/lib/services/ebook_cache.dart@@ -0,0 +1,67 @@+import 'dart:io';+import 'package:http/http.dart' as http;+import 'package:path_provider/path_provider.dart';+import 'api_service.dart';++/// Downloads an Audiobookshelf ebook file to a temp cache and returns it,+/// reusing the cached copy when present. Follows redirects manually so the auth+/// headers survive the hop. Throws with a message on failure.+Future<File> fetchEbookToCache(+ ApiService api,+ String itemId,+ Map<String, dynamic> ebookFile,+ String title,+) async {+ final ino = ebookFile['ino'] as String?;+ if (ino == null) throw Exception('No ebook file found');++ final ebookName = (ebookFile['metadata'] as Map<String, dynamic>?)?['filename'] as String?+ ?? ebookFile['name'] as String?+ ?? 'book';+ final ext = ebookName.contains('.')+ ? ebookName.substring(ebookName.lastIndexOf('.'))+ : '';+ final safeTitle = title.replaceAll(RegExp(r'[^\w\s-]'), '').trim();++ final cacheDir = await getTemporaryDirectory();+ final cachedFile = File('${cacheDir.path}/ereader_$safeTitle$ext');+ if (cachedFile.existsSync() && await cachedFile.length() > 0) return cachedFile;++ final cleanBase = api.baseUrl.endsWith('/')+ ? api.baseUrl.substring(0, api.baseUrl.length - 1)+ : api.baseUrl;+ final url = '$cleanBase/api/items/$itemId/file/$ino';++ final request = http.Request('GET', Uri.parse(url));+ request.followRedirects = false;+ api.mediaHeaders.forEach((k, v) => request.headers[k] = v);+ final client = http.Client();+ try {+ var response = await client.send(request);+ var redirects = 0;+ while ([301, 302, 303, 307, 308].contains(response.statusCode) && redirects < 5) {+ final location = response.headers['location'];+ if (location == null) break;+ final redirectUrl = Uri.parse(url).resolve(location);+ final rReq = http.Request('GET', redirectUrl);+ api.mediaHeaders.forEach((k, v) => rReq.headers[k] = v);+ rReq.followRedirects = false;+ response = await client.send(rReq);+ redirects++;+ }+ if (response.statusCode != 200) {+ throw Exception('Failed to download ebook (${response.statusCode})');+ }+ final ct = response.headers['content-type'] ?? '';+ if (ct.contains('text/html')) throw Exception('Server returned an error page');+ final sink = cachedFile.openWrite();+ try {+ await response.stream.pipe(sink);+ } finally {+ await sink.close();+ }+ } finally {+ client.close();+ }+ return cachedFile;+}diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dartindex 6c67a05e..d6ff0de2 100644--- a/lib/widgets/absorbing_card.dart+++ b/lib/widgets/absorbing_card.dart@@ -11,7 +11,7 @@ import '../screens/app_shell.dart';import '../services/audio_player_service.dart';import '../services/download_service.dart';import 'absorbing_shared.dart';-import 'ebook_reader_view.dart';+import 'ebook_router.dart';import 'card_edge_progress_bar.dart';import 'card_progress_bar.dart';import 'card_playback_controls.dart';@@ -986,15 +986,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClivoid _openEbookReader() {final ebookFile = _ebookFile;if (ebookFile == null) return; // CardButtons already toasts when no ebook- Navigator.of(context, rootNavigator: true).push(- MaterialPageRoute(- builder: (_) => EbookReaderView(- itemId: _itemId,- title: _title,- ebookFile: ebookFile,- ),- ),- );+ openEbookReader(context, itemId: _itemId, title: _title, ebookFile: ebookFile);}int _currentChapterIndex() {diff --git a/lib/widgets/book_detail_sheet.dart b/lib/widgets/book_detail_sheet.dartindex ec434dea..a0d104b2 100644--- a/lib/widgets/book_detail_sheet.dart+++ b/lib/widgets/book_detail_sheet.dart@@ -41,7 +41,7 @@ import 'playlist_picker_sheet.dart';import 'collection_picker_sheet.dart';import 'absorb_wave_icon.dart';import 'stackable_sheet.dart';-import 'ebook_reader_view.dart';+import 'ebook_router.dart';import '../utils/duration_format.dart';// ─── BOOK DETAIL BOTTOM SHEET ───────────────────────────────@@ -498,11 +498,21 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {style: tt.labelSmall?.copyWith(color: cs.onSurfaceVariant)),const SizedBox(height: 12),],- if (isEbookOnly && ebookFile != null)+ if (isEbookOnly && ebookFile != null && canReadEbook(ebookFile))SizedBox(height: 52, child: FilledButton.icon(onPressed: () => _openEbookReader(context, auth, ebookFile, title),icon: const Icon(Icons.menu_book_rounded, size: 24),- label: Text('Read',+ label: Text(l.readEbook,+ style: tt.titleMedium?.copyWith(fontWeight: FontWeight.w600, color: cs.onPrimary)),+ style: FilledButton.styleFrom(shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),+ ))+ else if (isEbookOnly && ebookFile != null)+ // Ebook-only but not an EPUB (PDF/comic/mobi) - can't read in-app, so+ // the primary action downloads the file instead.+ SizedBox(height: 52, child: FilledButton.icon(+ onPressed: () => _saveEbook(context, auth, ebookFile, title),+ icon: Icon(_ebookSaved ? Icons.download_done_rounded : Icons.save_alt_rounded, size: 24),+ label: Text(_ebookSaved ? l.downloadEbookAgain : l.downloadEbook,style: tt.titleMedium?.copyWith(fontWeight: FontWeight.w600, color: cs.onPrimary)),style: FilledButton.styleFrom(shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),))@@ -604,7 +614,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {]),),)),- if (ebookFile != null) ...[+ if (ebookFile != null && canReadEbook(ebookFile)) ...[const SizedBox(width: 8),Expanded(child: GestureDetector(onTap: () => _openEbookReader(context, auth, ebookFile, title),@@ -876,8 +886,8 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {if (!lib.isOffline && !lib.isPodcastLibrary && auth.isAdmin) {add(Icons.collections_bookmark_rounded, l.addToCollection, () => CollectionPickerSheet.show(context, widget.itemId));}- if (ebookFile != null) {- add(Icons.menu_book_rounded, 'Read eBook', () => _openEbookReader(context, auth, ebookFile, title));+ if (ebookFile != null && canReadEbook(ebookFile)) {+ add(Icons.menu_book_rounded, l.readEbook, () => _openEbookReader(context, auth, ebookFile, title));}if (ebookFile != null) {add(_ebookSaved ? Icons.download_done_rounded : Icons.save_alt_rounded,@@ -1473,15 +1483,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {}void _openEbookReader(BuildContext context, AuthProvider auth, Map<String, dynamic> ebookFile, String title) {- Navigator.of(context, rootNavigator: true).push(- MaterialPageRoute(- builder: (_) => EbookReaderView(- itemId: widget.itemId,- title: title,- ebookFile: ebookFile,- ),- ),- );+ openEbookReader(context, itemId: widget.itemId, title: title, ebookFile: ebookFile);}bool _ebookSaving = false;diff --git a/lib/widgets/ebook_router.dart b/lib/widgets/ebook_router.dartnew file mode 100644index 00000000..5237fdb1--- /dev/null+++ b/lib/widgets/ebook_router.dart@@ -0,0 +1,48 @@+import 'package:flutter/material.dart';+import '../l10n/app_localizations.dart';+import 'ebook_reader_view.dart';+import 'pdf_reader_view.dart';+import 'overlay_toast.dart';++/// Lower-cased ebook format for an ABS ebookFile - prefers the explicit+/// `ebookFormat` field, falls back to the filename extension.+String ebookExt(Map<String, dynamic>? ebookFile) {+ if (ebookFile == null) return '';+ final fmt = (ebookFile['ebookFormat'] as String?)?.toLowerCase();+ if (fmt != null && fmt.isNotEmpty) return fmt;+ final fn = (ebookFile['metadata'] as Map<String, dynamic>?)?['filename'] as String?+ ?? ebookFile['name'] as String?;+ if (fn == null || !fn.contains('.')) return '';+ return fn.substring(fn.lastIndexOf('.') + 1).toLowerCase();+}++/// Formats the in-app reader can open today. EPUB uses the full reader, PDF the+/// dedicated PDF viewer. Anything else falls back to download / send-to-e-reader.+const _readableFormats = {'epub', 'pdf'};++bool canReadEbook(Map<String, dynamic>? ebookFile) =>+ ebookFile != null && _readableFormats.contains(ebookExt(ebookFile));++/// Routes an ebook to the right reader for its format, or toasts when the+/// format isn't supported in-app.+void openEbookReader(+ BuildContext context, {+ required String itemId,+ required String title,+ required Map<String, dynamic> ebookFile,+}) {+ final Widget viewer;+ switch (ebookExt(ebookFile)) {+ case 'epub':+ viewer = EbookReaderView(itemId: itemId, title: title, ebookFile: ebookFile);+ case 'pdf':+ viewer = PdfReaderView(itemId: itemId, title: title, ebookFile: ebookFile);+ default:+ showOverlayToast(context, AppLocalizations.of(context)!.readerFormatUnsupported,+ icon: Icons.menu_book_outlined);+ return;+ }+ Navigator.of(context, rootNavigator: true).push(+ MaterialPageRoute(builder: (_) => viewer),+ );+}diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dartindex 5beb5db5..d82d76c5 100644--- a/lib/widgets/expanded_card.dart+++ b/lib/widgets/expanded_card.dart@@ -14,7 +14,7 @@ import 'absorbing_shared.dart';import 'card_progress_bar.dart';import 'card_playback_controls.dart';import 'card_buttons.dart';-import 'ebook_reader_view.dart';+import 'ebook_router.dart';import '../main.dart' show colorSourceNotifier, useColorEverywhereNotifier, manualSeedNotifier, manualColorScheme;// ─── Custom route: slide-up + fade ────────────────────────────@@ -1136,15 +1136,7 @@ class _ExpandedCardState extends State<ExpandedCard> {void _openReader() {final ef = _ebookFile;if (ef == null) return;- Navigator.of(context, rootNavigator: true).push(- MaterialPageRoute(- builder: (_) => EbookReaderView(- itemId: _itemId,- title: _title,- ebookFile: ef,- ),- ),- );+ openEbookReader(context, itemId: _itemId, title: _title, ebookFile: ef);}int get _visibleButtonCount => _buttonVisibleCount;diff --git a/lib/widgets/pdf_reader_view.dart b/lib/widgets/pdf_reader_view.dartnew file mode 100644index 00000000..466a309a--- /dev/null+++ b/lib/widgets/pdf_reader_view.dart@@ -0,0 +1,295 @@+import 'dart:io';+import 'package:flutter/material.dart';+import 'package:flutter/services.dart';+import 'package:pdfrx/pdfrx.dart';+import 'package:provider/provider.dart';+import '../l10n/app_localizations.dart';+import '../providers/auth_provider.dart';+import '../providers/library_provider.dart';+import '../services/api_service.dart';+import '../services/ebook_cache.dart';++/// Full-screen PDF reader. PDFs are fixed-layout, so this is deliberately+/// simpler than the EPUB reader (no font/margin/theme reflow): page scrolling,+/// an outline-as-chapters sheet, resume, and progress sync. Page number is+/// stored as the ebookLocation, the same field the EPUB reader uses for its CFI.+class PdfReaderView extends StatefulWidget {+ final String itemId;+ final String title;+ final Map<String, dynamic> ebookFile;++ const PdfReaderView({+ super.key,+ required this.itemId,+ required this.title,+ required this.ebookFile,+ });++ @override+ State<PdfReaderView> createState() => _PdfReaderViewState();+}++class _PdfReaderViewState extends State<PdfReaderView> {+ final _controller = PdfViewerController();+ ApiService? _api;+ File? _file;+ String? _error;+ bool _loading = true;++ int _initialPage = 1;+ int _page = 1;+ int _pageCount = 0;+ List<PdfOutlineNode> _outline = [];+ bool _showControls = true;++ // Progress sync throttling - same gentle cadence as the EPUB reader.+ DateTime _lastSync = DateTime.fromMillisecondsSinceEpoch(0);+ int _lastSyncedPage = -1;+ int? _pendingPage;++ @override+ void initState() {+ super.initState();+ _setFullscreen(true);+ _api = context.read<AuthProvider>().apiService;+ _loadInitialPage();+ _open();+ }++ @override+ void dispose() {+ _setFullscreen(false);+ _flushProgress();+ super.dispose();+ }++ void _setFullscreen(bool fullscreen) {+ if (fullscreen) {+ SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);+ } else {+ SystemChrome.setEnabledSystemUIMode(+ SystemUiMode.manual,+ overlays: SystemUiOverlay.values,+ );+ }+ }++ void _loadInitialPage() {+ final lib = context.read<LibraryProvider>();+ final loc = lib.getProgressData(widget.itemId)?['ebookLocation'] as String?;+ final p = int.tryParse(loc?.trim() ?? '');+ if (p != null && p >= 1) {+ _initialPage = p;+ _page = p;+ }+ }++ Future<void> _open() async {+ try {+ final api = _api;+ if (api == null) {+ setState(() { _error = 'Not connected to server'; _loading = false; });+ return;+ }+ final f = await fetchEbookToCache(api, widget.itemId, widget.ebookFile, widget.title);+ if (mounted) setState(() { _file = f; _loading = false; });+ } catch (e) {+ if (mounted) setState(() { _error = '$e'; _loading = false; });+ }+ }++ void _onPageChanged(int? page) {+ if (page == null || !mounted) return;+ setState(() => _page = page);+ _pendingPage = page;+ if (DateTime.now().difference(_lastSync).inSeconds >= 10) _flushProgress();+ }++ void _flushProgress() {+ final page = _pendingPage;+ final api = _api;+ if (page == null || api == null || _pageCount <= 0 || page == _lastSyncedPage) return;+ api.updateEbookProgress(+ widget.itemId,+ ebookLocation: '$page',+ ebookProgress: (page / _pageCount).clamp(0.0, 1.0),+ );+ _lastSync = DateTime.now();+ _lastSyncedPage = page;+ _pendingPage = null;+ }++ void _toggleControls() => setState(() => _showControls = !_showControls);++ void _showOutline() {+ final cs = Theme.of(context).colorScheme;+ showModalBottomSheet(+ context: context,+ backgroundColor: cs.surface,+ shape: const RoundedRectangleBorder(+ borderRadius: BorderRadius.vertical(top: Radius.circular(20)),+ ),+ builder: (ctx) => SafeArea(+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ Padding(+ padding: const EdgeInsets.all(16),+ child: Text(AppLocalizations.of(ctx)!.readerChapters,+ style: Theme.of(ctx).textTheme.titleMedium?.copyWith(+ fontWeight: FontWeight.w600, color: cs.onSurface)),+ ),+ Flexible(child: ListView(shrinkWrap: true, children: _outlineTiles(_outline, ctx, 0))),+ ],+ ),+ ),+ );+ }++ List<Widget> _outlineTiles(List<PdfOutlineNode> nodes, BuildContext ctx, int depth) {+ final cs = Theme.of(ctx).colorScheme;+ final out = <Widget>[];+ for (final n in nodes) {+ final title = n.title.trim();+ if (title.isNotEmpty) {+ out.add(ListTile(+ dense: true,+ contentPadding: EdgeInsets.only(left: 16.0 + depth * 16, right: 16),+ title: Text(title, maxLines: 2, overflow: TextOverflow.ellipsis,+ style: TextStyle(color: cs.onSurface)),+ onTap: () {+ Navigator.pop(ctx);+ if (n.dest != null) _controller.goToDest(n.dest);+ },+ ));+ }+ if (n.children.isNotEmpty) out.addAll(_outlineTiles(n.children, ctx, depth + 1));+ }+ return out;+ }++ @override+ Widget build(BuildContext context) {+ final cs = Theme.of(context).colorScheme;+ final tt = Theme.of(context).textTheme;+ final l = AppLocalizations.of(context)!;++ Widget body;+ if (_loading) {+ body = const Center(child: CircularProgressIndicator());+ } else if (_error != null || _file == null) {+ body = Center(+ child: Padding(+ padding: const EdgeInsets.all(24),+ child: Text(_error ?? l.noEbookFileFound,+ textAlign: TextAlign.center,+ style: TextStyle(color: cs.onSurfaceVariant)),+ ),+ );+ } else {+ final pct = _pageCount > 0 ? ((_page / _pageCount) * 100).round() : 0;+ body = Stack(+ children: [+ Positioned.fill(+ child: PdfViewer.file(+ _file!.path,+ controller: _controller,+ initialPageNumber: _initialPage,+ params: PdfViewerParams(+ backgroundColor: cs.surface,+ onViewerReady: (document, controller) async {+ _pageCount = controller.pageCount;+ try {+ final o = await document.loadOutline();+ if (mounted) setState(() => _outline = o);+ } catch (_) {}+ if (mounted) setState(() {});+ },+ onPageChanged: _onPageChanged,+ onGeneralTap: (ctx, controller, details) {+ if (details.type == PdfViewerGeneralTapType.tap) _toggleControls();+ return false;+ },+ ),+ ),+ ),++ // Top bar+ Positioned(+ top: 0, left: 0, right: 0,+ child: AnimatedOpacity(+ opacity: _showControls ? 1 : 0,+ duration: const Duration(milliseconds: 200),+ child: IgnorePointer(+ ignoring: !_showControls,+ child: Container(+ decoration: BoxDecoration(+ gradient: LinearGradient(+ begin: Alignment.topCenter, end: Alignment.bottomCenter,+ colors: [cs.surface, cs.surface.withValues(alpha: 0)],+ ),+ ),+ child: SafeArea(+ bottom: false,+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),+ child: Row(children: [+ IconButton(+ icon: Icon(Icons.arrow_back_rounded, color: cs.onSurface),+ onPressed: () => Navigator.pop(context),+ ),+ Expanded(+ child: Text(widget.title, maxLines: 1, overflow: TextOverflow.ellipsis,+ style: tt.titleSmall?.copyWith(color: cs.onSurface)),+ ),+ if (_outline.isNotEmpty)+ IconButton(+ icon: Icon(Icons.list_rounded, color: cs.onSurface),+ onPressed: _showOutline,+ ),+ ]),+ ),+ ),+ ),+ ),+ ),+ ),++ // Bottom bar+ Positioned(+ left: 0, right: 0, bottom: 0,+ child: AnimatedOpacity(+ opacity: _showControls ? 1 : 0,+ duration: const Duration(milliseconds: 200),+ child: IgnorePointer(+ ignoring: !_showControls,+ child: Container(+ decoration: BoxDecoration(+ gradient: LinearGradient(+ begin: Alignment.bottomCenter, end: Alignment.topCenter,+ colors: [cs.surface, cs.surface.withValues(alpha: 0)],+ ),+ ),+ child: SafeArea(+ top: false,+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),+ child: Row(children: [+ Text('$_page / ${_pageCount > 0 ? _pageCount : '-'}',+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ const Spacer(),+ Text('$pct%', style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ ]),+ ),+ ),+ ),+ ),+ ),+ ),+ ],+ );+ }++ return Scaffold(backgroundColor: cs.surface, body: body);+ }+}diff --git a/pubspec.lock b/pubspec.lockindex a4f1ead6..350f4449 100644--- a/pubspec.lock+++ b/pubspec.lock@@ -144,6 +144,14 @@ packages:url: "https://pub.dev"source: hostedversion: "1.1.2"+ code_assets:+ dependency: transitive+ description:+ name: code_assets+ sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8+ url: "https://pub.dev"+ source: hosted+ version: "1.2.1"collection:dependency: transitivedescription:@@ -483,6 +491,14 @@ packages:url: "https://pub.dev"source: hostedversion: "0.7.0+1"+ hooks:+ dependency: transitive+ description:+ name: hooks+ sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"+ url: "https://pub.dev"+ source: hosted+ version: "2.0.2"html:dependency: transitivedescription:@@ -786,6 +802,38 @@ packages:url: "https://pub.dev"source: hostedversion: "2.3.0"+ pdfium_dart:+ dependency: transitive+ description:+ name: pdfium_dart+ sha256: "86e95c66b09f3245b95c4924f2edce8d4f7c9786876e5c5ee8e36b104a94bbb0"+ url: "https://pub.dev"+ source: hosted+ version: "0.2.5"+ pdfium_flutter:+ dependency: transitive+ description:+ name: pdfium_flutter+ sha256: "420ba8e7673b54da387ceeeb18a72c8bc6e4452128dbb391dca900c748f9e9ba"+ url: "https://pub.dev"+ source: hosted+ version: "0.2.2"+ pdfrx:+ dependency: "direct main"+ description:+ name: pdfrx+ sha256: e0ca318004c3f32144db8e74fa612abb80ebe79004677293af74ed9af119f47f+ url: "https://pub.dev"+ source: hosted+ version: "2.4.4"+ pdfrx_engine:+ dependency: transitive+ description:+ name: pdfrx_engine+ sha256: "89865e158ced818690ab207a13a34a65803cd67ee1bec9f5f87838eb5a79600b"+ url: "https://pub.dev"+ source: hosted+ version: "0.4.3"permission_handler:dependency: "direct main"description:@@ -874,6 +922,14 @@ packages:url: "https://pub.dev"source: hostedversion: "6.1.5+1"+ pub_semver:+ dependency: transitive+ description:+ name: pub_semver+ sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"+ url: "https://pub.dev"+ source: hosted+ version: "2.2.0"quick_actions:dependency: "direct main"description:@@ -906,6 +962,14 @@ packages:url: "https://pub.dev"source: hostedversion: "1.1.0"+ record_use:+ dependency: transitive+ description:+ name: record_use+ sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed"+ url: "https://pub.dev"+ source: hosted+ version: "0.6.0"rename_app:dependency: "direct dev"description:@@ -1345,4 +1409,4 @@ packages:version: "3.1.3"sdks:dart: ">=3.10.0 <4.0.0"- flutter: ">=3.38.0"+ flutter: ">=3.41.0"diff --git a/pubspec.yaml b/pubspec.yamlindex 3f07c384..e671614d 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -4,7 +4,7 @@ publish_to: 'none'version: 1.9.1+195environment:- sdk: '>=3.1.0 <4.0.0'+ sdk: '>=3.10.0 <4.0.0'dependencies:flutter:@@ -96,6 +96,9 @@ dependencies:# eBook readerflutter_epub_viewer: ^1.2.6+ # PDF reader (non-EPUB ebooks route here)+ pdfrx: ^2.4.4+dev_dependencies:flutter_test:sdk: flutter