A cross platform Audiobookshelf client for Android and iOS
Dart
Add stats widget and a finished books browser on the stats page (#190)
Nathan Poulsona971b3c0b30c
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xmlindex eddd8638..038eba05 100644--- a/android/app/src/main/AndroidManifest.xml+++ b/android/app/src/main/AndroidManifest.xml@@ -135,7 +135,17 @@android:resource="@xml/now_playing_widget_compact_info" /></receiver>-+ <!-- Listening stats homescreen widget (4x2) -->+ <receiver+ android:name=".StatsWidget"+ android:exported="true">+ <intent-filter>+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />+ </intent-filter>+ <meta-data+ android:name="android.appwidget.provider"+ android:resource="@xml/stats_widget_info" />+ </receiver></application>diff --git a/android/app/src/main/kotlin/com/barnabas/absorb/StatsWidget.kt b/android/app/src/main/kotlin/com/barnabas/absorb/StatsWidget.ktnew file mode 100644index 00000000..6d9e9b56--- /dev/null+++ b/android/app/src/main/kotlin/com/barnabas/absorb/StatsWidget.kt@@ -0,0 +1,81 @@+package com.barnabas.absorb++import android.app.PendingIntent+import android.appwidget.AppWidgetManager+import android.appwidget.AppWidgetProvider+import android.content.Context+import android.content.Intent+import android.os.Build+import android.util.Log+import android.widget.RemoteViews+import es.antonborri.home_widget.HomeWidgetPlugin++class StatsWidget : AppWidgetProvider() {++ override fun onUpdate(+ context: Context,+ appWidgetManager: AppWidgetManager,+ appWidgetIds: IntArray+ ) {+ for (appWidgetId in appWidgetIds) {+ updateWidget(context, appWidgetManager, appWidgetId)+ }+ }++ companion object {++ private fun formatTime(seconds: Int): String {+ if (seconds <= 0) return "0m"+ val hours = seconds / 3600+ val minutes = (seconds % 3600) / 60+ return if (hours > 0) {+ if (minutes == 0) "${hours}h" else "${hours}h ${minutes}m"+ } else {+ "${minutes}m"+ }+ }++ fun updateWidget(+ context: Context,+ appWidgetManager: AppWidgetManager,+ appWidgetId: Int+ ) {+ val widgetData = HomeWidgetPlugin.getData(context)+ val views = RemoteViews(context.packageName, R.layout.stats_widget)++ // OnePlus launchers add their own generous widget padding,+ // so zero ours out to avoid double-padding.+ if (Build.MANUFACTURER.equals("OnePlus", ignoreCase = true)) {+ views.setViewPadding(R.id.widget_outer, 0, 0, 0, 0)+ }++ val todaySeconds = widgetData.getInt("widget_stats_today", 0)+ val weekSeconds = widgetData.getInt("widget_stats_week", 0)+ val streakDays = widgetData.getInt("widget_stats_streak", 0)+ val booksYear = widgetData.getInt("widget_stats_books_year", 0)++ Log.d(+ "StatsWidget",+ "update id=$appWidgetId today=${todaySeconds}s week=${weekSeconds}s streak=${streakDays}d booksYear=$booksYear"+ )++ views.setTextViewText(R.id.widget_stat_today_value, formatTime(todaySeconds))+ views.setTextViewText(R.id.widget_stat_week_value, formatTime(weekSeconds))+ views.setTextViewText(R.id.widget_stat_streak_value, streakDays.toString())+ views.setTextViewText(R.id.widget_stat_books_year_value, booksYear.toString())++ // Tap anywhere on the widget opens the app.+ val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)+ if (launchIntent != null) {+ launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)+ val pendingIntent = PendingIntent.getActivity(+ context, 0, launchIntent,+ PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT+ )+ views.setOnClickPendingIntent(R.id.widget_root, pendingIntent)+ }++ appWidgetManager.updateAppWidget(appWidgetId, views)+ }+ }+}diff --git a/android/app/src/main/res/layout/stats_widget.xml b/android/app/src/main/res/layout/stats_widget.xmlnew file mode 100644index 00000000..f3548ddb--- /dev/null+++ b/android/app/src/main/res/layout/stats_widget.xml@@ -0,0 +1,136 @@+<?xml version="1.0" encoding="utf-8"?>+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"+ android:id="@+id/widget_outer"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:paddingStart="5dp"+ android:paddingEnd="5dp"+ android:paddingTop="35dp"+ android:paddingBottom="35dp">++ <LinearLayout+ android:id="@+id/widget_root"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:orientation="vertical"+ android:background="@drawable/widget_background"+ android:clipToOutline="true"+ android:padding="10dp">++ <LinearLayout+ android:layout_width="match_parent"+ android:layout_height="0dp"+ android:layout_weight="1"+ android:orientation="horizontal">++ <LinearLayout+ android:layout_width="0dp"+ android:layout_height="match_parent"+ android:layout_weight="1"+ android:orientation="vertical"+ android:gravity="center">++ <TextView+ android:id="@+id/widget_stat_today_value"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="0m"+ android:textColor="#FFFFFF"+ android:textSize="20sp"+ android:textStyle="bold"+ android:fontFamily="sans-serif-medium" />++ <TextView+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="Today"+ android:textColor="#99FFFFFF"+ android:textSize="11sp" />+ </LinearLayout>++ <LinearLayout+ android:layout_width="0dp"+ android:layout_height="match_parent"+ android:layout_weight="1"+ android:orientation="vertical"+ android:gravity="center">++ <TextView+ android:id="@+id/widget_stat_week_value"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="0m"+ android:textColor="#FFFFFF"+ android:textSize="20sp"+ android:textStyle="bold"+ android:fontFamily="sans-serif-medium" />++ <TextView+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="This week"+ android:textColor="#99FFFFFF"+ android:textSize="11sp" />+ </LinearLayout>+ </LinearLayout>++ <LinearLayout+ android:layout_width="match_parent"+ android:layout_height="0dp"+ android:layout_weight="1"+ android:orientation="horizontal">++ <LinearLayout+ android:layout_width="0dp"+ android:layout_height="match_parent"+ android:layout_weight="1"+ android:orientation="vertical"+ android:gravity="center">++ <TextView+ android:id="@+id/widget_stat_streak_value"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="0"+ android:textColor="#FFFFFF"+ android:textSize="20sp"+ android:textStyle="bold"+ android:fontFamily="sans-serif-medium" />++ <TextView+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="Day streak"+ android:textColor="#99FFFFFF"+ android:textSize="11sp" />+ </LinearLayout>++ <LinearLayout+ android:layout_width="0dp"+ android:layout_height="match_parent"+ android:layout_weight="1"+ android:orientation="vertical"+ android:gravity="center">++ <TextView+ android:id="@+id/widget_stat_books_year_value"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="0"+ android:textColor="#FFFFFF"+ android:textSize="20sp"+ android:textStyle="bold"+ android:fontFamily="sans-serif-medium" />++ <TextView+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="Books this year"+ android:textColor="#99FFFFFF"+ android:textSize="11sp" />+ </LinearLayout>+ </LinearLayout>++ </LinearLayout>++</FrameLayout>diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xmlindex 7dd45a29..a5159def 100644--- a/android/app/src/main/res/values/strings.xml+++ b/android/app/src/main/res/values/strings.xml@@ -2,4 +2,5 @@<resources><string name="widget_description">Shows the currently playing audiobook with playback controls.</string><string name="widget_compact_description">Compact now-playing bar with playback controls.</string>+ <string name="widget_stats_description">Listening stats: today, this week, streak, and books finished this year.</string></resources>diff --git a/android/app/src/main/res/xml/stats_widget_info.xml b/android/app/src/main/res/xml/stats_widget_info.xmlnew file mode 100644index 00000000..b4690b53--- /dev/null+++ b/android/app/src/main/res/xml/stats_widget_info.xml@@ -0,0 +1,13 @@+<?xml version="1.0" encoding="utf-8"?>+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"+ android:initialLayout="@layout/stats_widget"+ android:minWidth="250dp"+ android:minHeight="110dp"+ android:targetCellWidth="4"+ android:targetCellHeight="2"+ android:resizeMode="horizontal"+ android:widgetCategory="home_screen"+ android:previewImage="@mipmap/ic_launcher"+ android:previewLayout="@layout/stats_widget"+ android:description="@string/widget_stats_description"+ android:updatePeriodMillis="0" />diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 84802359..a8dae702 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -214,6 +214,10 @@"statsCurrentStreak": "Current Streak","statsBestStreak": "Best Streak","statsFinished": "Finished",+ "statsBooksFinished": "Books",+ "statsEpisodesFinished": "Episodes",+ "statsBooksThisYear": "Books this year",+ "statsEpisodesThisYear": "Episodes this year","statsDaysActive": "Days Active","statsDailyAverage": "Daily Average","statsLast7Days": "Last 7 Days",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 54c59c60..d8018666 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -1208,6 +1208,30 @@ abstract class AppLocalizations {/// **'Finished'**String get statsFinished;+ /// No description provided for @statsBooksFinished.+ ///+ /// In en, this message translates to:+ /// **'Books'**+ String get statsBooksFinished;++ /// No description provided for @statsEpisodesFinished.+ ///+ /// In en, this message translates to:+ /// **'Episodes'**+ String get statsEpisodesFinished;++ /// No description provided for @statsBooksThisYear.+ ///+ /// In en, this message translates to:+ /// **'Books this year'**+ String get statsBooksThisYear;++ /// No description provided for @statsEpisodesThisYear.+ ///+ /// In en, this message translates to:+ /// **'Episodes this year'**+ String get statsEpisodesThisYear;+/// No description provided for @statsDaysActive.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex fe0fa1c7..79acf639 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -610,6 +610,18 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get statsFinished => 'Finished';+ @override+ String get statsBooksFinished => 'Books';++ @override+ String get statsEpisodesFinished => 'Episodes';++ @override+ String get statsBooksThisYear => 'Books this year';++ @override+ String get statsEpisodesThisYear => 'Episodes this year';+@overrideString get statsDaysActive => 'Days Active';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex dbdd8a4e..963ceba7 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -600,6 +600,18 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get statsFinished => '已完成';+ @override+ String get statsBooksFinished => '书籍';++ @override+ String get statsEpisodesFinished => '单集';++ @override+ String get statsBooksThisYear => '今年书籍';++ @override+ String get statsEpisodesThisYear => '今年单集';+@overrideString get statsDaysActive => '活跃天数';diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arbindex d1ed18b4..3088e268 100644--- a/lib/l10n/app_zh.arb+++ b/lib/l10n/app_zh.arb@@ -214,6 +214,10 @@"statsCurrentStreak": "当前连续天数","statsBestStreak": "最佳连续天数","statsFinished": "已完成",+ "statsBooksFinished": "书籍",+ "statsEpisodesFinished": "单集",+ "statsBooksThisYear": "今年书籍",+ "statsEpisodesThisYear": "今年单集","statsDaysActive": "活跃天数","statsDailyAverage": "日均时长","statsLast7Days": "过去7天",diff --git a/lib/providers/_lp_absorbing.dart b/lib/providers/_lp_absorbing.dartindex d4e8df1c..66bb1271 100644--- a/lib/providers/_lp_absorbing.dart+++ b/lib/providers/_lp_absorbing.dart@@ -404,6 +404,9 @@ mixin _AbsorbingMixin on ChangeNotifier, _StateMixin, _CoreMixin {_localProgressOverrides[itemId] = 1.0;_lastFinishedItemId = itemId;_locallyFinishedItems.add(itemId);+ // Stats widget shows "books finished this year"; force a refresh so it+ // reflects the new count without waiting on the 15-min throttle.+ HomeWidgetService().refreshStats(force: true);if (_absorbingBookIds.remove(itemId)) {_absorbingBookIds.insert(0, itemId);}diff --git a/lib/providers/_lp_state.dart b/lib/providers/_lp_state.dartindex 77b2efc4..fe0b5273 100644--- a/lib/providers/_lp_state.dart+++ b/lib/providers/_lp_state.dart@@ -133,6 +133,71 @@ mixin _StateMixin on ChangeNotifier {int get finishedCount =>_progressMap.values.where((p) => p['isFinished'] == true).length;+ int get finishedBooksCount => _progressMap.values.where((p) {+ if (p['isFinished'] != true) return false;+ final ep = p['episodeId'];+ return ep == null || (ep is String && ep.isEmpty);+ }).length;++ int get finishedEpisodesCount => _progressMap.values.where((p) {+ if (p['isFinished'] != true) return false;+ final ep = p['episodeId'];+ return ep is String && ep.isNotEmpty;+ }).length;++ int get finishedBooksThisYearCount {+ final year = DateTime.now().year;+ var count = 0;+ for (final p in _progressMap.values) {+ if (p['isFinished'] != true) continue;+ final ep = p['episodeId'];+ if (ep is String && ep.isNotEmpty) continue;+ final raw = p['finishedAt'];+ if (raw is! num) continue;+ final dt = DateTime.fromMillisecondsSinceEpoch(raw.toInt());+ if (dt.year == year) count++;+ }+ return count;+ }++ /// IDs of books finished this year, newest-first (by finishedAt).+ /// Podcasts are excluded. Used by the stats-screen detail sheet to load+ /// full item data on demand.+ List<String> get finishedBooksThisYearIds {+ final year = DateTime.now().year;+ final entries = <MapEntry<String, int>>[];+ for (final p in _progressMap.values) {+ if (p['isFinished'] != true) continue;+ final ep = p['episodeId'];+ if (ep is String && ep.isNotEmpty) continue;+ final raw = p['finishedAt'];+ if (raw is! num) continue;+ final ts = raw.toInt();+ final dt = DateTime.fromMillisecondsSinceEpoch(ts);+ if (dt.year != year) continue;+ final id = p['libraryItemId'] as String?;+ if (id == null) continue;+ entries.add(MapEntry(id, ts));+ }+ entries.sort((a, b) => b.value.compareTo(a.value));+ return entries.map((e) => e.key).toList();+ }++ int get finishedEpisodesThisYearCount {+ final year = DateTime.now().year;+ var count = 0;+ for (final p in _progressMap.values) {+ if (p['isFinished'] != true) continue;+ final ep = p['episodeId'];+ if (ep is! String || ep.isEmpty) continue;+ final raw = p['finishedAt'];+ if (raw is! num) continue;+ final dt = DateTime.fromMillisecondsSinceEpoch(raw.toInt());+ if (dt.year == year) count++;+ }+ return count;+ }+Map<String, String> get mediaHeaders => _api?.mediaHeaders ?? {};Map<String, dynamic>? getSeriesBooksCache(String seriesId) =>diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dartindex b32ff30f..9a0adcdf 100644--- a/lib/providers/auth_provider.dart+++ b/lib/providers/auth_provider.dart@@ -9,6 +9,7 @@ import '../services/equalizer_service.dart';import '../services/session_cache.dart';import '../services/socket_service.dart';import '../services/user_account_service.dart';+import '../services/home_widget_service.dart';import '../l10n/app_localizations.dart';import '../main.dart' show scaffoldMessengerKey, rootNavigatorKey;@@ -316,6 +317,10 @@ class AuthProvider extends ChangeNotifier {));} catch (_) {}+ // Wipe any previous user's stats from the widget and pull this user's.+ await HomeWidgetService().clearStats();+ HomeWidgetService().refreshStats(force: true);+_isLoading = false;notifyListeners();return true;@@ -394,6 +399,10 @@ class AuthProvider extends ChangeNotifier {));} catch (_) {}+ // Wipe any previous user's stats from the widget and pull this user's.+ await HomeWidgetService().clearStats();+ HomeWidgetService().refreshStats(force: true);+_isLoading = false;notifyListeners();return true;@@ -496,6 +505,9 @@ class AuthProvider extends ChangeNotifier {// Clear Android Auto browse tree cache so it doesn't show stale dataAndroidAutoService().clearCache();+ // Clear the stats widget so the previous user's numbers don't linger.+ await HomeWidgetService().clearStats();+// Clear cached session metadata for this user (track URLs would be invalid// on next login anyway)await SessionCache.clearAll();@@ -584,6 +596,11 @@ class AuthProvider extends ChangeNotifier {if (_userId != null) await prefs.setString('user_id', _userId!);} catch (_) {}+ // Clear the stats widget so the previous account's numbers don't linger+ // while the new user's data is fetched, then force a refresh.+ await HomeWidgetService().clearStats();+ HomeWidgetService().refreshStats(force: true);+// Restore custom headers for this sessiontry {final prefs = await SharedPreferences.getInstance();diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dartindex 3c678823..45b52d69 100644--- a/lib/providers/library_provider.dart+++ b/lib/providers/library_provider.dart@@ -15,6 +15,7 @@ import '../services/chromecast_service.dart';import '../services/bookmark_service.dart';import '../services/session_cache.dart';import '../services/socket_service.dart';+import '../services/home_widget_service.dart';import '../l10n/app_localizations.dart';import '../main.dart' show scaffoldMessengerKey, rootNavigatorKey;diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dartindex d1535127..efd53e23 100644--- a/lib/screens/stats_screen.dart+++ b/lib/screens/stats_screen.dart@@ -8,6 +8,7 @@ import '../providers/auth_provider.dart';import '../providers/library_provider.dart';import '../services/audio_player_service.dart';import '../widgets/absorb_page_header.dart';+import '../widgets/finished_books_this_year_sheet.dart';import '../widgets/absorb_wave_icon.dart';import '../widgets/card_buttons.dart';import '../main.dart' show oledNotifier;@@ -26,6 +27,9 @@ class _StatsScreenState extends State<StatsScreen>List<dynamic> _sessions = [];bool _isLoading = true;int _booksFinished = 0;+ int _episodesFinished = 0;+ int _booksFinishedThisYear = 0;+ int _episodesFinishedThisYear = 0;late AnimationController _animController;late Animation<double> _animValue;@@ -103,7 +107,10 @@ class _StatsScreenState extends State<StatsScreen>setState(() {_stats = stats;_sessions = sessions;- _booksFinished = lib.finishedCount;+ _booksFinished = lib.finishedBooksCount;+ _episodesFinished = lib.finishedEpisodesCount;+ _booksFinishedThisYear = lib.finishedBooksThisYearCount;+ _episodesFinishedThisYear = lib.finishedEpisodesThisYearCount;_isLoading = false;});_animController.reset();@@ -119,7 +126,10 @@ class _StatsScreenState extends State<StatsScreen>// Phase 1: load core stats from network and cache them.final stats = await api.getListeningStats();- final finished = lib.finishedCount;+ final finishedBooks = lib.finishedBooksCount;+ final finishedEpisodes = lib.finishedEpisodesCount;+ final finishedBooksYear = lib.finishedBooksThisYearCount;+ final finishedEpisodesYear = lib.finishedEpisodesThisYearCount;if (stats != null) {prefs.setString(_kStats, jsonEncode(stats));@@ -128,7 +138,10 @@ class _StatsScreenState extends State<StatsScreen>if (mounted) {setState(() {_stats = stats ?? _stats; // keep cached if network failed- _booksFinished = finished;+ _booksFinished = finishedBooks;+ _episodesFinished = finishedEpisodes;+ _booksFinishedThisYear = finishedBooksYear;+ _episodesFinishedThisYear = finishedEpisodesYear;_isLoading = false;});if (_animController.status != AnimationStatus.forward &&@@ -278,16 +291,41 @@ class _StatsScreenState extends State<StatsScreen>const SizedBox(height: 8),Row(children: [Expanded(- child: _accentStatCard(tt, cs, Icons.check_circle_rounded,- Colors.green, '$_booksFinished', l.statsFinished)),- const SizedBox(width: 8),+ child: _accentStatCard(tt, cs, Icons.menu_book_rounded,+ Colors.green, '$_booksFinished', l.statsBooksFinished)),+ if (_episodesFinished > 0) ...[+ const SizedBox(width: 8),+ Expanded(+ child: _accentStatCard(tt, cs, Icons.podcasts_rounded,+ Colors.purple, '$_episodesFinished', l.statsEpisodesFinished)),+ ],+ ]),+ const SizedBox(height: 8),+ Row(children: [+ Expanded(+ child: _accentStatCard(tt, cs, Icons.auto_stories_rounded,+ Colors.teal, '$_booksFinishedThisYear', l.statsBooksThisYear,+ onTap: _booksFinishedThisYear > 0+ ? () => showFinishedBooksThisYearSheet(context)+ : null)),+ if (_episodesFinishedThisYear > 0) ...[+ const SizedBox(width: 8),+ Expanded(+ child: _accentStatCard(tt, cs, Icons.graphic_eq_rounded,+ Colors.deepPurple, '$_episodesFinishedThisYear',+ l.statsEpisodesThisYear)),+ ],+ ]),+ const SizedBox(height: 8),+ Row(children: [Expanded(child: _accentStatCard(tt, cs, Icons.calendar_today_rounded,cs.primary, '$activeDays', l.statsDaysActive)),+ const SizedBox(width: 8),+ Expanded(+ child: _accentStatCard(tt, cs, Icons.speed_rounded, cs.tertiary,+ _formatDuration(avgDaily), l.statsDailyAverage)),]),- const SizedBox(height: 8),- _accentStatCard(tt, cs, Icons.speed_rounded, cs.tertiary,- _formatDuration(avgDaily), l.statsDailyAverage),const SizedBox(height: 28),// -- Last 7 days chart --@@ -416,13 +454,20 @@ class _StatsScreenState extends State<StatsScreen>// --- ACCENT STAT CARD ---Widget _accentStatCard(TextTheme tt, ColorScheme cs, IconData icon,- Color accent, String value, String label) {- return Container(+ Color accent, String value, String label,+ {VoidCallback? onTap}) {+ final isTappable = onTap != null;+ final card = Container(padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 14),decoration: BoxDecoration(- color: cs.onSurface.withValues(alpha: 0.04),+ color: isTappable+ ? accent.withValues(alpha: 0.06)+ : cs.onSurface.withValues(alpha: 0.04),borderRadius: BorderRadius.circular(14),- border: Border.all(color: cs.onSurface.withValues(alpha: 0.06)),+ border: Border.all(+ color: isTappable+ ? accent.withValues(alpha: 0.25)+ : cs.onSurface.withValues(alpha: 0.06)),),child: Row(children: [Container(@@ -446,8 +491,21 @@ class _StatsScreenState extends State<StatsScreen>style: tt.labelSmall?.copyWith(color: cs.onSurface.withValues(alpha: 0.35), fontSize: 11)),])),+ if (isTappable)+ Icon(Icons.chevron_right_rounded,+ size: 20, color: accent.withValues(alpha: 0.7)),]),);+ if (!isTappable) return card;+ return Material(+ color: Colors.transparent,+ borderRadius: BorderRadius.circular(14),+ child: InkWell(+ onTap: onTap,+ borderRadius: BorderRadius.circular(14),+ child: card,+ ),+ );}// --- PERIOD CARD ---diff --git a/lib/services/home_widget_service.dart b/lib/services/home_widget_service.dartindex 630a792b..2c5b5dea 100644--- a/lib/services/home_widget_service.dart+++ b/lib/services/home_widget_service.dart@@ -14,6 +14,8 @@ import 'download_service.dart';const String _androidWidgetName = 'NowPlayingWidget';const String _androidWidgetCompactName = 'NowPlayingWidgetCompact';+const String _androidWidgetStatsName = 'StatsWidget';+const Duration _statsThrottle = Duration(minutes: 15);class HomeWidgetService {static final HomeWidgetService _instance = HomeWidgetService._();@@ -21,11 +23,14 @@ class HomeWidgetService {HomeWidgetService._();Timer? _progressTimer;+ Timer? _statsTimer;Timer? _pendingUpdate;String? _lastCoverItemId;DateTime? _lastUpdate;+ DateTime? _lastStatsFetch;bool _initialized = false;bool _updating = false;+ bool _refreshingStats = false;StreamSubscription? _clickSub;/// Call after AudioPlayerService is initialized to start pushing state.@@ -47,10 +52,19 @@ class HomeWidgetService {// Push current state in case a widget already exists._scheduleUpdate();+ // Fetch stats in the background so the StatsWidget renders fresh on launch.+ refreshStats();++ // Stats timer runs even while the app is backgrounded so "today" keeps+ // ticking on the widget during long listening sessions without needing+ // the user to open the app. 15-min cadence matches the refresh throttle.+ _statsTimer?.cancel();+ _statsTimer = Timer.periodic(_statsThrottle, (_) => refreshStats());}void dispose() {_progressTimer?.cancel();+ _statsTimer?.cancel();_pendingUpdate?.cancel();_clickSub?.cancel();AudioPlayerService().removeListener(_onPlayerChanged);@@ -252,6 +266,172 @@ class HomeWidgetService {await HomeWidget.updateWidget(name: _androidWidgetName);await HomeWidget.updateWidget(name: _androidWidgetCompactName);+ await HomeWidget.updateWidget(name: _androidWidgetStatsName);+ }++ /// Fetch listening stats from the server and push them to the StatsWidget.+ /// Throttled to once per 15 minutes since stats drift slowly. Pass `force`+ /// to bypass the throttle (e.g. on app foreground after a long gap).+ /// Wipe stats values so a stale user's numbers don't linger on the widget+ /// during an account switch. Call before refreshStats so the widget shows+ /// zeros for the few hundred ms until the new user's data arrives.+ Future<void> clearStats() async {+ try {+ await HomeWidget.saveWidgetData<int>('widget_stats_today', 0);+ await HomeWidget.saveWidgetData<int>('widget_stats_week', 0);+ await HomeWidget.saveWidgetData<int>('widget_stats_streak', 0);+ await HomeWidget.saveWidgetData<int>('widget_stats_books_year', 0);+ await HomeWidget.updateWidget(name: _androidWidgetStatsName);+ _lastStatsFetch = null;+ debugPrint('[StatsWidget] Cleared (account switch or logout)');+ } catch (e) {+ debugPrint('[StatsWidget] Clear failed: $e');+ }+ }++ Future<void> refreshStats({bool force = false}) async {+ if (_refreshingStats) {+ debugPrint('[StatsWidget] Skipping refresh: already in flight');+ return;+ }+ if (!force && _lastStatsFetch != null) {+ final since = DateTime.now().difference(_lastStatsFetch!);+ if (since < _statsThrottle) {+ debugPrint('[StatsWidget] Skipping refresh: ${since.inSeconds}s since last (throttle=${_statsThrottle.inSeconds}s)');+ return;+ }+ }+ _refreshingStats = true;+ try {+ final api = await _buildApiService();+ if (api == null) {+ debugPrint('[StatsWidget] Skipping refresh: no server/token in prefs');+ return;+ }++ debugPrint('[StatsWidget] Fetching listening-stats and /me');+ final stats = await api.getListeningStats();+ final me = await api.getMe();+ _lastStatsFetch = DateTime.now();++ if (stats == null) debugPrint('[StatsWidget] listening-stats returned null');+ if (me == null) debugPrint('[StatsWidget] /me returned null');++ final dailyMap = _extractDailyMap(stats);+ final today = _todaySeconds(dailyMap).round();+ final week = _weekSeconds(dailyMap).round();+ final streak = _currentStreak(dailyMap);+ final booksYear = _countBooksFinishedThisYear(me);++ debugPrint('[StatsWidget] Computed: today=${today}s week=${week}s streak=${streak}d booksThisYear=$booksYear (dailyMapKeys=${dailyMap.length})');++ await HomeWidget.saveWidgetData<int>('widget_stats_today', today);+ await HomeWidget.saveWidgetData<int>('widget_stats_week', week);+ await HomeWidget.saveWidgetData<int>('widget_stats_streak', streak);+ await HomeWidget.saveWidgetData<int>('widget_stats_books_year', booksYear);+ await HomeWidget.updateWidget(name: _androidWidgetStatsName);+ debugPrint('[StatsWidget] Pushed and updateWidget(StatsWidget) called');+ } catch (e) {+ debugPrint('[StatsWidget] Refresh failed: $e');+ } finally {+ _refreshingStats = false;+ }+ }++ Future<ApiService?> _buildApiService() async {+ final prefs = await SharedPreferences.getInstance();+ final serverUrl = prefs.getString('server_url');+ final token = prefs.getString('token');+ if (serverUrl == null || token == null) return null;+ final refreshToken = prefs.getString('refresh_token');++ Map<String, String>? customHeaders;+ final headersJson = prefs.getString('custom_headers');+ if (headersJson != null) {+ try {+ customHeaders =+ Map<String, String>.from(jsonDecode(headersJson) as Map);+ } catch (_) {}+ }++ return ApiService(+ baseUrl: serverUrl,+ token: token,+ refreshToken: refreshToken,+ isLegacyToken: refreshToken == null,+ customHeaders: customHeaders ?? const {},+ );+ }++ Map<String, dynamic> _extractDailyMap(Map<String, dynamic>? stats) {+ if (stats == null) return {};+ for (final key in ['dayListeningMap', 'days']) {+ final val = stats[key];+ if (val is Map<String, dynamic>) return val;+ }+ return {};+ }++ String _dateKey(DateTime d) =>+ '${d.year}-${d.month.toString().padLeft(2, '0')}-${d.day.toString().padLeft(2, '0')}';++ double _daySeconds(Map<String, dynamic> map, String key) {+ final val = map[key];+ if (val is num) return val.toDouble();+ if (val is Map) {+ final t = val['timeListening'];+ if (t is num && t > 0) return t.toDouble();+ final total = val['totalTime'];+ if (total is num) return total.toDouble();+ }+ return 0;+ }++ double _todaySeconds(Map<String, dynamic> dailyMap) =>+ _daySeconds(dailyMap, _dateKey(DateTime.now()));++ double _weekSeconds(Map<String, dynamic> dailyMap) {+ final now = DateTime.now();+ double total = 0;+ for (int i = 0; i < 7; i++) {+ total += _daySeconds(dailyMap, _dateKey(now.subtract(Duration(days: i))));+ }+ return total;+ }++ int _currentStreak(Map<String, dynamic> dailyMap) {+ int streak = 0;+ final now = DateTime.now();+ final startOffset = _daySeconds(dailyMap, _dateKey(now)) > 0 ? 0 : 1;+ for (int i = startOffset; i < 365; i++) {+ if (_daySeconds(dailyMap, _dateKey(now.subtract(Duration(days: i)))) > 0) {+ streak++;+ } else {+ break;+ }+ }+ return streak;+ }++ int _countBooksFinishedThisYear(Map<String, dynamic>? me) {+ if (me == null) return 0;+ final progress = me['mediaProgress'];+ if (progress is! List) return 0;+ final year = DateTime.now().year;+ var count = 0;+ for (final entry in progress) {+ if (entry is! Map) continue;+ if (entry['isFinished'] != true) continue;+ // episodeId is non-null for podcast entries — exclude so the "books"+ // count doesn't inflate with every finished podcast episode.+ final episodeId = entry['episodeId'];+ if (episodeId is String && episodeId.isNotEmpty) continue;+ final raw = entry['finishedAt'];+ if (raw is! num) continue;+ final dt = DateTime.fromMillisecondsSinceEpoch(raw.toInt());+ if (dt.year == year) count++;+ }+ return count;}Future<void> _updateCoverArt(String itemId) async {@@ -306,6 +486,9 @@ class HomeWidgetService {if (_progressTimer?.isActive == true) return;_progressTimer = Timer.periodic(const Duration(seconds: 120), (_) {_scheduleUpdate();+ // Piggyback a stats refresh; the 15-min throttle inside refreshStats+ // keeps this cheap even though the timer ticks every 2 minutes.+ refreshStats();});}@@ -323,5 +506,6 @@ class HomeWidgetService {_startProgressTimer();_scheduleUpdate();}+ refreshStats();}}diff --git a/lib/widgets/finished_books_this_year_sheet.dart b/lib/widgets/finished_books_this_year_sheet.dartnew file mode 100644index 00000000..dd90df6d--- /dev/null+++ b/lib/widgets/finished_books_this_year_sheet.dart@@ -0,0 +1,385 @@+import 'dart:io';+import 'package:cached_network_image/cached_network_image.dart';+import 'package:flutter/material.dart';+import 'package:provider/provider.dart';+import '../l10n/app_localizations.dart';+import '../providers/auth_provider.dart';+import '../providers/library_provider.dart';+import '../services/audio_player_service.dart';+import '../services/download_service.dart';+import 'book_detail_sheet.dart';+import 'stackable_sheet.dart';++/// Show a modal sheet listing every book the user has finished in the+/// current calendar year. Loads full item metadata on demand so it can+/// render covers + metadata + still-in-library detection for each one.+void showFinishedBooksThisYearSheet(BuildContext context) {+ showStackableSheet(+ context: context,+ useSafeArea: true,+ showHandle: true,+ maxChildSize: 0.95,+ builder: (ctx, scrollController) => FinishedBooksThisYearSheet(+ scrollController: scrollController,+ ),+ );+}++class FinishedBooksThisYearSheet extends StatefulWidget {+ final ScrollController scrollController;+ const FinishedBooksThisYearSheet({+ super.key,+ required this.scrollController,+ });++ @override+ State<FinishedBooksThisYearSheet> createState() =>+ _FinishedBooksThisYearSheetState();+}++class _FinishedBooksThisYearSheetState+ extends State<FinishedBooksThisYearSheet> {+ bool _isLoading = true;+ bool _gridView = false;+ List<Map<String, dynamic>> _items = [];++ @override+ void initState() {+ super.initState();+ PlayerSettings.getSectionGridView().then((v) {+ if (mounted && v != _gridView) setState(() => _gridView = v);+ });+ _load();+ }++ Future<void> _load() async {+ final auth = context.read<AuthProvider>();+ final lib = context.read<LibraryProvider>();+ final api = auth.apiService;+ final ids = lib.finishedBooksThisYearIds;++ if (api == null || ids.isEmpty) {+ if (mounted) setState(() => _isLoading = false);+ return;+ }++ final results = await Future.wait(ids.map((id) => api.getLibraryItem(id)));+ final items = <Map<String, dynamic>>[];+ for (var i = 0; i < results.length; i++) {+ final r = results[i];+ if (r == null) continue;+ items.add(r);+ }++ if (mounted) {+ setState(() {+ _items = items;+ _isLoading = false;+ });+ }+ }++ void _toggleGridView() {+ setState(() => _gridView = !_gridView);+ PlayerSettings.setSectionGridView(_gridView);+ }++ @override+ Widget build(BuildContext context) {+ final cs = Theme.of(context).colorScheme;+ final tt = Theme.of(context).textTheme;+ final lib = context.watch<LibraryProvider>();+ final l = AppLocalizations.of(context)!;++ return Column(children: [+ Padding(+ padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),+ child: Row(children: [+ Icon(Icons.auto_stories_rounded, size: 20, color: cs.primary),+ const SizedBox(width: 10),+ Expanded(+ child: Text(l.statsBooksThisYear,+ style: tt.titleMedium?.copyWith(fontWeight: FontWeight.w600),+ maxLines: 1,+ overflow: TextOverflow.ellipsis),+ ),+ Text('${_items.length}',+ style: tt.labelMedium?.copyWith(color: cs.onSurfaceVariant)),+ const SizedBox(width: 12),+ GestureDetector(+ onTap: _toggleGridView,+ child: Icon(+ _gridView ? Icons.view_list_rounded : Icons.grid_view_rounded,+ size: 20,+ color: cs.onSurfaceVariant,+ ),+ ),+ ]),+ ),+ const SizedBox(height: 4),+ Expanded(+ child: _isLoading+ ? const Center(child: CircularProgressIndicator())+ : _items.isEmpty+ ? Center(+ child: Text(l.noBooksFound,+ style: tt.bodyLarge+ ?.copyWith(color: cs.onSurfaceVariant)))+ : _gridView+ ? _buildGrid(cs, tt, lib, l)+ : _buildList(cs, tt, lib, l),+ ),+ ]);+ }++ Widget _buildList(ColorScheme cs, TextTheme tt, LibraryProvider lib,+ AppLocalizations l) {+ final isDark = Theme.of(context).brightness == Brightness.dark;+ final doneColor = isDark ? Colors.greenAccent[400]! : Colors.green.shade700;+ final bottomPad = 24 + MediaQuery.of(context).viewPadding.bottom;++ return ListView.builder(+ controller: widget.scrollController,+ padding: EdgeInsets.fromLTRB(16, 4, 16, bottomPad),+ itemCount: _items.length,+ itemBuilder: (context, index) {+ final item = _items[index];+ final itemId = item['id'] as String? ?? '';+ final media = item['media'] as Map<String, dynamic>? ?? {};+ final metadata = media['metadata'] as Map<String, dynamic>? ?? {};+ final title = metadata['title'] as String? ?? l.unknown;+ final author = metadata['authorName'] as String? ?? '';+ final coverUrl = lib.getCoverUrl(itemId);+ final isDownloaded = DownloadService().isDownloaded(itemId);+ final progressData = lib.getProgressData(itemId);+ final startedAt = progressData?['startedAt'];+ final finishedAt = progressData?['finishedAt'];++ return Padding(+ padding: const EdgeInsets.only(bottom: 8),+ child: Card(+ elevation: 0,+ color: cs.surfaceContainerHigh,+ shape: RoundedRectangleBorder(+ borderRadius: BorderRadius.circular(14)),+ clipBehavior: Clip.antiAlias,+ child: InkWell(+ onTap: () => showBookDetailSheet(context, itemId),+ borderRadius: BorderRadius.circular(14),+ child: SizedBox(+ height: 128,+ child: Row(children: [+ AspectRatio(+ aspectRatio: 1.0,+ child: Stack(children: [+ Positioned.fill(child: _cover(coverUrl, lib, cs)),+ _finishedBadge(doneColor, isDownloaded, cs, l),+ ]),+ ),+ Expanded(+ child: Padding(+ padding: const EdgeInsets.symmetric(+ horizontal: 14, vertical: 10),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ mainAxisAlignment: MainAxisAlignment.center,+ children: [+ Text(title,+ maxLines: 2,+ overflow: TextOverflow.ellipsis,+ style: tt.bodyMedium?.copyWith(+ fontWeight: FontWeight.w600,+ color: cs.onSurface)),+ const SizedBox(height: 2),+ Text(author,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: tt.labelSmall+ ?.copyWith(color: cs.onSurfaceVariant)),+ const SizedBox(height: 6),+ if (startedAt is num)+ _dateRow(Icons.play_circle_outline_rounded,+ _fmtDate(startedAt.toInt()), cs, tt),+ if (finishedAt is num) ...[+ const SizedBox(height: 2),+ _dateRow(Icons.check_circle_outline_rounded,+ _fmtDate(finishedAt.toInt()), cs, tt),+ ],+ ],+ ),+ ),+ ),+ ]),+ ),+ ),+ ),+ );+ },+ );+ }++ Widget _buildGrid(ColorScheme cs, TextTheme tt, LibraryProvider lib,+ AppLocalizations l) {+ final isDark = Theme.of(context).brightness == Brightness.dark;+ final doneColor = isDark ? Colors.greenAccent[400]! : Colors.green.shade700;+ final bottomPad = 24 + MediaQuery.of(context).viewPadding.bottom;++ return GridView.builder(+ controller: widget.scrollController,+ padding: EdgeInsets.fromLTRB(16, 4, 16, bottomPad),+ gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(+ crossAxisCount: 3,+ mainAxisSpacing: 12,+ crossAxisSpacing: 12,+ childAspectRatio: 0.55,+ ),+ itemCount: _items.length,+ itemBuilder: (context, index) {+ final item = _items[index];+ final itemId = item['id'] as String? ?? '';+ final media = item['media'] as Map<String, dynamic>? ?? {};+ final metadata = media['metadata'] as Map<String, dynamic>? ?? {};+ final title = metadata['title'] as String? ?? l.unknown;+ final author = metadata['authorName'] as String? ?? '';+ final coverUrl = lib.getCoverUrl(itemId);+ final isDownloaded = DownloadService().isDownloaded(itemId);+ final finishedAt = lib.getProgressData(itemId)?['finishedAt'];++ return GestureDetector(+ onTap: () => showBookDetailSheet(context, itemId),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ AspectRatio(+ aspectRatio: 1.0,+ child: ClipRRect(+ borderRadius: BorderRadius.circular(10),+ child: Stack(children: [+ Positioned.fill(child: _cover(coverUrl, lib, cs)),+ _finishedBadge(doneColor, isDownloaded, cs, l),+ ]),+ ),+ ),+ const SizedBox(height: 6),+ Text(title,+ maxLines: 2,+ overflow: TextOverflow.ellipsis,+ style: tt.labelSmall?.copyWith(+ fontWeight: FontWeight.w600, color: cs.onSurface)),+ if (author.isNotEmpty)+ Text(author,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: tt.labelSmall+ ?.copyWith(fontSize: 10, color: cs.onSurfaceVariant)),+ if (finishedAt is num)+ Padding(+ padding: const EdgeInsets.only(top: 2),+ child: _dateRow(Icons.check_circle_outline_rounded,+ _fmtDate(finishedAt.toInt()), cs, tt),+ ),+ ],+ ),+ );+ },+ );+ }++ Widget _cover(String? coverUrl, LibraryProvider lib, ColorScheme cs) {+ if (coverUrl == null) return _placeholder(cs);+ if (coverUrl.startsWith('/')) {+ return Image.file(File(coverUrl),+ fit: BoxFit.cover,+ errorBuilder: (_, __, ___) => _placeholder(cs));+ }+ return CachedNetworkImage(+ imageUrl: coverUrl,+ fit: BoxFit.cover,+ httpHeaders: lib.mediaHeaders,+ placeholder: (_, __) => _placeholder(cs),+ errorWidget: (_, __, ___) => _placeholder(cs),+ );+ }++ Widget _placeholder(ColorScheme cs) => Container(+ color: cs.surfaceContainerHighest,+ child: Icon(Icons.book_rounded,+ color: cs.onSurfaceVariant.withValues(alpha: 0.3)),+ );++ Widget _dateRow(IconData icon, String date, ColorScheme cs, TextTheme tt) {+ return Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ Icon(icon, size: 11, color: cs.onSurfaceVariant.withValues(alpha: 0.7)),+ const SizedBox(width: 3),+ Flexible(+ child: Text(date,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: tt.labelSmall?.copyWith(+ fontSize: 10,+ color: cs.onSurfaceVariant.withValues(alpha: 0.85))),+ ),+ ],+ );+ }++ String _fmtDate(int ms) {+ final d = DateTime.fromMillisecondsSinceEpoch(ms);+ const months = [+ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',+ 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',+ ];+ return '${months[d.month - 1]} ${d.day}, ${d.year}';+ }++ Widget _finishedBadge(Color doneColor, bool isDownloaded, ColorScheme cs,+ AppLocalizations l) =>+ Positioned(+ left: 0,+ right: 0,+ bottom: 0,+ child: Container(+ padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),+ decoration: BoxDecoration(+ gradient: LinearGradient(+ begin: Alignment.bottomCenter,+ end: Alignment.topCenter,+ colors: [+ Colors.black.withValues(alpha: 0.85),+ Colors.black.withValues(alpha: 0.0),+ ],+ ),+ ),+ child: Column(mainAxisSize: MainAxisSize.min, children: [+ Row(+ mainAxisAlignment: MainAxisAlignment.center,+ mainAxisSize: MainAxisSize.min,+ children: [+ Icon(Icons.check_circle_rounded, size: 10, color: doneColor),+ const SizedBox(width: 3),+ Text(l.sectionDetailDoneBadge,+ style: TextStyle(+ fontSize: 9,+ fontWeight: FontWeight.w600,+ color: doneColor)),+ ]),+ if (isDownloaded)+ Row(+ mainAxisAlignment: MainAxisAlignment.center,+ mainAxisSize: MainAxisSize.min,+ children: [+ Icon(Icons.download_done_rounded,+ size: 10, color: cs.primary),+ const SizedBox(width: 3),+ Text(l.saved,+ style: TextStyle(+ fontSize: 9,+ fontWeight: FontWeight.w600,+ color: cs.primary)),+ ]),+ ]),+ ),+ );+}