A cross platform Audiobookshelf client for Android and iOS
Dart
Add session start rewind setting
Barnabasf079ccc6bd6b
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex c7731c57..73eff5a3 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -978,6 +978,8 @@ class _SettingsScreenState extends State<SettingsScreen> {minRewind: _rewindSettings.minRewind,maxRewind: _rewindSettings.maxRewind,activationDelay: _rewindSettings.activationDelay,+ chapterBarrier: _rewindSettings.chapterBarrier,+ sessionStartRewind: _rewindSettings.sessionStartRewind,),) : null,),@@ -1000,6 +1002,8 @@ class _SettingsScreenState extends State<SettingsScreen> {onChanged: (v) => _saveRewind(AutoRewindSettings(enabled: true, minRewind: v.start, maxRewind: v.end,activationDelay: _rewindSettings.activationDelay,+ chapterBarrier: _rewindSettings.chapterBarrier,+ sessionStartRewind: _rewindSettings.sessionStartRewind,)),),const Divider(height: 1, indent: 16, endIndent: 16),@@ -1023,6 +1027,8 @@ class _SettingsScreenState extends State<SettingsScreen> {onChanged: (v) => _saveRewind(AutoRewindSettings(enabled: true, minRewind: _rewindSettings.minRewind,maxRewind: _rewindSettings.maxRewind, activationDelay: v,+ chapterBarrier: _rewindSettings.chapterBarrier,+ sessionStartRewind: _rewindSettings.sessionStartRewind,)),),),@@ -1047,6 +1053,41 @@ class _SettingsScreenState extends State<SettingsScreen> {maxRewind: _rewindSettings.maxRewind,activationDelay: _rewindSettings.activationDelay,chapterBarrier: v,+ sessionStartRewind: _rewindSettings.sessionStartRewind,+ )),+ ),+ const Divider(height: 1, indent: 16, endIndent: 16),+ SwitchListTile(+ title: Row(children: [+ const Expanded(child: Text('Rewind on session start')),+ GestureDetector(+ onTap: () => showDialog(+ context: context,+ builder: (_) => AlertDialog(+ title: const Text('Rewind on session start'),+ content: const Text('Normal auto-rewind triggers when you resume from a pause within an active session. This setting adds a rewind when starting a completely new session - for example after the app was closed, playback was stopped, or you open the app fresh.\n\nWhen enabled, playback rewinds by the full max rewind amount at the start of every new session so you can re-hear where you left off.'),+ actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('Got it'))],+ ),+ ),+ child: Padding(+ padding: const EdgeInsets.all(4),+ child: Icon(Icons.info_outline_rounded, size: 18, color: cs.onSurfaceVariant.withValues(alpha: 0.5)),+ ),+ ),+ ]),+ subtitle: Text(+ _rewindSettings.sessionStartRewind+ ? 'On - rewinds ${_rewindSettings.maxRewind.round()}s when starting a new session'+ : 'Off',+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _rewindSettings.sessionStartRewind,+ onChanged: (v) => _saveRewind(AutoRewindSettings(+ enabled: true,+ minRewind: _rewindSettings.minRewind,+ maxRewind: _rewindSettings.maxRewind,+ activationDelay: _rewindSettings.activationDelay,+ chapterBarrier: _rewindSettings.chapterBarrier,+ sessionStartRewind: v,)),),const Divider(height: 1, indent: 16, endIndent: 16),diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex 5e90395a..ebec2538 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -1294,6 +1294,35 @@ class AudioPlayerService extends ChangeNotifier {_isLoadingNewItem = false;notifyListeners();+ // Session-start rewind: rewind by maxRewind when starting a new session+ if (result == null && !forceStartTime) {+ final rewindSettings = await AutoRewindSettings.load();+ if (rewindSettings.enabled && rewindSettings.sessionStartRewind) {+ final rewindSeconds = rewindSettings.maxRewind;+ if (rewindSeconds > 0.5 && _player != null) {+ final currentAbsolutePos = position.inMilliseconds / 1000.0;+ var newPosSeconds = currentAbsolutePos - rewindSeconds;+ if (newPosSeconds < 0) newPosSeconds = 0;+ if (rewindSettings.chapterBarrier && _chapters.isNotEmpty) {+ for (final ch in _chapters) {+ final start = (ch['start'] as num?)?.toDouble() ?? 0;+ final end = (ch['end'] as num?)?.toDouble() ?? 0;+ if (currentAbsolutePos >= start && currentAbsolutePos < end) {+ if (newPosSeconds < start) newPosSeconds = start;+ break;+ }+ }+ }+ await _seekAbsolute(newPosSeconds);+ _lastAutoRewindAmount = rewindSeconds;+ _logEvent(PlaybackEventType.autoRewind,+ detail: '${rewindSeconds.toStringAsFixed(1)}s session-start rewind');+ debugPrint(+ '[Player] Session-start rewind ${rewindSeconds.toStringAsFixed(1)}s');+ }+ }+ }+// Auto-navigate to Absorbing tab when an episode starts playingif (result == null && episodeId != null) {_onEpisodePlayStartedCallback?.call();diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex 5293ed66..27317f94 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -87,6 +87,7 @@ class BackupService {'max': rewind.maxRewind,'delay': rewind.activationDelay,'chapterBarrier': rewind.chapterBarrier,+ 'sessionStartRewind': rewind.sessionStartRewind,};// AutoSleep (scoped)@@ -293,6 +294,7 @@ class BackupService {maxRewind: (r['max'] as num?)?.toDouble() ?? 30.0,activationDelay: (r['delay'] as num?)?.toDouble() ?? 0.0,chapterBarrier: r['chapterBarrier'] as bool? ?? false,+ sessionStartRewind: r['sessionStartRewind'] as bool? ?? false,).save();}diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex da53e4ff..7d08137e 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -12,6 +12,7 @@ class AutoRewindSettings {final double maxRewind;final double activationDelay; // seconds — how long pause must be before rewind kicks infinal bool chapterBarrier; // don't rewind past the start of the current chapter+ final bool sessionStartRewind; // rewind by maxRewind when starting a new sessionconst AutoRewindSettings({this.enabled = true,@@ -19,6 +20,7 @@ class AutoRewindSettings {this.maxRewind = 30.0,this.activationDelay = 0.0, // 0 = always rewind on resumethis.chapterBarrier = false,+ this.sessionStartRewind = false,});static Future<AutoRewindSettings> load() async {@@ -28,6 +30,7 @@ class AutoRewindSettings {maxRewind: await ScopedPrefs.getDouble('autoRewind_max') ?? 30.0,activationDelay: await ScopedPrefs.getDouble('autoRewind_delay') ?? 0.0,chapterBarrier: await ScopedPrefs.getBool('autoRewind_chapterBarrier') ?? false,+ sessionStartRewind: await ScopedPrefs.getBool('autoRewind_sessionStart') ?? false,);}@@ -37,6 +40,7 @@ class AutoRewindSettings {await ScopedPrefs.setDouble('autoRewind_max', maxRewind);await ScopedPrefs.setDouble('autoRewind_delay', activationDelay);await ScopedPrefs.setBool('autoRewind_chapterBarrier', chapterBarrier);+ await ScopedPrefs.setBool('autoRewind_sessionStart', sessionStartRewind);}}diff --git a/pubspec.yaml b/pubspec.yamlindex 48e8799b..c1768961 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -1,7 +1,7 @@name: absorbdescription: An Audiobookshelf Clientpublish_to: 'none'-version: 1.8.70+87+version: 1.8.71+88# v1.8.41: JWT auth (accessToken + refreshToken), MANAGE_EXTERNAL_STORAGE removed from playstore flavor# Build scripts (run from Git Bash):# . ./build_bundle.sh - Play Store AAB (no MANAGE_EXTERNAL_STORAGE)