Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Add a jump to session end button next to jump to session start

Barnabas19c9e958a45d
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index ea057b87..a8980da9 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -3039,14 +3039,8 @@
"statsScreenOs": "OS",
"statsScreenPlayMethod": "Play method",
"statsScreenLoading": "Loading...",
- "statsScreenJumpToSessionStart": "Jump to session start ({position})",
- "@statsScreenJumpToSessionStart": {
- "placeholders": {
- "position": {
- "type": "String"
- }
- }
- },
+ "statsScreenJumpToStart": "Jump to start",
+ "statsScreenJumpToEnd": "Jump to end",
"statsScreenPlayMethodDirect": "Direct play",
"statsScreenPlayMethodDirectStream": "Direct stream",
"statsScreenPlayMethodTranscode": "Transcode",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 9e122ceb..28c8d5bf 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -9662,11 +9662,17 @@ abstract class AppLocalizations {
/// **'Loading...'**
String get statsScreenLoading;
- /// No description provided for @statsScreenJumpToSessionStart.
+ /// No description provided for @statsScreenJumpToStart.
///
/// In en, this message translates to:
- /// **'Jump to session start ({position})'**
- String statsScreenJumpToSessionStart(String position);
+ /// **'Jump to start'**
+ String get statsScreenJumpToStart;
+
+ /// No description provided for @statsScreenJumpToEnd.
+ ///
+ /// In en, this message translates to:
+ /// **'Jump to end'**
+ String get statsScreenJumpToEnd;
/// No description provided for @statsScreenPlayMethodDirect.
///
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index fb13f7f8..451e8ad6 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -5529,9 +5529,10 @@ class AppLocalizationsDe extends AppLocalizations {
String get statsScreenLoading => 'Lädt...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Zum Sitzungsstart springen ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direktwiedergabe';
diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dart
index 5ca1e916..5741c911 100644
--- a/lib/l10n/app_localizations_el.dart
+++ b/lib/l10n/app_localizations_el.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsEl extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 1a71532c..0a036632 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsEn extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 631091a1..64a87c58 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -5450,9 +5450,10 @@ class AppLocalizationsEs extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 19f06f92..5dacc3f1 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -5499,9 +5499,10 @@ class AppLocalizationsFr extends AppLocalizations {
String get statsScreenLoading => 'Chargement...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 9586f8cb..cbf54f27 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsIt extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index d21b3ab0..ff353ff9 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsJa extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dart
index 6201cf57..c8e3cb16 100644
--- a/lib/l10n/app_localizations_no.dart
+++ b/lib/l10n/app_localizations_no.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsNo extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 8c532179..79b94295 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsPt extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dart
index 2a412d40..3d4bb633 100644
--- a/lib/l10n/app_localizations_ro.dart
+++ b/lib/l10n/app_localizations_ro.dart
@@ -5448,9 +5448,10 @@ class AppLocalizationsRo extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 91bb6f15..53b0238a 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -5452,9 +5452,10 @@ class AppLocalizationsRu extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 7bb8cf31..ebee6026 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -5367,9 +5367,10 @@ class AppLocalizationsZh extends AppLocalizations {
String get statsScreenLoading => 'Loading...';
@override
- String statsScreenJumpToSessionStart(String position) {
- return 'Jump to session start ($position)';
- }
+ String get statsScreenJumpToStart => 'Jump to start';
+
+ @override
+ String get statsScreenJumpToEnd => 'Jump to end';
@override
String get statsScreenPlayMethodDirect => 'Direct play';
diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dart
index 0caf205c..6136954a 100644
--- a/lib/screens/stats_screen.dart
+++ b/lib/screens/stats_screen.dart
@@ -1812,7 +1812,7 @@ class SessionDetailsSheet extends StatefulWidget {
}
class SessionDetailsSheetState extends State<SessionDetailsSheet> {
- bool _jumping = false;
+ _JumpTarget? _jumping;
bool _saving = false;
static double _n(dynamic v) => v is num ? v.toDouble() : 0;
@@ -2106,15 +2106,21 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
return '';
}
- Future<void> _jumpToStart() async {
- if (_jumping) return;
+ Future<void> _jumpToStart() => _jumpTo(_JumpTarget.start);
+
+ Future<void> _jumpToEnd() => _jumpTo(_JumpTarget.end);
+
+ Future<void> _jumpTo(_JumpTarget target) async {
+ if (_jumping != null) return;
final s = widget.session;
final itemId = s['libraryItemId'] as String?;
if (itemId == null) return;
final episodeId = s['episodeId'] as String?;
- final startTime = _n(s['startTime']);
+ final position = target == _JumpTarget.end
+ ? _n(s['currentTime'])
+ : _n(s['startTime']);
- setState(() => _jumping = true);
+ setState(() => _jumping = target);
final lib = context.read<LibraryProvider>();
final api = context.read<AuthProvider>().apiService;
@@ -2122,7 +2128,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
if (player.currentItemId == itemId &&
player.currentEpisodeId == episodeId) {
- await player.seekTo(Duration(seconds: startTime.round()));
+ await player.seekTo(Duration(seconds: position.round()));
if (!player.isPlaying) player.play();
if (!mounted) return;
_finishJump();
@@ -2132,7 +2138,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
if (api == null) {
if (mounted) {
final l = AppLocalizations.of(context)!;
- setState(() => _jumping = false);
+ setState(() => _jumping = null);
showOverlayToast(context, l.bookmarksNotConnected,
icon: Icons.error_outline_rounded);
}
@@ -2151,7 +2157,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
if (fullItem == null) {
if (mounted) {
final l = AppLocalizations.of(context)!;
- setState(() => _jumping = false);
+ setState(() => _jumping = null);
showOverlayToast(context, l.statsScreenCouldNotLoadItem,
icon: Icons.error_outline_rounded);
}
@@ -2177,7 +2183,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
if (episode is! Map<String, dynamic>) {
if (mounted) {
final l = AppLocalizations.of(context)!;
- setState(() => _jumping = false);
+ setState(() => _jumping = null);
showOverlayToast(context, l.statsScreenCouldNotFindEpisode,
icon: Icons.error_outline_rounded);
}
@@ -2209,7 +2215,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
coverUrl: coverUrl,
totalDuration: duration,
chapters: chapters,
- startTime: startTime,
+ startTime: position,
forceStartTime: true,
episodeId: episodeId,
episodeTitle: episodeTitle,
@@ -2218,7 +2224,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
if (!mounted) return;
if (error != null) {
- setState(() => _jumping = false);
+ setState(() => _jumping = null);
showOverlayToast(
context,
error,
@@ -2235,6 +2241,47 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
AppShell.goToAbsorbingGlobal();
}
+ Widget _jumpButton(
+ AppLocalizations l, {
+ required _JumpTarget target,
+ required IconData icon,
+ required String label,
+ required double position,
+ required VoidCallback onPressed,
+ }) {
+ final busy = _jumping == target;
+ return FilledButton.icon(
+ onPressed: _jumping != null ? null : onPressed,
+ icon: busy
+ ? const SizedBox(
+ width: 16,
+ height: 16,
+ child: CircularProgressIndicator(strokeWidth: 2))
+ : Icon(icon),
+ label: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text(
+ busy ? l.statsScreenLoading : label,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ ),
+ Opacity(
+ opacity: 0.8,
+ child: Text(
+ _fmtPos(position),
+ style: const TextStyle(
+ fontSize: 11, fontWeight: FontWeight.normal),
+ ),
+ ),
+ ],
+ ),
+ style: FilledButton.styleFrom(
+ padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 12),
+ ),
+ );
+ }
+
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
@@ -2396,25 +2443,29 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
_playMethodLabel(playMethod, l)),
const SizedBox(height: 24),
if (itemId != null)
- SizedBox(
- width: double.infinity,
- child: FilledButton.icon(
- onPressed: _jumping ? null : _jumpToStart,
- icon: _jumping
- ? const SizedBox(
- width: 16,
- height: 16,
- child: CircularProgressIndicator(
- strokeWidth: 2))
- : const Icon(Icons.replay_rounded),
- label: Text(_jumping
- ? l.statsScreenLoading
- : l.statsScreenJumpToSessionStart(_fmtPos(startTime))),
- style: FilledButton.styleFrom(
- padding: const EdgeInsets.symmetric(vertical: 14),
+ Row(children: [
+ Expanded(
+ child: _jumpButton(
+ l,
+ target: _JumpTarget.start,
+ icon: Icons.skip_previous_rounded,
+ label: l.statsScreenJumpToStart,
+ position: startTime,
+ onPressed: _jumpToStart,
),
),
- ),
+ const SizedBox(width: 10),
+ Expanded(
+ child: _jumpButton(
+ l,
+ target: _JumpTarget.end,
+ icon: Icons.skip_next_rounded,
+ label: l.statsScreenJumpToEnd,
+ position: currentTime,
+ onPressed: _jumpToEnd,
+ ),
+ ),
+ ]),
const SizedBox(height: 10),
Row(children: [
if (widget.allowEdit) ...[
@@ -2485,3 +2536,5 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
}
}
}
+
+enum _JumpTarget { start, end }