A cross platform Audiobookshelf client for Android and iOS
Dart
Add per-book sleep-rewind override, default set in settings
Barnabas40c989fd7eb2
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex d805feb1..9396a670 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -67,6 +67,8 @@ class _SettingsScreenState extends State<SettingsScreen> {int _backSkip = 10;bool _skipChapterBarrier = true;String _shakeMode = 'addTime';+ int _sleepRewindSeconds = 0;+ static const _maxRewindMinutes = 120;bool _resetSleepOnPause = false;bool _sleepFadeOut = true;int _sleepFadeDuration = 30;@@ -382,7 +384,9 @@ class _SettingsScreenState extends State<SettingsScreen> {final qpId = results[48] as String?;final rmabBaseUrl = await ScopedPrefs.getString(kRmabBaseUrlKey);final rmabApiToken = await ScopedPrefs.getString(kRmabApiTokenKey);+ final sleepRewind = await PlayerSettings.getSleepRewindSeconds();if (mounted) setState(() {+ _sleepRewindSeconds = sleepRewind;_rmabBaseUrl = rmabBaseUrl;_rmabApiToken = rmabApiToken;_rewindSettings = s;@@ -566,6 +570,16 @@ class _SettingsScreenState extends State<SettingsScreen> {await s.save();}+ String _rewindLabel(int seconds, AppLocalizations l) {+ if (seconds == 0) return l.off;+ if (seconds < 60) return l.sleepTimerSheetSecondsShort(seconds);+ final m = seconds ~/ 60;+ final s = seconds % 60;+ return s > 0+ ? l.sleepTimerSheetMinSecShort(m, s)+ : l.sleepTimerSheetMinShort(m);+ }+Future<void> _saveLocalServerUrl(AuthProvider auth, AppLocalizations l) async {final url = _localServerController.text.trim();if (url.isEmpty) return;@@ -1544,6 +1558,43 @@ class _SettingsScreenState extends State<SettingsScreen> {} : null,),const Divider(height: 1, indent: 16, endIndent: 16),+ Padding(+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),+ child: Row(children: [+ Icon(Icons.replay_rounded, size: 18,+ color: _sleepRewindSeconds > 0 ? cs.primary : cs.onSurfaceVariant),+ const SizedBox(width: 10),+ Expanded(child: Text(l.sleepTimerSheetRewindOnSleep,+ style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant))),+ Text(_rewindLabel(_sleepRewindSeconds, l),+ style: tt.bodyMedium?.copyWith(+ fontWeight: FontWeight.w600,+ color: _sleepRewindSeconds > 0 ? cs.primary : cs.onSurfaceVariant)),+ ]),+ ),+ AbsorbSlider(+ value: (_sleepRewindSeconds / 60).clamp(0.0, _maxRewindMinutes.toDouble()),+ min: 0,+ max: _maxRewindMinutes.toDouble(),+ divisions: _maxRewindMinutes,+ onChanged: _loaded ? (v) {+ final seconds = (v * 60).round();+ setState(() => _sleepRewindSeconds = seconds);+ PlayerSettings.setSleepRewindSeconds(seconds);+ } : null,+ ),+ Padding(+ padding: const EdgeInsets.fromLTRB(28, 0, 28, 4),+ child: Row(+ mainAxisAlignment: MainAxisAlignment.spaceBetween,+ children: [+ Text(l.off, style: TextStyle(color: cs.onSurface.withValues(alpha: 0.3), fontSize: 11)),+ Text(l.sleepTimerSheetMinShort(_maxRewindMinutes),+ style: TextStyle(color: cs.onSurface.withValues(alpha: 0.3), fontSize: 11)),+ ],+ ),+ ),+ const Divider(height: 1, indent: 16, endIndent: 16),SwitchListTile(title: Text(l.fadeVolumeBeforeSleep),subtitle: Text(diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex 9654ab55..10e37984 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -576,4 +576,21 @@ class PlayerSettings {static Future<void> setBookSpeed(String itemId, double speed) =>_set('bookSpeed_$itemId', speed);++ // ── Per-book sleep-rewind override (falls back to the global default) ──++ static Future<int?> getBookSleepRewindSeconds(String itemId) =>+ ScopedPrefs.getInt('sleepRewind_$itemId');++ static Future<void> setBookSleepRewindSeconds(String itemId, int seconds) =>+ _set('sleepRewind_$itemId', seconds);++ /// Per-book override if one is set for [itemId], otherwise the global default.+ static Future<int> getEffectiveSleepRewindSeconds(String? itemId) async {+ if (itemId != null) {+ final book = await getBookSleepRewindSeconds(itemId);+ if (book != null) return book;+ }+ return getSleepRewindSeconds();+ }}diff --git a/lib/services/sleep_timer_service.dart b/lib/services/sleep_timer_service.dartindex d691ffd2..4fd33028 100644--- a/lib/services/sleep_timer_service.dart+++ b/lib/services/sleep_timer_service.dart@@ -358,7 +358,7 @@ class SleepTimerService extends ChangeNotifier {// Restore volume so next playback starts at normal level_player.setVolume(_fadeStartVolume);// Auto-rewind so the user resumes from a few seconds back- final rewindSeconds = await PlayerSettings.getSleepRewindSeconds();+ final rewindSeconds = await PlayerSettings.getEffectiveSleepRewindSeconds(_player.currentItemId);if (rewindSeconds > 0) {final currentPos = _player.position;final newPos = currentPos - Duration(seconds: rewindSeconds);diff --git a/lib/widgets/sleep_timer_sheet.dart b/lib/widgets/sleep_timer_sheet.dartindex 54ee81e4..7f81cd7b 100644--- a/lib/widgets/sleep_timer_sheet.dart+++ b/lib/widgets/sleep_timer_sheet.dart@@ -45,7 +45,7 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {PlayerSettings.getShakeAddMinutes(),PlayerSettings.getSleepTimerMinutes(),PlayerSettings.getSleepTimerChapters(),- PlayerSettings.getSleepRewindSeconds(),+ PlayerSettings.getEffectiveSleepRewindSeconds(AudioPlayerService().currentItemId),PlayerSettings.getSleepTimerTab(),]);if (mounted)@@ -666,7 +666,13 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {onChanged: (v) {final seconds = (v * 60).round();setState(() => _sleepRewindSeconds = seconds);- PlayerSettings.setSleepRewindSeconds(seconds);+ // Modal edits the current book only; settings sets the default.+ final itemId = AudioPlayerService().currentItemId;+ if (itemId != null) {+ PlayerSettings.setBookSleepRewindSeconds(itemId, seconds);+ } else {+ PlayerSettings.setSleepRewindSeconds(seconds);+ }},),),