Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix the most listened stat and let time saved be reset on the stats page

Barnabasd895b2219d47
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index bad2bb0f..49372ae0 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -444,6 +444,13 @@
"statsHeatmapMore": "More",
"statsDayOfWeek": "Average by day of week",
"statsTimeSavedLabel": "Saved by speed",
+ "statsTimeSavedSince": "since {date}",
+ "@statsTimeSavedSince": {
+ "placeholders": { "date": { "type": "String" } }
+ },
+ "statsTimeSavedReset": "Reset time saved",
+ "statsTimeSavedResetConfirm": "Time saved will start counting again from today.",
+ "statsTimeSavedResetDone": "Time saved reset",
"statsOnPaceFor": "On pace for {count} books",
"@statsOnPaceFor": {
"placeholders": { "count": { "type": "int" } }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 199f9784..f8ec4f1e 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -1648,6 +1648,30 @@ abstract class AppLocalizations {
/// **'Saved by speed'**
String get statsTimeSavedLabel;
+ /// No description provided for @statsTimeSavedSince.
+ ///
+ /// In en, this message translates to:
+ /// **'since {date}'**
+ String statsTimeSavedSince(String date);
+
+ /// No description provided for @statsTimeSavedReset.
+ ///
+ /// In en, this message translates to:
+ /// **'Reset time saved'**
+ String get statsTimeSavedReset;
+
+ /// No description provided for @statsTimeSavedResetConfirm.
+ ///
+ /// In en, this message translates to:
+ /// **'Time saved will start counting again from today.'**
+ String get statsTimeSavedResetConfirm;
+
+ /// No description provided for @statsTimeSavedResetDone.
+ ///
+ /// In en, this message translates to:
+ /// **'Time saved reset'**
+ String get statsTimeSavedResetDone;
+
/// No description provided for @statsOnPaceFor.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index a29a0014..7c762885 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -856,6 +856,21 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dart
index acc1b684..24141616 100644
--- a/lib/l10n/app_localizations_el.dart
+++ b/lib/l10n/app_localizations_el.dart
@@ -851,6 +851,21 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 4746bd2a..0f7ef04d 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -851,6 +851,21 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 10ba4925..4b9ad0e8 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -851,6 +851,21 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 652a21b5..7cb6aa29 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -853,6 +853,21 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 304a0291..f0a93be2 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -851,6 +851,21 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index f8d083bc..4ddbbfc5 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -851,6 +851,21 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dart
index 2a32796c..10ab6cdf 100644
--- a/lib/l10n/app_localizations_no.dart
+++ b/lib/l10n/app_localizations_no.dart
@@ -851,6 +851,21 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 80380d22..3878e4ef 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -851,6 +851,21 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dart
index 559b172e..f32ee746 100644
--- a/lib/l10n/app_localizations_ro.dart
+++ b/lib/l10n/app_localizations_ro.dart
@@ -851,6 +851,21 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index af9e8053..be7f766a 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -852,6 +852,21 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 3a7c08e1..49ff8286 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -840,6 +840,21 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get statsTimeSavedLabel => 'Saved by speed';
+ @override
+ String statsTimeSavedSince(String date) {
+ return 'since $date';
+ }
+
+ @override
+ String get statsTimeSavedReset => 'Reset time saved';
+
+ @override
+ String get statsTimeSavedResetConfirm =>
+ 'Time saved will start counting again from today.';
+
+ @override
+ String get statsTimeSavedResetDone => 'Time saved reset';
+
@override
String statsOnPaceFor(int count) {
return 'On pace for $count books';
diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dart
index 4e3d071e..7c9342d6 100644
--- a/lib/screens/stats_screen.dart
+++ b/lib/screens/stats_screen.dart
@@ -45,6 +45,7 @@ class _StatsScreenState extends State<StatsScreen>
String? _selectedSection;
double _selectedDaySeconds = 0;
double _timeSavedSeconds = 0;
+ DateTime? _timeSavedSince;
int _yirYear = DateTime.now().year;
Map<String, dynamic>? _yirData;
bool _yirLoading = false;
@@ -130,6 +131,7 @@ class _StatsScreenState extends State<StatsScreen>
final order = await PlayerSettings.getStatsSectionOrder();
final hidden = await PlayerSettings.getStatsHiddenSections();
final timeSaved = await PlayerSettings.getStatsTimeSaved();
+ final timeSavedSince = await PlayerSettings.getStatsTimeSavedSince();
if (!mounted) return;
setState(() {
if (chartStyle != _chartStyle || chartRange != _chartRange) {
@@ -144,6 +146,7 @@ class _StatsScreenState extends State<StatsScreen>
_statsOrder = order;
_statsHidden = hidden.toSet();
_timeSavedSeconds = timeSaved;
+ _timeSavedSince = timeSavedSince;
});
}
@@ -259,8 +262,12 @@ class _StatsScreenState extends State<StatsScreen>
// The saved-by-speed counter banks while listening, so re-read it on
// every load (incl. pull-to-refresh), not just at screen creation.
final timeSaved = await PlayerSettings.getStatsTimeSaved();
- if (mounted && timeSaved != _timeSavedSeconds) {
- setState(() => _timeSavedSeconds = timeSaved);
+ final timeSavedSince = await PlayerSettings.getStatsTimeSavedSince();
+ if (mounted && (timeSaved != _timeSavedSeconds || timeSavedSince != _timeSavedSince)) {
+ setState(() {
+ _timeSavedSeconds = timeSaved;
+ _timeSavedSince = timeSavedSince;
+ });
}
// Load cached data first so the page renders immediately even offline.
@@ -513,7 +520,17 @@ class _StatsScreenState extends State<StatsScreen>
Expanded(
child: _accentStatCard(tt, cs, Icons.fast_forward_rounded,
Colors.cyan, _formatDuration(_timeSavedSeconds),
- l.statsTimeSavedLabel)),
+ l.statsTimeSavedLabel,
+ subtitle: _timeSavedSince != null
+ ? l.statsTimeSavedSince(
+ MaterialLocalizations.of(context).formatMediumDate(_timeSavedSince!))
+ : null,
+ trailing: IconButton(
+ icon: Icon(Icons.restart_alt_rounded,
+ size: 20, color: cs.onSurfaceVariant),
+ tooltip: l.statsTimeSavedReset,
+ onPressed: _confirmResetTimeSaved,
+ ))),
]),
],
const SizedBox(height: 28),
@@ -1139,9 +1156,32 @@ class _StatsScreenState extends State<StatsScreen>
// --- ACCENT STAT CARD ---
+ Future<void> _confirmResetTimeSaved() async {
+ final l = AppLocalizations.of(context)!;
+ final ok = await showDialog<bool>(
+ context: context,
+ builder: (ctx) => AlertDialog(
+ title: Text(l.statsTimeSavedReset),
+ content: Text(l.statsTimeSavedResetConfirm),
+ actions: [
+ TextButton(onPressed: () => Navigator.pop(ctx, false), child: Text(l.cancel)),
+ FilledButton(onPressed: () => Navigator.pop(ctx, true), child: Text(l.reset)),
+ ],
+ ),
+ );
+ if (ok != true || !mounted) return;
+ await PlayerSettings.resetStatsTimeSaved();
+ if (!mounted) return;
+ setState(() {
+ _timeSavedSeconds = 0;
+ _timeSavedSince = null;
+ });
+ showOverlayToast(context, l.statsTimeSavedResetDone, icon: Icons.restart_alt_rounded);
+ }
+
Widget _accentStatCard(TextTheme tt, ColorScheme cs, IconData icon,
Color accent, String value, String label,
- {VoidCallback? onTap}) {
+ {VoidCallback? onTap, String? subtitle, Widget? trailing}) {
final isTappable = onTap != null;
final card = Container(
padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 14),
@@ -1176,7 +1216,14 @@ class _StatsScreenState extends State<StatsScreen>
Text(label,
style: tt.labelSmall?.copyWith(
color: cs.onSurface.withValues(alpha: 0.35), fontSize: 11)),
+ if (subtitle != null) ...[
+ const SizedBox(height: 2),
+ Text(subtitle,
+ style: tt.labelSmall?.copyWith(
+ color: accent.withValues(alpha: 0.7), fontSize: 11)),
+ ],
])),
+ if (trailing != null) trailing,
if (isTappable)
Icon(Icons.chevron_right_rounded,
size: 20, color: accent.withValues(alpha: 0.7)),
@@ -1303,6 +1350,31 @@ class _StatsScreenState extends State<StatsScreen>
// --- TOP ITEMS ---
List<_TopItem> _topItems() {
+ // Prefer the server's all-time per-item totals from /me/listening-stats,
+ // which sum every session. The _sessions list below is only the paginated
+ // recently-loaded page, so aggregating it under-counts older books and
+ // makes "Most listened" look wrong.
+ final serverItems = _stats?['items'];
+ if (serverItems is Map && serverItems.isNotEmpty) {
+ final items = <_TopItem>[];
+ for (final v in serverItems.values) {
+ if (v is! Map) continue;
+ final meta = v['mediaMetadata'] as Map<String, dynamic>?;
+ final title = meta?['title'] as String? ?? '';
+ if (title.isEmpty) continue;
+ items.add(_TopItem(
+ title: title,
+ author: meta?['authorName'] as String? ?? '',
+ totalSeconds: _safeNum(v['timeListening']),
+ sessionCount: 0, // server totals don't carry a session count
+ ));
+ }
+ items.sort((a, b) => b.totalSeconds.compareTo(a.totalSeconds));
+ return items.take(5).toList();
+ }
+
+ // Fallback (no stats loaded yet / offline): aggregate whatever sessions
+ // are currently loaded.
final Map<String, _TopItem> byTitle = {};
for (final s in _sessions) {
if (s is! Map<String, dynamic>) continue;
@@ -1369,12 +1441,13 @@ class _StatsScreenState extends State<StatsScreen>
style: tt.labelSmall?.copyWith(
color: cs.onSurface.withValues(alpha: 0.5),
fontWeight: FontWeight.w700)),
- Text(
- item.sessionCount == 1
- ? l.statsScreenSessionCountOne(item.sessionCount)
- : l.statsScreenSessionCountOther(item.sessionCount),
- style: TextStyle(
- color: cs.onSurface.withValues(alpha: 0.2), fontSize: 9)),
+ if (item.sessionCount > 0)
+ Text(
+ item.sessionCount == 1
+ ? l.statsScreenSessionCountOne(item.sessionCount)
+ : l.statsScreenSessionCountOther(item.sessionCount),
+ style: TextStyle(
+ color: cs.onSurface.withValues(alpha: 0.2), fontSize: 9)),
]),
]),
),
diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dart
index b9673ac0..570a7066 100644
--- a/lib/services/player_settings.dart
+++ b/lib/services/player_settings.dart
@@ -176,6 +176,21 @@ class PlayerSettings {
/// player as listening time accrues; read-only here.
static Future<double> getStatsTimeSaved() => _get('stats_time_saved', 0.0);
+ /// When the time-saved counter started accruing (null until the first
+ /// banked second). Set once in progress_sync_service.addTimeSaved.
+ static Future<DateTime?> getStatsTimeSavedSince() async {
+ final ms = await ScopedPrefs.getInt('stats_time_saved_since');
+ return ms == null ? null : DateTime.fromMillisecondsSinceEpoch(ms);
+ }
+
+ /// Clear the time-saved total and its start date so it counts fresh from
+ /// the next second listened above 1x.
+ static Future<void> resetStatsTimeSaved() async {
+ await ScopedPrefs.remove('stats_time_saved');
+ await ScopedPrefs.remove('stats_time_saved_since');
+ _notify();
+ }
+
/// Listening chart style on the stats page: 'bar' | 'line'.
/// 'heatmap' used to be a chart style; it's now its own stats section, so a
/// saved 'heatmap' value is coerced back to 'bar'.