A cross platform Audiobookshelf client for Android and iOS
Dart
Chapter barrier setting, discord link update, welcome sheet updates
Nathan Poulsonc98ac62f07a1
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 16b9db12..2859c169 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -44,6 +44,7 @@ class _SettingsScreenState extends State<SettingsScreen> {bool _speedAdjustedTime = true;int _forwardSkip = 30;int _backSkip = 10;+ bool _skipChapterBarrier = true;String _shakeMode = 'addTime';bool _resetSleepOnPause = false;bool _sleepFadeOut = true;@@ -165,6 +166,7 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.getRectangleCovers(), // 39PlayerSettings.getTrustAllCerts(), // 40PlayerSettings.getCoverPlayButton(), // 41+ PlayerSettings.getSkipChapterBarrier(), // 42]);final s = results[0] as AutoRewindSettings;final speed = results[1] as double;@@ -206,6 +208,7 @@ class _SettingsScreenState extends State<SettingsScreen> {final rectCovers = results[37] as bool;final trustCerts = results[38] as bool;final coverPlay = results[39] as bool;+ final skipBarrier = results[40] as bool;if (mounted) setState(() {_rewindSettings = s;_defaultSpeed = speed;@@ -250,6 +253,7 @@ class _SettingsScreenState extends State<SettingsScreen> {_cardButtonLayout = cardBtnLayout;_rectangleCovers = rectCovers;_coverPlayButton = coverPlay;+ _skipChapterBarrier = skipBarrier;_trustAllCerts = trustCerts;_loaded = true;@@ -313,7 +317,17 @@ class _SettingsScreenState extends State<SettingsScreen> {_tipCard(cs, tt,icon: Icons.touch_app_rounded,title: 'Cover Play/Pause',- desc: 'Tap the cover art on any card to play or pause. A faint pause icon shows when playing so you know it\'s tappable. Use the expand icon in the top-right corner to open the full screen player.',+ desc: 'Tap the cover art on any card to play or pause. Toggle this in Settings under Absorbing Cards. A faint pause icon shows when playing so you know it\'s tappable.',+ ),+ _tipCard(cs, tt,+ icon: Icons.swipe_up_rounded,+ title: 'Full Screen Player',+ desc: 'Swipe up on any absorbing card to open the full screen player. Swipe down to dismiss it.',+ ),+ _tipCard(cs, tt,+ icon: Icons.swipe_right_rounded,+ title: 'Quick Add to Absorbing',+ desc: 'Swipe right on any book in a list sheet (series, author, search results) to instantly add it to your absorbing queue.',),_tipCard(cs, tt,icon: Icons.edit_note_rounded,@@ -1007,6 +1021,24 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.setForwardSkip(v.round());} : null,),+ SwitchListTile(+ title: Row(children: [+ const Expanded(child: Text('Chapter barrier on rewind')),+ Tooltip(+ message: 'When skipping back, snap to the chapter start instead of crossing it.\nDouble-tap within 2 seconds to break through.',+ child: Icon(Icons.info_outline_rounded, size: 18, color: cs.onSurfaceVariant.withValues(alpha: 0.5)),+ ),+ ]),+ subtitle: Text(+ _skipChapterBarrier ? 'On - rewind snaps to chapter start' : 'Off - rewind crosses chapter boundaries',+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant),+ ),+ value: _skipChapterBarrier,+ onChanged: _loaded ? (v) {+ setState(() => _skipChapterBarrier = v);+ PlayerSettings.setSkipChapterBarrier(v);+ } : null,+ ),const Divider(height: 1, indent: 16, endIndent: 16),SwitchListTile(title: const Text('Chapter progress in notification'),@@ -1680,7 +1712,7 @@ class _SettingsScreenState extends State<SettingsScreen> {trailing: Icon(Icons.open_in_new_rounded,size: 18, color: cs.onSurfaceVariant),onTap: () => launchUrl(- Uri.parse('https://discord.gg/pcMJb5SM'),+ Uri.parse('https://discord.gg/bwH6hdvzZ4'),mode: LaunchMode.externalApplication),),const Divider(height: 1, indent: 16, endIndent: 16),diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex 68cebd6b..2979eebf 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -179,6 +179,8 @@ class PlayerSettings {static Future<int> getBackSkip() => _get('backSkip', 10);static Future<void> setBackSkip(int seconds) => _set('backSkip', seconds, notify: true);+ static Future<bool> getSkipChapterBarrier() => _get('skipChapterBarrier', true);+ static Future<void> setSkipChapterBarrier(bool value) => _set('skipChapterBarrier', value);static Future<bool> getNotificationChapterProgress() => _get('notificationChapterProgress', false);static Future<void> setNotificationChapterProgress(bool value) => _set('notificationChapterProgress', value, notify: true);@@ -2698,8 +2700,9 @@ class AudioPlayerService extends ChangeNotifier {final posS = position.inMilliseconds / 1000.0;final targetS = posS - seconds;- // Find current chapter start- if (_chapters.isNotEmpty) {+ // Find current chapter start (gated by setting)+ final chapterBarrier = await PlayerSettings.getSkipChapterBarrier();+ if (chapterBarrier && _chapters.isNotEmpty) {double chapterStart = 0;for (int i = _chapters.length - 1; i >= 0; i--) {final s = (_chapters[i]['start'] as num?)?.toDouble() ?? 0;diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex 12cecc6a..0f24ee31 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -74,6 +74,7 @@ class BackupService {'sleepTimerTab': await PlayerSettings.getSleepTimerTab(),'sheetGridView': await PlayerSettings.getSheetGridView(),'sheetCollapseSeries': await PlayerSettings.getSheetCollapseSeries(),+ 'skipChapterBarrier': await PlayerSettings.getSkipChapterBarrier(),};// AutoRewind (scoped)@@ -277,6 +278,7 @@ class BackupService {if (s['sleepTimerTab'] != null) PlayerSettings.setSleepTimerTab(s['sleepTimerTab'] as int);if (s['sheetGridView'] != null) PlayerSettings.setSheetGridView(s['sheetGridView'] as bool);if (s['sheetCollapseSeries'] != null) PlayerSettings.setSheetCollapseSeries(s['sheetCollapseSeries'] as bool);+ if (s['skipChapterBarrier'] != null) PlayerSettings.setSkipChapterBarrier(s['skipChapterBarrier'] as bool);// AutoRewind (scoped via save())final r = data['autoRewind'] as Map<String, dynamic>?;diff --git a/lib/widgets/welcome_sheet.dart b/lib/widgets/welcome_sheet.dartindex 5834373f..4fa61cdc 100644--- a/lib/widgets/welcome_sheet.dart+++ b/lib/widgets/welcome_sheet.dart@@ -113,7 +113,9 @@ class _WelcomeContent extends StatelessWidget {_subsection(cs, tt,title: 'Managing your queue',items: [- 'Tap the cover art to play/pause, use the expand icon to open the full screen player',+ 'Tap the cover art to play/pause (toggleable in Settings)',+ 'Swipe up on a card to open the full screen player, swipe down to dismiss',+ 'Swipe right on any book in a list sheet to quickly add it to your queue','Tap the reorder icon to drag cards into your preferred order or swipe to remove','Add books manually from any book\'s detail sheet','Finished books are automatically removed from your queue',