Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Clean up the web player and fix desktop layout issues

Barnabas7c936cdec47f
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index f126734d..f0bd35f3 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -288,6 +288,7 @@
"absorbingTitle": "Absorbing",
"absorbingStop": "Stop",
"absorbingManageQueue": "Manage Queue",
+ "desktopAbsorbingQueueHint": "Use Add to Absorbing on a book or episode to put it here. Items play in this order.",
"absorbingDone": "Done",
"absorbingNoDownloadedEpisodes": "No downloaded episodes",
"absorbingNoDownloadedBooks": "No downloaded books",
@@ -605,7 +606,7 @@
"fullBookScrubber": "Full book scrubber",
"fullBookScrubberOnSubtitle": "On - seekable slider across entire book",
"fullBookScrubberOffSubtitle": "Off - progress bar only",
- "cardScrubbers": "Card scrubbers",
+ "cardScrubbers": "Progress bars",
"cardScrubbersBoth": "Both",
"cardScrubbersChapter": "Chapter",
"cardScrubbersLocked": "Locked",
@@ -623,17 +624,17 @@
"whenAbsorbedSubtitle": "What happens to the absorbing card when a book or episode finishes",
"whenAbsorbedShowOverlay": "Show Overlay",
"whenAbsorbedAutoRelease": "Auto-release",
- "mergeLibraries": "Unified Absorbing page",
- "mergeLibrariesInfoTitle": "Unified Absorbing Page",
- "mergeLibrariesInfoContent": "When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.",
- "mergeLibrariesOnSubtitle": "Absorbing page shows items from all libraries",
- "mergeLibrariesOffSubtitle": "Absorbing page shows current library only",
+ "mergeLibraries": "Unified Absorbing",
+ "mergeLibrariesInfoTitle": "Unified Absorbing",
+ "mergeLibrariesInfoContent": "When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.",
+ "mergeLibrariesOnSubtitle": "Show and queue items from all libraries together",
+ "mergeLibrariesOffSubtitle": "Keep the page and Manual queue in the current library",
"queueMode": "Queue mode",
"queueModeInfoTitle": "Queue Mode",
"queueModeInfoOff": "Off",
"queueModeInfoOffDesc": "Playback stops when the current book or episode finishes.",
"queueModeInfoManual": "Manual Queue",
- "queueModeInfoManualDesc": "Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.",
+ "queueModeInfoManualDesc": "Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.",
"queueModeOff": "Off",
"queueModeManual": "Manual",
"queueModeAuto": "Auto",
@@ -709,6 +710,9 @@
"chapterProgressOffSubtitle": "Off - they show full book progress",
"chapterProgressInNotificationIos": "Chapter progress on lock screen & CarPlay",
"chapterProgressOnSubtitleIos": "On - lock screen & CarPlay show chapter progress",
+ "chapterProgressInNowPlayingBar": "Chapter progress in now playing bar",
+ "chapterProgressInNowPlayingBarOnSubtitle": "On - the bottom player shows current chapter progress",
+ "chapterProgressInNowPlayingBarOffSubtitle": "Off - the bottom player shows full book progress",
"speedBookmarkInControls": "Speed & bookmark in media controls",
"speedBookmarkOnSubtitle": "On - notification shows speed & bookmark; chapter skip stays in Android Auto",
"speedBookmarkOffSubtitle": "Off - notification shows chapter skip; speed & bookmark stay in Android Auto",
@@ -918,13 +922,13 @@
"contact": "Contact",
"contactSubtitle": "Send device info via email",
"enableLogging": "Enable logging",
- "enableLoggingOnSubtitle": "On - logs saved to file (restart to apply)",
+ "enableLoggingOnSubtitle": "On - logs are being captured (restart to apply)",
"enableLoggingOffSubtitle": "Off - no logs captured",
"loggingEnabledSnackbar": "Logging enabled - restart app to start capturing",
"loggingDisabledSnackbar": "Logging disabled - restart app to stop capturing",
- "sendLogs": "Send logs",
- "sendLogsSubtitle": "Share log file as attachment",
- "failedToShare": "Failed to share: {error}",
+ "sendLogs": "Export logs",
+ "sendLogsSubtitle": "Download or share the .txt log file",
+ "failedToShare": "Failed to export: {error}",
"@failedToShare": {
"placeholders": {
"error": {
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 17529238..78cd274f 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -1270,6 +1270,12 @@ abstract class AppLocalizations {
/// **'Manage Queue'**
String get absorbingManageQueue;
+ /// No description provided for @desktopAbsorbingQueueHint.
+ ///
+ /// In en, this message translates to:
+ /// **'Use Add to Absorbing on a book or episode to put it here. Items play in this order.'**
+ String get desktopAbsorbingQueueHint;
+
/// No description provided for @absorbingDone.
///
/// In en, this message translates to:
@@ -2407,7 +2413,7 @@ abstract class AppLocalizations {
/// No description provided for @cardScrubbers.
///
/// In en, this message translates to:
- /// **'Card scrubbers'**
+ /// **'Progress bars'**
String get cardScrubbers;
/// No description provided for @cardScrubbersBoth.
@@ -2515,31 +2521,31 @@ abstract class AppLocalizations {
/// No description provided for @mergeLibraries.
///
/// In en, this message translates to:
- /// **'Unified Absorbing page'**
+ /// **'Unified Absorbing'**
String get mergeLibraries;
/// No description provided for @mergeLibrariesInfoTitle.
///
/// In en, this message translates to:
- /// **'Unified Absorbing Page'**
+ /// **'Unified Absorbing'**
String get mergeLibrariesInfoTitle;
/// No description provided for @mergeLibrariesInfoContent.
///
/// In en, this message translates to:
- /// **'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.'**
+ /// **'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.'**
String get mergeLibrariesInfoContent;
/// No description provided for @mergeLibrariesOnSubtitle.
///
/// In en, this message translates to:
- /// **'Absorbing page shows items from all libraries'**
+ /// **'Show and queue items from all libraries together'**
String get mergeLibrariesOnSubtitle;
/// No description provided for @mergeLibrariesOffSubtitle.
///
/// In en, this message translates to:
- /// **'Absorbing page shows current library only'**
+ /// **'Keep the page and Manual queue in the current library'**
String get mergeLibrariesOffSubtitle;
/// No description provided for @queueMode.
@@ -2575,7 +2581,7 @@ abstract class AppLocalizations {
/// No description provided for @queueModeInfoManualDesc.
///
/// In en, this message translates to:
- /// **'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.'**
+ /// **'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.'**
String get queueModeInfoManualDesc;
/// No description provided for @queueModeOff.
@@ -2884,6 +2890,24 @@ abstract class AppLocalizations {
/// **'On - lock screen & CarPlay show chapter progress'**
String get chapterProgressOnSubtitleIos;
+ /// No description provided for @chapterProgressInNowPlayingBar.
+ ///
+ /// In en, this message translates to:
+ /// **'Chapter progress in now playing bar'**
+ String get chapterProgressInNowPlayingBar;
+
+ /// No description provided for @chapterProgressInNowPlayingBarOnSubtitle.
+ ///
+ /// In en, this message translates to:
+ /// **'On - the bottom player shows current chapter progress'**
+ String get chapterProgressInNowPlayingBarOnSubtitle;
+
+ /// No description provided for @chapterProgressInNowPlayingBarOffSubtitle.
+ ///
+ /// In en, this message translates to:
+ /// **'Off - the bottom player shows full book progress'**
+ String get chapterProgressInNowPlayingBarOffSubtitle;
+
/// No description provided for @speedBookmarkInControls.
///
/// In en, this message translates to:
@@ -3547,7 +3571,7 @@ abstract class AppLocalizations {
/// No description provided for @enableLoggingOnSubtitle.
///
/// In en, this message translates to:
- /// **'On - logs saved to file (restart to apply)'**
+ /// **'On - logs are being captured (restart to apply)'**
String get enableLoggingOnSubtitle;
/// No description provided for @enableLoggingOffSubtitle.
@@ -3571,19 +3595,19 @@ abstract class AppLocalizations {
/// No description provided for @sendLogs.
///
/// In en, this message translates to:
- /// **'Send logs'**
+ /// **'Export logs'**
String get sendLogs;
/// No description provided for @sendLogsSubtitle.
///
/// In en, this message translates to:
- /// **'Share log file as attachment'**
+ /// **'Download or share the .txt log file'**
String get sendLogsSubtitle;
/// No description provided for @failedToShare.
///
/// In en, this message translates to:
- /// **'Failed to share: {error}'**
+ /// **'Failed to export: {error}'**
String failedToShare(String error);
/// No description provided for @clearLogs.
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index b7a0600a..f84b5311 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -640,6 +640,10 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get absorbingManageQueue => 'Warteschlange verwalten';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Fertig';
@@ -1274,7 +1278,7 @@ class AppLocalizationsDe extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Aus - nur Fortschrittsbalken';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1543,6 +1547,18 @@ class AppLocalizationsDe extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'An - Sperrbildschirm & CarPlay zeigen Kapitel Fortschritt';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls =>
'Geschwindigkeit & Lesezeichen in Mediensteuerung';
diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dart
index a6c22f40..91c311af 100644
--- a/lib/l10n/app_localizations_el.dart
+++ b/lib/l10n/app_localizations_el.dart
@@ -634,6 +634,10 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsEl extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsEl extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsEl extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsEl extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 141c0c14..a3ea237a 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -634,6 +634,10 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsEn extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsEn extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsEn extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index d358ef92..bf9a1e1c 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -636,6 +636,10 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1265,7 +1269,7 @@ class AppLocalizationsEs extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1323,22 +1327,22 @@ class AppLocalizationsEs extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1358,7 +1362,7 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1532,6 +1536,18 @@ class AppLocalizationsEs extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1910,7 +1926,7 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1924,14 +1940,14 @@ class AppLocalizationsEs extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 634c1a7c..dc5d4ff7 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -640,6 +640,10 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get absorbingManageQueue => 'Gérer la file d\'attente';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Fait';
@@ -1274,7 +1278,7 @@ class AppLocalizationsFr extends AppLocalizations {
'Désactivé - barre de progression uniquement';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1344,7 +1348,7 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
@@ -1368,7 +1372,7 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Désactivé';
@@ -1542,6 +1546,18 @@ class AppLocalizationsFr extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1939,14 +1955,14 @@ class AppLocalizationsFr extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index b411c2cf..5e22921f 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -634,6 +634,10 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsIt extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsIt extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsIt extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsIt extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 6f88b156..5bbbc8e5 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -634,6 +634,10 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsJa extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsJa extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsJa extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsJa extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dart
index fbe1dd3d..ae909796 100644
--- a/lib/l10n/app_localizations_no.dart
+++ b/lib/l10n/app_localizations_no.dart
@@ -634,6 +634,10 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsNo extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsNo extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsNo extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsNo extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 72b7fc6f..e8e64a47 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -634,6 +634,10 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsPt extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsPt extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsPt extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsPt extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dart
index 3d72a00a..8ff1d58f 100644
--- a/lib/l10n/app_localizations_ro.dart
+++ b/lib/l10n/app_localizations_ro.dart
@@ -634,6 +634,10 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1263,7 +1267,7 @@ class AppLocalizationsRo extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1321,22 +1325,22 @@ class AppLocalizationsRo extends AppLocalizations {
String get whenAbsorbedAutoRelease => 'Auto-release';
@override
- String get mergeLibraries => 'Unified Absorbing page';
+ String get mergeLibraries => 'Unified Absorbing';
@override
- String get mergeLibrariesInfoTitle => 'Unified Absorbing Page';
+ String get mergeLibrariesInfoTitle => 'Unified Absorbing';
@override
String get mergeLibrariesInfoContent =>
- 'When enabled, the Absorbing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.';
+ 'When enabled, Absorbing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.';
@override
String get mergeLibrariesOnSubtitle =>
- 'Absorbing page shows items from all libraries';
+ 'Show and queue items from all libraries together';
@override
String get mergeLibrariesOffSubtitle =>
- 'Absorbing page shows current library only';
+ 'Keep the page and Manual queue in the current library';
@override
String get queueMode => 'Queue mode';
@@ -1356,7 +1360,7 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get queueModeInfoManualDesc =>
- 'Your absorbing cards act as a playlist. When one finishes, the next non-finished card auto-plays. Add items with the \"Add to Absorbing\" button on a book or episode and reorder from the absorbing screen.';
+ 'Items in Absorbing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Absorbing on a book or episode, then reorder it in the Queue panel.';
@override
String get queueModeOff => 'Off';
@@ -1530,6 +1534,18 @@ class AppLocalizationsRo extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
@@ -1908,7 +1924,7 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1922,14 +1938,14 @@ class AppLocalizationsRo extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 636ee9c5..cd10fb5f 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -635,6 +635,10 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get absorbingManageQueue => 'Manage Queue';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => 'Done';
@@ -1265,7 +1269,7 @@ class AppLocalizationsRu extends AppLocalizations {
String get fullBookScrubberOffSubtitle => 'Off - progress bar only';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1533,6 +1537,18 @@ class AppLocalizationsRu extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'Вкл. - блокировка экрана и CarPlay покажут прогресс главы';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls =>
'Скорость и закладки в панели управления медиа';
@@ -1912,7 +1928,7 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get enableLoggingOnSubtitle =>
- 'On - logs saved to file (restart to apply)';
+ 'On - logs are being captured (restart to apply)';
@override
String get enableLoggingOffSubtitle => 'Off - no logs captured';
@@ -1926,14 +1942,14 @@ class AppLocalizationsRu extends AppLocalizations {
'Logging disabled - restart app to stop capturing';
@override
- String get sendLogs => 'Send logs';
+ String get sendLogs => 'Export logs';
@override
- String get sendLogsSubtitle => 'Share log file as attachment';
+ String get sendLogsSubtitle => 'Download or share the .txt log file';
@override
String failedToShare(String error) {
- return 'Failed to share: $error';
+ return 'Failed to export: $error';
}
@override
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 12e3a0cc..688f2d05 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -628,6 +628,10 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get absorbingManageQueue => '管理队列';
+ @override
+ String get desktopAbsorbingQueueHint =>
+ 'Use Add to Absorbing on a book or episode to put it here. Items play in this order.';
+
@override
String get absorbingDone => '完成';
@@ -1246,7 +1250,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get fullBookScrubberOffSubtitle => '关闭 - 仅显示进度条';
@override
- String get cardScrubbers => 'Card scrubbers';
+ String get cardScrubbers => 'Progress bars';
@override
String get cardScrubbersBoth => 'Both';
@@ -1503,6 +1507,18 @@ class AppLocalizationsZh extends AppLocalizations {
String get chapterProgressOnSubtitleIos =>
'On - lock screen & CarPlay show chapter progress';
+ @override
+ String get chapterProgressInNowPlayingBar =>
+ 'Chapter progress in now playing bar';
+
+ @override
+ String get chapterProgressInNowPlayingBarOnSubtitle =>
+ 'On - the bottom player shows current chapter progress';
+
+ @override
+ String get chapterProgressInNowPlayingBarOffSubtitle =>
+ 'Off - the bottom player shows full book progress';
+
@override
String get speedBookmarkInControls => 'Speed & bookmark in media controls';
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart
index 165a4fe1..643e5393 100644
--- a/lib/providers/auth_provider.dart
+++ b/lib/providers/auth_provider.dart
@@ -944,6 +944,12 @@ class AuthProvider extends ChangeNotifier {
/// Load local server settings from PlayerSettings.
Future<void> _loadLocalServerSettings() async {
+ if (AppPlatform.isWeb) {
+ _localServerEnabled = false;
+ _localServerUrl = '';
+ _useLocalServer = false;
+ return;
+ }
_localServerEnabled = await PlayerSettings.getLocalServerEnabled();
final savedUrl = await PlayerSettings.getLocalServerUrl();
_localServerUrl = normalizeServerUrl(savedUrl);
@@ -988,6 +994,7 @@ class AuthProvider extends ChangeNotifier {
/// Check if the configured local server is reachable.
/// Called on WiFi connectivity changes by LibraryProvider.
Future<void> checkLocalServer() async {
+ if (AppPlatform.isWeb) return;
if (!_localServerEnabled || _localServerUrl.isEmpty || _serverUrl == null)
return;
final wasLocal = _useLocalServer;
@@ -1044,6 +1051,7 @@ class AuthProvider extends ChangeNotifier {
required bool enabled,
required String url,
}) async {
+ if (AppPlatform.isWeb) return;
final normalizedUrl = normalizeServerUrl(url);
_localServerEnabled = enabled;
_localServerUrl = normalizedUrl;
diff --git a/lib/screens/absorbing_screen.dart b/lib/screens/absorbing_screen.dart
index eeb98850..2402a1c1 100644
--- a/lib/screens/absorbing_screen.dart
+++ b/lib/screens/absorbing_screen.dart
@@ -1745,6 +1745,20 @@ class _AbsorbingQueuePanelState extends State<_AbsorbingQueuePanel> {
),
),
),
+ if (widget.embedded && _queueMode == 'manual')
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+ child: Align(
+ alignment: Alignment.centerLeft,
+ child: Text(
+ Wording.of(context).desktopManualQueueHint,
+ style: tt.bodySmall?.copyWith(
+ color: cs.onSurfaceVariant,
+ height: 1.3,
+ ),
+ ),
+ ),
+ ),
if (_queueMode != 'off')
Padding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 4),
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 8bbe1914..4a610291 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -225,14 +225,7 @@ class HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateMi
required LibraryProvider lib,
required Widget child,
}) {
- if (desktop) {
- return Center(
- child: ConstrainedBox(
- constraints: const BoxConstraints(maxWidth: 1200),
- child: child,
- ),
- );
- }
+ if (desktop) return child;
return RefreshIndicator(
onRefresh: () async {
await lib.refresh();
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 156913e9..01421d19 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1393,8 +1393,16 @@ class SettingsScreenState extends State<SettingsScreen> {
child: LayoutBuilder(
builder: (context, constraints) {
final isDesktopSettings = isDesktopWorkspace(context);
- final expandedSection = _expandedSection ??
- (isDesktopSettings ? 'Appearance' : null);
+ final requestedSection = _expandedSection;
+ final expandedSection = isDesktopSettings &&
+ (requestedSection == null ||
+ requestedSection == 'Account' ||
+ requestedSection == 'Media Controls')
+ ? 'Appearance'
+ : requestedSection;
+ final absorbingSectionLabel = isDesktopSettings
+ ? Wording.of(context).absorbingTitle
+ : Wording.of(context).sectionAbsorbingCards;
final destinations = <_SettingsSectionDestination>[
if (!isDesktopSettings)
_SettingsSectionDestination(
@@ -1415,18 +1423,19 @@ class SettingsScreenState extends State<SettingsScreen> {
_SettingsSectionDestination(
'Absorbing Cards',
Icons.style_rounded,
- Wording.of(context).sectionAbsorbingCards,
+ absorbingSectionLabel,
),
_SettingsSectionDestination(
'Playback',
Icons.play_circle_outline_rounded,
l.sectionPlayback,
),
- _SettingsSectionDestination(
- 'Media Controls',
- Icons.dvr_rounded,
- l.sectionMediaControls,
- ),
+ if (!isDesktopSettings)
+ _SettingsSectionDestination(
+ 'Media Controls',
+ Icons.dvr_rounded,
+ l.sectionMediaControls,
+ ),
_SettingsSectionDestination(
'Sleep Timer',
Icons.bedtime_outlined,
@@ -2085,25 +2094,27 @@ class SettingsScreenState extends State<SettingsScreen> {
CollapsibleSection(
key: _keyFor('Absorbing Cards'),
icon: Icons.style_rounded,
- title: Wording.of(context).sectionAbsorbingCards,
+ title: absorbingSectionLabel,
cs: cs,
isExpanded: expandedSection == 'Absorbing Cards',
desktopMode: isDesktopSettings,
onExpansionChanged: (v) => _onSectionExpanded('Absorbing Cards', v),
children: [
- SwitchListTile(
- title: Text(l.fullScreenPlayer),
- subtitle: Text(
- _fullScreenPlayer ? l.fullScreenPlayerOnSubtitle : l.fullScreenPlayerOffSubtitle,
- style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant,
- ),),
- value: _fullScreenPlayer,
- onChanged: _loaded ? (v) {
- setState(() => _fullScreenPlayer = v);
- PlayerSettings.setFullScreenPlayer(v);
- } : null,
- ),
- const Divider(height: 1, indent: 16, endIndent: 16),
+ if (!AppPlatform.isWeb) ...[
+ SwitchListTile(
+ title: Text(l.fullScreenPlayer),
+ subtitle: Text(
+ _fullScreenPlayer ? l.fullScreenPlayerOnSubtitle : l.fullScreenPlayerOffSubtitle,
+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant,
+ ),),
+ value: _fullScreenPlayer,
+ onChanged: _loaded ? (v) {
+ setState(() => _fullScreenPlayer = v);
+ PlayerSettings.setFullScreenPlayer(v);
+ } : null,
+ ),
+ const Divider(height: 1, indent: 16, endIndent: 16),
+ ],
SwitchListTile(
title: Text(l.coverPlayPause),
subtitle: Text(
@@ -2117,36 +2128,38 @@ class SettingsScreenState extends State<SettingsScreen> {
} : null,
),
const Divider(height: 1, indent: 16, endIndent: 16),
- Padding(
- padding: const EdgeInsets.fromLTRB(16, 12, 16, 12,),
- child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
- Text(l.cardBackground, style: tt.bodyMedium?.copyWith(color: cs.onSurface,
- ),),
- const SizedBox(height: 8),
- SizedBox(width: double.infinity, child: SegmentedButton<String>(
- showSelectedIcon: false,
- segments: [
- ButtonSegment(value: 'blurred', icon: const Icon(Icons.blur_on_rounded, size: 18,), label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.cardBackgroundBlurred,
- ),
- ),),
- ButtonSegment(value: 'gradient', icon: const Icon(Icons.gradient_rounded, size: 18,), label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.cardBackgroundGradient,
- ),
- ),),
- ButtonSegment(value: 'off', icon: const Icon(Icons.block_rounded, size: 18,), label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.off),
- ),),
- ],
- selected: {_cardBackground},
- onSelectionChanged: _loaded ? (s) {
- if (s.isEmpty) return;
- setState(() => _cardBackground = s.first,);
- PlayerSettings.setCardBackground(s.first,);
- } : null,
- style: const ButtonStyle(visualDensity: VisualDensity.compact,
- ),
- ),),
- ],),
- ),
- const Divider(height: 1, indent: 16, endIndent: 16),
+ if (!isDesktopSettings) ...[
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 12,),
+ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+ Text(l.cardBackground, style: tt.bodyMedium?.copyWith(color: cs.onSurface,
+ ),),
+ const SizedBox(height: 8),
+ SizedBox(width: double.infinity, child: SegmentedButton<String>(
+ showSelectedIcon: false,
+ segments: [
+ ButtonSegment(value: 'blurred', icon: const Icon(Icons.blur_on_rounded, size: 18,), label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.cardBackgroundBlurred,
+ ),
+ ),),
+ ButtonSegment(value: 'gradient', icon: const Icon(Icons.gradient_rounded, size: 18,), label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.cardBackgroundGradient,
+ ),
+ ),),
+ ButtonSegment(value: 'off', icon: const Icon(Icons.block_rounded, size: 18,), label: FittedBox(fit: BoxFit.scaleDown, child: Text(l.off),
+ ),),
+ ],
+ selected: {_cardBackground},
+ onSelectionChanged: _loaded ? (s) {
+ if (s.isEmpty) return;
+ setState(() => _cardBackground = s.first,);
+ PlayerSettings.setCardBackground(s.first,);
+ } : null,
+ style: const ButtonStyle(visualDensity: VisualDensity.compact,
+ ),
+ ),),
+ ],),
+ ),
+ const Divider(height: 1, indent: 16, endIndent: 16),
+ ],
Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 16, 14,),
child: Column(
@@ -2198,6 +2211,25 @@ class SettingsScreenState extends State<SettingsScreen> {
} : null,
),
const Divider(height: 1, indent: 16, endIndent: 16),
+ if (isDesktopSettings) ...[
+ SwitchListTile(
+ title: Text(l.chapterProgressInNowPlayingBar),
+ subtitle: Text(
+ _notifChapterProgress
+ ? l.chapterProgressInNowPlayingBarOnSubtitle
+ : l.chapterProgressInNowPlayingBarOffSubtitle,
+ style: tt.bodySmall?.copyWith(
+ color: cs.onSurfaceVariant,
+ ),
+ ),
+ value: _notifChapterProgress,
+ onChanged: _loaded ? (v) {
+ setState(() => _notifChapterProgress = v);
+ PlayerSettings.setNotificationChapterProgress(v);
+ } : null,
+ ),
+ const Divider(height: 1, indent: 16, endIndent: 16),
+ ],
ValueListenableBuilder<bool>(
valueListenable: classicWordingNotifier,
builder: (context, _, __) {
@@ -2814,6 +2846,7 @@ class SettingsScreenState extends State<SettingsScreen> {
const SizedBox(height: 16),
// ── Media Controls ──
+ if (!isDesktopSettings) ...[
CollapsibleSection(
key: _keyFor('Media Controls'),
icon: Icons.dvr_rounded,
@@ -2892,9 +2925,8 @@ class SettingsScreenState extends State<SettingsScreen> {
],
],
),
- if (!isDesktopSettings ||
- expandedSection == 'Media Controls')
const SizedBox(height: 16),
+ ],
// ── Sleep Timer ──
CollapsibleSection(
@@ -3880,12 +3912,21 @@ class SettingsScreenState extends State<SettingsScreen> {
if (_loggingEnabled && LogService().enabled) ...[
const Divider(height: 1, indent: 16, endIndent: 16,),
ListTile(
- leading: Icon(Icons.attach_file_rounded, color: cs.primary,),
+ leading: Icon(
+ AppPlatform.isWeb
+ ? Icons.download_rounded
+ : Icons.attach_file_rounded,
+ color: cs.primary,
+ ),
title: Text(l.sendLogs),
subtitle: Text(l.sendLogsSubtitle,
style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant,
),),
- trailing: const Icon(Icons.chevron_right_rounded,),
+ trailing: Icon(
+ AppPlatform.isWeb
+ ? Icons.download_rounded
+ : Icons.chevron_right_rounded,
+ ),
onTap: () async {
try {
final box = context.findRenderObject() as RenderBox?;
@@ -3936,6 +3977,7 @@ class SettingsScreenState extends State<SettingsScreen> {
desktopMode: isDesktopSettings,
onExpansionChanged: (v) => _onSectionExpanded('Advanced', v),
children: [
+ if (!AppPlatform.isWeb) ...[
SwitchListTile(
title: Row(children: [
Flexible(child: Text(l.localServer)),
@@ -3992,6 +4034,7 @@ class SettingsScreenState extends State<SettingsScreen> {
],
],
const Divider(height: 1, indent: 16, endIndent: 16),
+ ],
if (!AppPlatform.isWeb)
SwitchListTile(
title: Row(children: [
@@ -4032,7 +4075,8 @@ class SettingsScreenState extends State<SettingsScreen> {
),
],
if (_isGithubBuild) ...[
- const Divider(height: 1, indent: 16, endIndent: 16,),
+ if (!AppPlatform.isWeb)
+ const Divider(height: 1, indent: 16, endIndent: 16,),
SwitchListTile(
title: Row(children: [
Flexible(child: Text(l.includePreReleases)),
@@ -4051,7 +4095,8 @@ class SettingsScreenState extends State<SettingsScreen> {
} : null,
),
],
- const Divider(height: 1, indent: 16, endIndent: 16),
+ if (!AppPlatform.isWeb || _isGithubBuild)
+ const Divider(height: 1, indent: 16, endIndent: 16),
ListTile(
leading: Icon(Icons.menu_book_rounded, color: cs.primary,),
title: Text(l.adminRmab),
diff --git a/lib/services/log_service.dart b/lib/services/log_service.dart
index def966e9..e0fb4019 100644
--- a/lib/services/log_service.dart
+++ b/lib/services/log_service.dart
@@ -1,9 +1,11 @@
+import 'dart:convert';
import 'dart:io';
import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:path_provider/path_provider.dart';
import 'package:share_plus/share_plus.dart';
import 'package:url_launcher/url_launcher.dart';
+import '../utils/text_file_download.dart';
import 'api_service.dart';
class LogService {
@@ -20,6 +22,8 @@ class LogService {
static const _createdAtKey = 'log_created_at';
File? _logFile;
+ final List<String> _webLogEntries = [];
+ int _webLogSizeBytes = 0;
bool _enabled = false;
DebugPrintCallback? _originalDebugPrint;
int _writeCount = 0;
@@ -32,6 +36,17 @@ class LogService {
_enabled = loggingEnabled;
if (!_enabled) return;
+ if (kIsWeb) {
+ _resetWebLogs();
+ final now = DateTime.now().toIso8601String();
+ _appendWebLog(
+ '\n=== Session started $now (App Version: ${ApiService.appVersionFull}) ===\n',
+ );
+ _originalDebugPrint = debugPrint;
+ debugPrint = _interceptedDebugPrint;
+ return;
+ }
+
final dir = await getApplicationDocumentsDirectory();
_logFile = File('${dir.path}/absorb_logs.txt');
@@ -44,7 +59,9 @@ class LogService {
try {
final createdMs = int.tryParse(createdAtFile.readAsStringSync().trim());
if (createdMs != null) {
- final age = DateTime.now().difference(DateTime.fromMillisecondsSinceEpoch(createdMs));
+ final age = DateTime.now().difference(
+ DateTime.fromMillisecondsSinceEpoch(createdMs),
+ );
if (age.inHours >= 24) shouldClear = true;
}
} catch (_) {
@@ -57,13 +74,19 @@ class LogService {
final header = StringBuffer()
..writeln('=== Absorb Log ===')
..writeln('App Version: ${ApiService.appVersionFull}')
- ..writeln('Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}')
- ..writeln('OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}')
+ ..writeln(
+ 'Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}',
+ )
+ ..writeln(
+ 'OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}',
+ )
..writeln('Created: ${DateTime.now().toIso8601String()}')
..writeln('==================')
..writeln();
await _logFile!.writeAsString(header.toString());
- createdAtFile.writeAsStringSync(DateTime.now().millisecondsSinceEpoch.toString());
+ createdAtFile.writeAsStringSync(
+ DateTime.now().millisecondsSinceEpoch.toString(),
+ );
}
// Rotate on startup if needed
@@ -85,30 +108,75 @@ class LogService {
void _interceptedDebugPrint(String? message, {int? wrapWidth}) {
_originalDebugPrint?.call(message, wrapWidth: wrapWidth);
- if (_logFile != null && message != null) {
- final ts = DateTime.now().toIso8601String();
- final sanitized = _sanitize(message);
- _logFile!.writeAsStringSync(
- '[$ts] $sanitized\n',
- mode: FileMode.append,
- );
+ if (message == null) return;
+ final ts = DateTime.now().toIso8601String();
+ final sanitized = _sanitize(message);
+ final entry = '[$ts] $sanitized\n';
+ if (kIsWeb) {
+ _appendWebLog(entry);
+ } else if (_logFile != null) {
+ _logFile!.writeAsStringSync(entry, mode: FileMode.append);
_maybeRotate();
}
}
/// Write a log entry directly (for error handlers that bypass debugPrint).
void log(String message) {
- if (_logFile != null) {
- final ts = DateTime.now().toIso8601String();
- final sanitized = _sanitize(message);
- _logFile!.writeAsStringSync(
- '[$ts] $sanitized\n',
- mode: FileMode.append,
- );
+ final ts = DateTime.now().toIso8601String();
+ final sanitized = _sanitize(message);
+ final entry = '[$ts] $sanitized\n';
+ if (kIsWeb) {
+ if (_enabled) _appendWebLog(entry);
+ } else if (_logFile != null) {
+ _logFile!.writeAsStringSync(entry, mode: FileMode.append);
_maybeRotate();
}
}
+ void _appendWebLog(String entry) {
+ var storedEntry = entry;
+ var entryBytes = utf8.encode(storedEntry);
+ if (entryBytes.length > _keepSize) {
+ storedEntry = utf8.decode(
+ entryBytes.sublist(entryBytes.length - _keepSize),
+ allowMalformed: true,
+ );
+ entryBytes = utf8.encode(storedEntry);
+ }
+
+ _webLogEntries.add(storedEntry);
+ _webLogSizeBytes += entryBytes.length;
+ if (_webLogSizeBytes <= _maxSize) return;
+
+ while (_webLogEntries.length > 1 && _webLogSizeBytes > _keepSize) {
+ final removed = _webLogEntries.removeAt(0);
+ _webLogSizeBytes -= utf8.encode(removed).length;
+ }
+ }
+
+ String _logHeader() {
+ final os = kIsWeb
+ ? 'Web browser'
+ : '${Platform.operatingSystem} ${Platform.operatingSystemVersion}';
+ return (StringBuffer()
+ ..writeln('=== Absorb Log ===')
+ ..writeln('App Version: ${ApiService.appVersionFull}')
+ ..writeln(
+ 'Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}',
+ )
+ ..writeln('OS: $os')
+ ..writeln('Created: ${DateTime.now().toIso8601String()}')
+ ..writeln('==================')
+ ..writeln())
+ .toString();
+ }
+
+ void _resetWebLogs() {
+ _webLogEntries.clear();
+ _webLogSizeBytes = 0;
+ _appendWebLog(_logHeader());
+ }
+
/// Periodic runtime rotation - check file size every [_rotateCheckInterval]
/// writes so the log never grows much past [_maxSize] even during long
/// sessions. This keeps the most recent entries and trims the oldest.
@@ -143,14 +211,22 @@ class LogService {
}
Future<void> clearLogs() async {
+ if (kIsWeb) {
+ _resetWebLogs();
+ return;
+ }
if (_logFile != null && await _logFile!.exists()) {
// Write a fresh header immediately so logs shared in the same session
// still have device info (don't wait for next init/restart).
final header = StringBuffer()
..writeln('=== Absorb Log ===')
..writeln('App Version: ${ApiService.appVersionFull}')
- ..writeln('Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}')
- ..writeln('OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}')
+ ..writeln(
+ 'Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}',
+ )
+ ..writeln(
+ 'OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}',
+ )
..writeln('Created: ${DateTime.now().toIso8601String()}')
..writeln('==================')
..writeln();
@@ -160,7 +236,8 @@ class LogService {
final dir = _logFile!.parent;
final createdAtFile = File('${dir.path}/$_createdAtKey');
createdAtFile.writeAsStringSync(
- DateTime.now().millisecondsSinceEpoch.toString());
+ DateTime.now().millisecondsSinceEpoch.toString(),
+ );
} catch (_) {}
}
}
@@ -169,7 +246,9 @@ class LogService {
String _deviceInfo({String? serverVersion}) {
final buf = StringBuffer()
..writeln('App Version: ${ApiService.appVersionFull}')
- ..writeln('Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}')
+ ..writeln(
+ 'Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}',
+ )
..writeln('Device ID: ${ApiService.deviceId}');
if (serverVersion != null) {
buf.writeln('Server Version: $serverVersion');
@@ -191,7 +270,10 @@ class LogService {
// Mask standalone sensitive key=value pairs not inside URLs
// (e.g. "token=abc123" in non-URL context)
result = result.replaceAllMapped(
- RegExp(r'(token|secret|password|authorization|bearer|\w*key)\s*[=:]\s*(?!null\b|\*\*\*|true\b|false\b)\S+', caseSensitive: false),
+ RegExp(
+ r'(token|secret|password|authorization|bearer|\w*key)\s*[=:]\s*(?!null\b|\*\*\*|true\b|false\b)\S+',
+ caseSensitive: false,
+ ),
(m) => '${m.group(1)}=***',
);
return result;
@@ -243,12 +325,14 @@ class LogService {
/// Keep query param names but mask values of sensitive ones.
static String _maskQuery(Uri uri) {
if (uri.queryParameters.isEmpty) return '';
- final masked = uri.queryParameters.entries.map((e) {
- if (_sensitiveParamPattern.hasMatch(e.key)) {
- return '${e.key}=***';
- }
- return '${e.key}=${e.value}';
- }).join('&');
+ final masked = uri.queryParameters.entries
+ .map((e) {
+ if (_sensitiveParamPattern.hasMatch(e.key)) {
+ return '${e.key}=***';
+ }
+ return '${e.key}=${e.value}';
+ })
+ .join('&');
return '?$masked';
}
@@ -258,17 +342,33 @@ class LogService {
final a = int.tryParse(parts[0]);
final b = int.tryParse(parts[1]);
if (a == null || b == null) return false;
- return a == 10 || (a == 172 && b >= 16 && b <= 31) || (a == 192 && b == 168);
+ return a == 10 ||
+ (a == 172 && b >= 16 && b <= 31) ||
+ (a == 192 && b == 168);
}
/// Share log file as attachment via share sheet with device info.
///
/// [sharePositionOrigin] is required on iPad for the share popover anchor.
- Future<void> shareLogs({String? serverVersion, Rect? sharePositionOrigin}) async {
+ Future<void> shareLogs({
+ String? serverVersion,
+ Rect? sharePositionOrigin,
+ }) async {
final info = _deviceInfo(serverVersion: serverVersion);
+ if (kIsWeb) {
+ final logs = _webLogEntries.join();
+ final content = logs.isNotEmpty
+ ? '${_sanitizeUrls(logs)}\n=== Report Info ===\n$info'
+ : '=== Absorb Log Report ===\n$info\n(No log data found — is logging enabled?)\n';
+ await downloadTextFile(fileName: 'absorb_logs.txt', content: content);
+ return;
+ }
+
final hasFile =
- _logFile != null && await _logFile!.exists() && await _logFile!.length() > 0;
+ _logFile != null &&
+ await _logFile!.exists() &&
+ await _logFile!.length() > 0;
if (hasFile) {
// Write sanitized copy to share instead of raw logs
@@ -299,10 +399,7 @@ class LogService {
final uri = Uri(
scheme: 'mailto',
path: supportEmail,
- query: _encodeMailtoQuery({
- 'subject': 'Absorb Feedback',
- 'body': info,
- }),
+ query: _encodeMailtoQuery({'subject': 'Absorb Feedback', 'body': info}),
);
await launchUrl(uri);
}
diff --git a/lib/services/wording.dart b/lib/services/wording.dart
index 93bb7dff..1693d890 100644
--- a/lib/services/wording.dart
+++ b/lib/services/wording.dart
@@ -47,17 +47,17 @@ class Wording {
// ── Unified Absorbing page setting ──
String get mergeLibraries =>
- classic ? 'Unified Now Playing page' : _l.mergeLibraries;
+ classic ? 'Unified Now Playing' : _l.mergeLibraries;
String get mergeLibrariesInfoTitle =>
- classic ? 'Unified Now Playing Page' : _l.mergeLibrariesInfoTitle;
+ classic ? 'Unified Now Playing' : _l.mergeLibrariesInfoTitle;
String get mergeLibrariesInfoContent => classic
- ? 'When enabled, the Now Playing screen shows all your in-progress books and podcasts from every library in a single view. When disabled, only items from the library you currently have selected are shown.'
+ ? 'When enabled, Now Playing shows and queues books and podcast episodes from every library together. When disabled, the page and Manual queue stay within the current library or media type.'
: _l.mergeLibrariesInfoContent;
String get mergeLibrariesOnSubtitle => classic
- ? 'Now Playing page shows items from all libraries'
+ ? 'Show and queue items from all libraries together'
: _l.mergeLibrariesOnSubtitle;
String get mergeLibrariesOffSubtitle => classic
- ? 'Now Playing page shows current library only'
+ ? 'Keep the page and Manual queue in the current library'
: _l.mergeLibrariesOffSubtitle;
// ── Empty / placeholder ──
@@ -93,6 +93,10 @@ class Wording {
// ── Queue mode info popup ──
String get queueModeInfoManualDesc => classic
- ? 'Your Now Playing list acts as a playlist. When one finishes, the next non-finished item auto-plays. Add items with the "Add to Now Playing" button on a book or episode and reorder from the Now Playing screen.'
+ ? 'Items in Now Playing are your manual queue. When one finishes, the next unfinished item plays. Use Add to Now Playing on a book or episode, then reorder it in the Queue panel.'
: _l.queueModeInfoManualDesc;
+
+ String get desktopManualQueueHint => classic
+ ? 'Use Add to Now Playing on a book or episode to put it here. Items play in this order.'
+ : _l.desktopAbsorbingQueueHint;
}
diff --git a/lib/utils/text_file_download.dart b/lib/utils/text_file_download.dart
new file mode 100644
index 00000000..6772213c
--- /dev/null
+++ b/lib/utils/text_file_download.dart
@@ -0,0 +1,2 @@
+export 'text_file_download_stub.dart'
+ if (dart.library.js_interop) 'text_file_download_web.dart';
diff --git a/lib/utils/text_file_download_stub.dart b/lib/utils/text_file_download_stub.dart
new file mode 100644
index 00000000..b036d443
--- /dev/null
+++ b/lib/utils/text_file_download_stub.dart
@@ -0,0 +1,4 @@
+Future<void> downloadTextFile({
+ required String fileName,
+ required String content,
+}) => throw UnsupportedError('Text file downloads are only available on web.');
diff --git a/lib/utils/text_file_download_web.dart b/lib/utils/text_file_download_web.dart
new file mode 100644
index 00000000..94ffbb15
--- /dev/null
+++ b/lib/utils/text_file_download_web.dart
@@ -0,0 +1,27 @@
+import 'dart:convert';
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:web/web.dart' as web;
+
+Future<void> downloadTextFile({
+ required String fileName,
+ required String content,
+}) async {
+ final bytes = Uint8List.fromList(utf8.encode(content));
+ final blob = web.Blob(
+ <JSUint8Array>[bytes.toJS].toJS,
+ web.BlobPropertyBag(type: 'text/plain;charset=utf-8'),
+ );
+ final url = web.URL.createObjectURL(blob);
+ final anchor = web.HTMLAnchorElement()
+ ..href = url
+ ..download = fileName
+ ..style.display = 'none';
+
+ web.document.body?.appendChild(anchor);
+ anchor.click();
+ anchor.remove();
+ await Future<void>.delayed(Duration.zero);
+ web.URL.revokeObjectURL(url);
+}
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 2aed0a20..281dbb90 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -1140,8 +1140,12 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
- ..._buildButtonGrid(accent, tt),
- if (!_moreInline) ...[
+ ..._buildButtonGrid(
+ accent,
+ tt,
+ showAll: desktopPresentation,
+ ),
+ if (!desktopPresentation && !_moreInline) ...[
const SizedBox(height: 6),
Center(
child: ListenableBuilder(
@@ -1213,6 +1217,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
totalChapters: totalChapters,
itemId: _itemId,
compact: compact,
+ showBookPercentage: true,
),
),
);
@@ -1492,7 +1497,11 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
int get _visibleButtonCount => _buttonVisibleCount;
- List<Widget> _buildButtonGrid(Color accent, TextTheme tt) => _makeActions().buildButtonGrid(accent, tt);
+ List<Widget> _buildButtonGrid(
+ Color accent,
+ TextTheme tt, {
+ bool showAll = false,
+ }) => _makeActions().buildButtonGrid(accent, tt, showAll: showAll);
void _showMoreMenu(BuildContext context, Color accent, TextTheme tt) => _makeActions().showMoreMenu(accent, tt);
diff --git a/lib/widgets/card_buttons.dart b/lib/widgets/card_buttons.dart
index ec0e7fd1..b46ac1fa 100644
--- a/lib/widgets/card_buttons.dart
+++ b/lib/widgets/card_buttons.dart
@@ -1437,10 +1437,26 @@ class CardActionDelegate {
7: [3, 4], 8: [4, 4], 9: [3, 3, 3],
};
- List<Widget> buildButtonGrid(Color accent, TextTheme tt) {
+ static List<int> _balancedRows(int count, int maxPerRow) {
+ final rowCount = (count / maxPerRow).ceil();
+ final baseSize = count ~/ rowCount;
+ final largerRows = count % rowCount;
+ return <int>[
+ for (int row = 0; row < rowCount; row++)
+ row < rowCount - largerRows ? baseSize : baseSize + 1,
+ ];
+ }
+
+ List<Widget> buildButtonGrid(
+ Color accent,
+ TextTheme tt, {
+ bool showAll = false,
+ }) {
final count = visibleButtonCount;
final ids = buttonOrder
- .take(count)
+ .take(showAll ? buttonOrder.length : count)
+ .where((id) => !showAll || id != '_more')
+ .where((id) => !showAll || buttonDefById(id) != null)
.where((id) => showChaptersAction || id != 'chapters')
.toList();
final n = ids.length;
@@ -1450,7 +1466,9 @@ class CardActionDelegate {
final short = iconsOnly || n >= 3;
final table = iconsOnly ? _iconRows : _labelRows;
- final rowSizes = table[n] ?? _labelRows[n] ?? [n];
+ final rowSizes = showAll
+ ? _balancedRows(n, iconsOnly ? 5 : 3)
+ : table[n] ?? _labelRows[n] ?? [n];
final rows = <Widget>[];
int offset = 0;
@@ -1463,9 +1481,25 @@ class CardActionDelegate {
Widget row = Row(children: [
for (int c = 0; c < rowSlots.length; c++) ...[
if (c > 0) const SizedBox(width: 8),
- Expanded(child: rowSlots[c] == '_more'
- ? _buildInlineMoreButton(accent, compact: compact, short: short)
- : buildCardButton(rowSlots[c], accent, tt, compact: compact, short: short, iconsOnly: iconsOnly)),
+ Expanded(
+ child: KeyedSubtree(
+ key: ValueKey('card-action-${rowSlots[c]}'),
+ child: rowSlots[c] == '_more'
+ ? _buildInlineMoreButton(
+ accent,
+ compact: compact,
+ short: short,
+ )
+ : buildCardButton(
+ rowSlots[c],
+ accent,
+ tt,
+ compact: compact,
+ short: short,
+ iconsOnly: iconsOnly,
+ ),
+ ),
+ ),
],
]);
diff --git a/lib/widgets/card_progress_bar.dart b/lib/widgets/card_progress_bar.dart
index a15b38bf..a4d281f1 100644
--- a/lib/widgets/card_progress_bar.dart
+++ b/lib/widgets/card_progress_bar.dart
@@ -22,7 +22,8 @@ class CardDualProgressBar extends StatefulWidget {
final int totalChapters;
final String? itemId;
final bool compact;
- const CardDualProgressBar({super.key, required this.player, required this.accent, required this.isActive, required this.staticProgress, required this.staticDuration, required this.chapters, this.showBookBar = true, this.showChapterBar = true, this.chapterName, this.chapterIndex = 0, this.totalChapters = 0, this.itemId, this.compact = false});
+ final bool showBookPercentage;
+ const CardDualProgressBar({super.key, required this.player, required this.accent, required this.isActive, required this.staticProgress, required this.staticDuration, required this.chapters, this.showBookBar = true, this.showChapterBar = true, this.chapterName, this.chapterIndex = 0, this.totalChapters = 0, this.itemId, this.compact = false, this.showBookPercentage = false});
@override State<CardDualProgressBar> createState() => _CardDualProgressBarState();
}
@@ -325,6 +326,17 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsB
final bookRemaining = (totalDur - posS) / speedDiv;
final chapterRemaining = (chapterDur - chapterPos) / speedDiv;
final chapterElapsed = chapterPos / speedDiv;
+ final displayedBookProgress =
+ (_bookDragValue ?? bookProgress).clamp(0.0, 1.0);
+ final bookPercentageLabel = l.percentComplete(
+ (displayedBookProgress * 100).toStringAsFixed(1),
+ );
+ final bookPercentageStyle = tt.labelSmall?.copyWith(
+ color: cs.onSurfaceVariant,
+ fontSize: 11 * _progressTextScale,
+ fontWeight: FontWeight.w600,
+ fontFeatures: const [FontFeature.tabularFigures()],
+ );
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
@@ -344,20 +356,43 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsB
child: CustomPaint(size: Size(w, 32), painter: AbsorbProgressPainter(progress: p, accent: widget.accent.withValues(alpha: 0.5), isDragging: _bookDragValue != null)),
);
})),
- Padding(padding: const EdgeInsets.only(top: 2, bottom: 6), child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(_fmt(_bookDragValue != null ? _bookDragValue! * totalDur : bookElapsed), style: tt.labelSmall?.copyWith(color: _bookDragValue != null ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurfaceVariant, fontSize: 12 * _progressTextScale, fontWeight: FontWeight.w600, shadows: [Shadow(color: Theme.of(context).brightness == Brightness.dark ? Colors.black.withValues(alpha: 0.5) : Colors.white.withValues(alpha: 0.5), blurRadius: 3)])),
- if (_bookDragValue != null && _bookScrubSpeed < 1.0) Text(_scrubSpeedLabel(l, _bookScrubSpeed), style: tt.labelSmall?.copyWith(color: widget.accent, fontSize: 11, fontWeight: FontWeight.w500)),
- Text('-${_fmt(_bookDragValue != null ? (1.0 - _bookDragValue!) * totalDur : bookRemaining)}', style: tt.labelSmall?.copyWith(color: _bookDragValue != null ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurfaceVariant, fontSize: 12 * _progressTextScale, fontWeight: FontWeight.w600, shadows: [Shadow(color: Theme.of(context).brightness == Brightness.dark ? Colors.black.withValues(alpha: 0.5) : Colors.white.withValues(alpha: 0.5), blurRadius: 3)])),
- ],
- )),
+ Padding(
+ padding: const EdgeInsets.only(top: 2, bottom: 6),
+ child: Stack(
+ alignment: Alignment.center,
+ children: [
+ Row(
+ children: [
+ Text(_fmt(_bookDragValue != null ? _bookDragValue! * totalDur : bookElapsed), style: tt.labelSmall?.copyWith(color: _bookDragValue != null ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurfaceVariant, fontSize: 12 * _progressTextScale, fontWeight: FontWeight.w600, shadows: [Shadow(color: Theme.of(context).brightness == Brightness.dark ? Colors.black.withValues(alpha: 0.5) : Colors.white.withValues(alpha: 0.5), blurRadius: 3)])),
+ const Spacer(),
+ Text('-${_fmt(_bookDragValue != null ? (1.0 - _bookDragValue!) * totalDur : bookRemaining)}', style: tt.labelSmall?.copyWith(color: _bookDragValue != null ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurfaceVariant, fontSize: 12 * _progressTextScale, fontWeight: FontWeight.w600, shadows: [Shadow(color: Theme.of(context).brightness == Brightness.dark ? Colors.black.withValues(alpha: 0.5) : Colors.white.withValues(alpha: 0.5), blurRadius: 3)])),
+ ],
+ ),
+ if (_bookDragValue != null && _bookScrubSpeed < 1.0)
+ Text(_scrubSpeedLabel(l, _bookScrubSpeed), style: tt.labelSmall?.copyWith(color: widget.accent, fontSize: 11, fontWeight: FontWeight.w500))
+ else if (widget.showBookPercentage)
+ Text(
+ bookPercentageLabel,
+ key: const ValueKey('desktop-current-percent'),
+ style: bookPercentageStyle,
+ ),
+ ],
+ ),
+ ),
] else ...[
Row(children: [
Text(_fmt(_bookDragValue != null ? _bookDragValue! * totalDur : bookElapsed), style: tt.labelSmall?.copyWith(color: _bookDragValue != null ? cs.onSurface.withValues(alpha: 0.6) : cs.onSurface.withValues(alpha: 0.5), fontSize: 11 * _progressTextScale, fontWeight: FontWeight.w500, shadows: [Shadow(color: Theme.of(context).brightness == Brightness.dark ? Colors.black.withValues(alpha: 0.5) : Colors.white.withValues(alpha: 0.5), blurRadius: 3)])),
const SizedBox(width: 8),
Expanded(child: ClipRRect(borderRadius: BorderRadius.circular(4),
child: LinearProgressIndicator(value: bookProgress, minHeight: 3, backgroundColor: cs.onSurface.withValues(alpha: 0.08), valueColor: AlwaysStoppedAnimation(widget.accent.withValues(alpha: 0.5))))),
+ if (widget.showBookPercentage) ...[
+ const SizedBox(width: 8),
+ Text(
+ bookPercentageLabel,
+ key: const ValueKey('desktop-current-percent'),
+ style: bookPercentageStyle,
+ ),
+ ],
const SizedBox(width: 8),
Text('-${_fmt(_bookDragValue != null ? (1.0 - _bookDragValue!) * totalDur : bookRemaining)}', style: tt.labelSmall?.copyWith(color: _bookDragValue != null ? cs.onSurface.withValues(alpha: 0.6) : cs.onSurface.withValues(alpha: 0.5), fontSize: 11 * _progressTextScale, fontWeight: FontWeight.w500, shadows: [Shadow(color: Theme.of(context).brightness == Brightness.dark ? Colors.black.withValues(alpha: 0.5) : Colors.white.withValues(alpha: 0.5), blurRadius: 3)])),
]),
diff --git a/lib/widgets/desktop_now_playing_bar.dart b/lib/widgets/desktop_now_playing_bar.dart
index 8f5e7e8b..9d26e269 100644
--- a/lib/widgets/desktop_now_playing_bar.dart
+++ b/lib/widgets/desktop_now_playing_bar.dart
@@ -34,6 +34,7 @@ class _DesktopNowPlayingBarState extends State<DesktopNowPlayingBar> {
PlayerSettings.defaultSpeedPresets,
);
bool _speedAdjustedTime = true;
+ bool _chapterProgress = false;
String? _lastItemId;
String? _lastLibraryId;
double? _dragPositionSeconds;
@@ -92,6 +93,7 @@ class _DesktopNowPlayingBarState extends State<DesktopNowPlayingBar> {
PlayerSettings.getEffectiveForwardSkip(libraryId: libraryId),
PlayerSettings.getSpeedPresets(),
PlayerSettings.getSpeedAdjustedTime(),
+ PlayerSettings.getNotificationChapterProgress(),
]);
if (!mounted) return;
setState(() {
@@ -99,6 +101,7 @@ class _DesktopNowPlayingBarState extends State<DesktopNowPlayingBar> {
_forwardSkip = results[1] as int;
_speedPresets = results[2] as List<double>;
_speedAdjustedTime = results[3] as bool;
+ _chapterProgress = results[4] as bool;
});
}
@@ -146,22 +149,36 @@ class _DesktopNowPlayingBarState extends State<DesktopNowPlayingBar> {
streamSeconds,
totalSeconds,
);
- return _PositionControl(
- positionSeconds: positionSeconds,
+ final progressWindow = _DesktopProgressWindow.fromChapter(
totalSeconds: totalSeconds,
+ chapter: _chapterProgress ? player.currentChapter : null,
+ );
+ final rangePosition = progressWindow.relativePosition(
+ positionSeconds,
+ );
+ double absolutePosition(double value) =>
+ progressWindow.absolutePosition(value);
+ return _PositionControl(
+ positionSeconds: rangePosition,
+ totalSeconds: progressWindow.durationSeconds,
displaySpeed: _speedAdjustedTime ? player.speed : 1.0,
- enabled: totalSeconds > 0,
+ enabled: progressWindow.durationSeconds > 0,
accent: cs.primary,
onChangeStart: (value) {
- setState(() => _dragPositionSeconds = value);
+ setState(
+ () => _dragPositionSeconds = absolutePosition(value),
+ );
},
onChanged: (value) {
- setState(() => _dragPositionSeconds = value);
+ setState(
+ () => _dragPositionSeconds = absolutePosition(value),
+ );
},
onChangeEnd: (value) async {
- setState(() => _dragPositionSeconds = value);
+ final seekSeconds = absolutePosition(value);
+ setState(() => _dragPositionSeconds = seekSeconds);
await player.seekTo(
- Duration(milliseconds: (value * 1000).round()),
+ Duration(milliseconds: (seekSeconds * 1000).round()),
);
if (mounted) {
setState(() => _dragPositionSeconds = null);
@@ -404,6 +421,56 @@ class _DesktopNowPlayingBarState extends State<DesktopNowPlayingBar> {
}
}
+class _DesktopProgressWindow {
+ final double startSeconds;
+ final double durationSeconds;
+
+ const _DesktopProgressWindow({
+ required this.startSeconds,
+ required this.durationSeconds,
+ });
+
+ factory _DesktopProgressWindow.fromChapter({
+ required double totalSeconds,
+ required Map<String, dynamic>? chapter,
+ }) {
+ if (totalSeconds <= 0 || chapter == null) {
+ return _DesktopProgressWindow(
+ startSeconds: 0,
+ durationSeconds: totalSeconds,
+ );
+ }
+
+ final rawStart = (chapter['start'] as num?)?.toDouble() ?? 0;
+ final rawEnd = (chapter['end'] as num?)?.toDouble() ?? totalSeconds;
+ if (!rawStart.isFinite || !rawEnd.isFinite || rawEnd <= rawStart) {
+ return _DesktopProgressWindow(
+ startSeconds: 0,
+ durationSeconds: totalSeconds,
+ );
+ }
+
+ final start = rawStart.clamp(0.0, totalSeconds).toDouble();
+ final end = rawEnd.clamp(start, totalSeconds).toDouble();
+ if (end <= start) {
+ return _DesktopProgressWindow(
+ startSeconds: 0,
+ durationSeconds: totalSeconds,
+ );
+ }
+ return _DesktopProgressWindow(
+ startSeconds: start,
+ durationSeconds: end - start,
+ );
+ }
+
+ double relativePosition(double absoluteSeconds) =>
+ (absoluteSeconds - startSeconds).clamp(0.0, durationSeconds).toDouble();
+
+ double absolutePosition(double relativeSeconds) =>
+ startSeconds + relativeSeconds.clamp(0.0, durationSeconds).toDouble();
+}
+
class _PositionControl extends StatelessWidget {
final double positionSeconds;
final double totalSeconds;
diff --git a/pubspec.lock b/pubspec.lock
index 701e8758..dee53550 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1376,7 +1376,7 @@ packages:
source: hosted
version: "15.0.0"
web:
- dependency: transitive
+ dependency: "direct main"
description:
name: web
sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
diff --git a/pubspec.yaml b/pubspec.yaml
index 46b244bb..979a0f3f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -79,6 +79,7 @@ dependencies:
# Log sharing
share_plus: ^10.0.0
+ web: ^1.1.1
app_links: ^7.2.1
qr_flutter: ^4.1.0