A cross platform Audiobookshelf client for Android and iOS
Dart
Let you pick which day the week starts on
Barnabas46b526fbe790
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex dd26983f..e0c91f73 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -3694,6 +3694,7 @@}}},+ "statsWeekStartsOn": "Week starts on","episodeListNewEpisodePosition": "New episode position","episodeListPositionTop": "Top of queue","episodeListPositionSecond": "Second in queue",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 8449b2a4..6407dfe6 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -10779,6 +10779,12 @@ abstract class AppLocalizations {/// **'New {showTitle} episode downloaded'**String lpSubscribedEpisodeDownloaded(String showTitle);+ /// No description provided for @statsWeekStartsOn.+ ///+ /// In en, this message translates to:+ /// **'Week starts on'**+ String get statsWeekStartsOn;+/// No description provided for @episodeListNewEpisodePosition.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex c824e8f3..09a4196e 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -6265,6 +6265,9 @@ class AppLocalizationsDe extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'Position neuer Folgen';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex cb16aca6..5948fa7d 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsEl extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 47254460..8c4fe546 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsEn extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex d3b7a890..1ce97fbf 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -6185,6 +6185,9 @@ class AppLocalizationsEs extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 749a744f..a8bf0668 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -6203,6 +6203,9 @@ class AppLocalizationsFr extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex fab2573a..921abb3f 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsIt extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 4b8403b5..5dadb58c 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsJa extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 98c761aa..17ab0af3 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsNo extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 022d6784..478f3358 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsPt extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 34550bf0..9d3b9943 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -6183,6 +6183,9 @@ class AppLocalizationsRo extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex ddc2f050..b7d0825c 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -6187,6 +6187,9 @@ class AppLocalizationsRu extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 8fe2fc7f..bead7a8e 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -6094,6 +6094,9 @@ class AppLocalizationsZh extends AppLocalizations {return 'New $showTitle episode downloaded';}+ @override+ String get statsWeekStartsOn => 'Week starts on';+@overrideString get episodeListNewEpisodePosition => 'New episode position';diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 14ae4991..08e55509 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -153,6 +153,7 @@ class _SettingsScreenState extends State<SettingsScreen> {for (final p in PlayerSettings.statsGoalPeriods) p: 0};int _statsBookGoal = 0;+ int _statsWeekStart = 1;String _statsChartStyle = 'bar';int _statsChartRange = 7;List<String> _statsSectionOrder = [];@@ -834,6 +835,7 @@ class _SettingsScreenState extends State<SettingsScreen> {p: await PlayerSettings.getStatsGoalMinutesFor(p)};final statsBookGoal = await PlayerSettings.getStatsBookGoal();+ final statsWeekStart = await PlayerSettings.getStatsWeekStart();final statsChartStyle = await PlayerSettings.getStatsChartStyle();final statsChartRange = await PlayerSettings.getStatsChartRange();final statsSectionOrder = await PlayerSettings.getStatsSectionOrder();@@ -982,6 +984,7 @@ class _SettingsScreenState extends State<SettingsScreen> {..clear()..addAll(statsGoalMinutes);_statsBookGoal = statsBookGoal;+ _statsWeekStart = statsWeekStart;_statsChartStyle = statsChartStyle;_statsChartRange = statsChartRange;_statsSectionOrder = statsSectionOrder;@@ -1832,6 +1835,32 @@ class _SettingsScreenState extends State<SettingsScreen> {),),const Divider(height: 1, indent: 16, endIndent: 16),+ Padding(+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),+ child: Row(children: [+ Expanded(+ child: Text(l.statsWeekStartsOn,+ style: tt.bodyMedium+ ?.copyWith(color: cs.onSurfaceVariant))),+ DropdownButton<int>(+ value: _statsWeekStart,+ underline: const SizedBox.shrink(),+ items: [+ DropdownMenuItem(value: 0, child: Text(l.absorbingSharedSunday)),+ DropdownMenuItem(value: 1, child: Text(l.absorbingSharedMonday)),+ DropdownMenuItem(value: 6, child: Text(l.absorbingSharedSaturday)),+ ],+ onChanged: _loaded+ ? (v) {+ if (v == null) return;+ setState(() => _statsWeekStart = v);+ PlayerSettings.setStatsWeekStart(v);+ }+ : null,+ ),+ ]),+ ),+ const Divider(height: 1, indent: 16, endIndent: 16),Padding(padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),child: Column(diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dartindex bd11a86f..0caf205c 100644--- a/lib/screens/stats_screen.dart+++ b/lib/screens/stats_screen.dart@@ -38,6 +38,7 @@ class _StatsScreenState extends State<StatsScreen>for (final p in PlayerSettings.statsGoalPeriods) p: 0};int _bookGoal = 0;+ int _weekStart = 1;String _chartStyle = 'bar';int _chartRange = 7;List<String> _statsOrder = [];@@ -131,6 +132,7 @@ class _StatsScreenState extends State<StatsScreen>p: await PlayerSettings.getStatsGoalMinutesFor(p)};final books = await PlayerSettings.getStatsBookGoal();+ final weekStart = await PlayerSettings.getStatsWeekStart();final chartStyle = await PlayerSettings.getStatsChartStyle();final chartRange = await PlayerSettings.getStatsChartRange();final order = await PlayerSettings.getStatsSectionOrder();@@ -147,6 +149,7 @@ class _StatsScreenState extends State<StatsScreen>..clear()..addAll(minutes);_bookGoal = books;+ _weekStart = weekStart;_chartStyle = chartStyle;_chartRange = chartRange;_statsOrder = order;@@ -1628,13 +1631,16 @@ class _StatsScreenState extends State<StatsScreen>double _todaySeconds(Map<String, dynamic> dailyMap) =>_daySeconds(dailyMap, _dateKey(DateTime.now()));- /// Sunday through today, so the week total resets on Sunday morning instead- /// of sliding. Days are built from year/month/day rather than by subtracting- /// Durations, or a DST change would repeat or skip a date key.+ /// The start of the week through today, so the total resets on the chosen+ /// day instead of sliding. Days are built from year/month/day rather than by+ /// subtracting Durations, or a DST change would repeat or skip a date key.double _weekSeconds(Map<String, dynamic> dailyMap) {final now = DateTime.now();+ // DateTime.weekday is 1=Mon..7=Sun; %7 puts it in the 0=Sun..6=Sat space+ // the week-start setting uses.+ final daysIn = (now.weekday % 7 - _weekStart + 7) % 7;double total = 0;- for (int i = now.weekday % 7; i >= 0; i--) {+ for (int i = daysIn; i >= 0; i--) {total += _daySeconds(dailyMap, _dateKey(DateTime(now.year, now.month, now.day - i)));}diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex 457db72c..cb713884 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -121,6 +121,7 @@ class BackupService {'statsGoalWeeklyMinutes': await PlayerSettings.getStatsGoalMinutesFor('weekly'),'statsGoalMonthlyMinutes': await PlayerSettings.getStatsGoalMinutesFor('monthly'),'statsBookGoal': await PlayerSettings.getStatsBookGoal(),+ 'statsWeekStart': await PlayerSettings.getStatsWeekStart(),'statsChartStyle': await PlayerSettings.getStatsChartStyle(),'statsChartRange': await PlayerSettings.getStatsChartRange(),'statsSectionOrder': await PlayerSettings.getStatsSectionOrder(),@@ -571,6 +572,7 @@ class BackupService {s['statsGoalType'] as String, s['statsGoalMinutes'] as int);}if (s['statsBookGoal'] != null) await PlayerSettings.setStatsBookGoal(s['statsBookGoal'] as int);+ if (s['statsWeekStart'] != null) await PlayerSettings.setStatsWeekStart(s['statsWeekStart'] as int);if (s['statsChartStyle'] != null) await PlayerSettings.setStatsChartStyle(s['statsChartStyle'] as String);if (s['statsChartRange'] != null) await PlayerSettings.setStatsChartRange(s['statsChartRange'] as int);if (s['statsSectionOrder'] is List) await PlayerSettings.setStatsSectionOrder((s['statsSectionOrder'] as List).cast<String>());diff --git a/lib/services/home_widget_service.dart b/lib/services/home_widget_service.dartindex c037e2c3..f76fd5cc 100644--- a/lib/services/home_widget_service.dart+++ b/lib/services/home_widget_service.dart@@ -852,7 +852,9 @@ class HomeWidgetService {final dailyMap = _extractDailyMap(stats);final today = _todaySeconds(dailyMap).round();- final week = _weekSeconds(dailyMap).round();+ final week =+ _weekSeconds(dailyMap, await PlayerSettings.getStatsWeekStart())+ .round();final streak = _currentStreak(dailyMap);final hidden = (await ScopedPrefs.getStringList('year_hidden_ids',@@ -996,12 +998,15 @@ class HomeWidgetService {double _todaySeconds(Map<String, dynamic> dailyMap) =>_daySeconds(dailyMap, _dateKey(DateTime.now()));- /// Sunday through today. Must match `_weekSeconds` on the stats page, or the- /// widget and the app disagree about the same "This week" number.- double _weekSeconds(Map<String, dynamic> dailyMap) {+ /// Start of the week through today. Must match `_weekSeconds` on the stats+ /// page, or the widget and the app disagree about the same "This week"+ /// number. There's no BuildContext here, which is why the week start is a+ /// stored setting rather than read from MaterialLocalizations.+ double _weekSeconds(Map<String, dynamic> dailyMap, int weekStart) {final now = DateTime.now();+ final daysIn = (now.weekday % 7 - weekStart + 7) % 7;double total = 0;- for (int i = now.weekday % 7; i >= 0; i--) {+ for (int i = daysIn; i >= 0; i--) {total += _daySeconds(dailyMap, _dateKey(DateTime(now.year, now.month, now.day - i)));}diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex f670b310..0e715770 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -1,3 +1,5 @@+import 'dart:ui' as ui;+import 'package:flutter/material.dart';import 'package:just_audio/just_audio.dart';import 'package:shared_preferences/shared_preferences.dart';@@ -277,6 +279,39 @@ class PlayerSettings {await _set('stats_goal_migrated', true);}+ /// Territories that start the week on Sunday or Saturday, from CLDR.+ /// Everywhere else starts on Monday, which is most of the world.+ static const _sundayFirstCountries = {+ 'AG', 'AS', 'BD', 'BR', 'BS', 'BT', 'BW', 'BZ', 'CA', 'CN', 'CO', 'DM',+ 'DO', 'ET', 'GT', 'GU', 'HK', 'HN', 'ID', 'IL', 'IN', 'JM', 'JP', 'KE',+ 'KH', 'KR', 'LA', 'MH', 'MM', 'MO', 'MT', 'MX', 'MZ', 'NI', 'NP', 'PA',+ 'PE', 'PH', 'PK', 'PR', 'PY', 'SA', 'SG', 'SV', 'TH', 'TT', 'TW', 'UM',+ 'US', 'VE', 'VI', 'WS', 'YE', 'ZA', 'ZW',+ };+ static const _saturdayFirstCountries = {+ 'AE', 'AF', 'BH', 'DJ', 'DZ', 'EG', 'IQ', 'IR', 'JO', 'KW', 'LY', 'OM',+ 'QA', 'SD', 'SY',+ };++ /// Day the stats week starts on: 0 = Sunday, 1 = Monday, 6 = Saturday. Same+ /// numbering as `MaterialLocalizations.firstDayOfWeekIndex`.+ ///+ /// Defaults from the DEVICE locale's country rather than the app's language+ /// setting - the language picker stores a bare language code with no region,+ /// so an English UI would otherwise report Sunday for the whole world.+ static int defaultStatsWeekStart() {+ final country = ui.PlatformDispatcher.instance.locale.countryCode?.toUpperCase();+ if (country == null) return 1;+ if (_sundayFirstCountries.contains(country)) return 0;+ if (_saturdayFirstCountries.contains(country)) return 6;+ return 1;+ }++ static Future<int> getStatsWeekStart() async =>+ await ScopedPrefs.getInt('stats_week_start') ?? defaultStatsWeekStart();+ static Future<void> setStatsWeekStart(int day) =>+ _set('stats_week_start', day, notify: true);+/// Yearly book-challenge target. 0 = off.static Future<int> getStatsBookGoal() => _get('stats_book_goal', 0);static Future<void> setStatsBookGoal(int value) => _set('stats_book_goal', value, notify: true);diff --git a/pubspec.yaml b/pubspec.yamlindex 461b1c62..0c52c561 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -1,7 +1,7 @@name: absorbdescription: An Audiobookshelf Clientpublish_to: 'none'-version: 1.9.3+232+version: 1.9.3+233environment:sdk: '>=3.10.0 <4.0.0'