A cross platform Audiobookshelf client for Android and iOS
Dart
Let card scrubbers use both bars, chapters only, or stay locked
Barnabas0eaaee0176b2
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex c325fad4..4d93978c 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -603,6 +603,13 @@"fullBookScrubber": "Full book scrubber","fullBookScrubberOnSubtitle": "On - seekable slider across entire book","fullBookScrubberOffSubtitle": "Off - progress bar only",+ "cardScrubbers": "Card scrubbers",+ "cardScrubbersBoth": "Both",+ "cardScrubbersChapter": "Chapter",+ "cardScrubbersLocked": "Locked",+ "cardScrubbersBothSubtitle": "Full book and chapter bars can seek",+ "cardScrubbersChapterSubtitle": "Only the chapter bar can seek",+ "cardScrubbersLockedSubtitle": "Progress is shown without seeking","speedAdjustedTime": "Speed-adjusted time","speedAdjustedTimeOnSubtitle": "On - remaining time reflects playback speed","speedAdjustedTimeOffSubtitle": "Off - showing raw audio duration",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 2dcfe7e0..dda18974 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -2392,6 +2392,48 @@ abstract class AppLocalizations {/// **'Off - progress bar only'**String get fullBookScrubberOffSubtitle;+ /// No description provided for @cardScrubbers.+ ///+ /// In en, this message translates to:+ /// **'Card scrubbers'**+ String get cardScrubbers;++ /// No description provided for @cardScrubbersBoth.+ ///+ /// In en, this message translates to:+ /// **'Both'**+ String get cardScrubbersBoth;++ /// No description provided for @cardScrubbersChapter.+ ///+ /// In en, this message translates to:+ /// **'Chapter'**+ String get cardScrubbersChapter;++ /// No description provided for @cardScrubbersLocked.+ ///+ /// In en, this message translates to:+ /// **'Locked'**+ String get cardScrubbersLocked;++ /// No description provided for @cardScrubbersBothSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Full book and chapter bars can seek'**+ String get cardScrubbersBothSubtitle;++ /// No description provided for @cardScrubbersChapterSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Only the chapter bar can seek'**+ String get cardScrubbersChapterSubtitle;++ /// No description provided for @cardScrubbersLockedSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Progress is shown without seeking'**+ String get cardScrubbersLockedSubtitle;+/// No description provided for @speedAdjustedTime.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 840681db..759f4129 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -1264,6 +1264,27 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Aus - nur Fortschrittsbalken';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Geschwindigkeitsangepasste Zeit';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 91a230a1..bece777c 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 91945ba7..acc6f923 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 003e735a..f0d09881 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 297ce056..7d7ee03d 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -1258,6 +1258,27 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex c2adb572..2c7b5122 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex fd4541c6..29ae5911 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex e37f9105..d5ebe5be 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex d6b48f26..9aff86f5 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex f5cfc5de..2cfe0bfc 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -1256,6 +1256,27 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 6be04ec3..454067f3 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -1259,6 +1259,27 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => 'Off - progress bar only';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => 'Speed-adjusted time';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 5174dc5f..65f222ef 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -1239,6 +1239,27 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get fullBookScrubberOffSubtitle => '关闭 - 仅显示进度条';+ @override+ String get cardScrubbers => 'Card scrubbers';++ @override+ String get cardScrubbersBoth => 'Both';++ @override+ String get cardScrubbersChapter => 'Chapter';++ @override+ String get cardScrubbersLocked => 'Locked';++ @override+ String get cardScrubbersBothSubtitle => 'Full book and chapter bars can seek';++ @override+ String get cardScrubbersChapterSubtitle => 'Only the chapter bar can seek';++ @override+ String get cardScrubbersLockedSubtitle => 'Progress is shown without seeking';+@overrideString get speedAdjustedTime => '变速后时间';diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 7802bcb8..eed3ea1c 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -34,6 +34,7 @@ import '../widgets/absorb_page_header.dart';import '../widgets/theme_presets.dart';import '../widgets/color_wheel_picker.dart';import '../widgets/absorb_slider.dart';+import '../widgets/card_scrubber_mode_selector.dart';import '../widgets/collapsible_section.dart';import '../widgets/overlay_toast.dart';import '../widgets/tips_sheet.dart';@@ -69,7 +70,7 @@ class _SettingsScreenState extends State<SettingsScreen> {bool _autoDownloadOnStream = false;int _rollingDownloadCount = 3;bool _rollingDownloadDeleteFinished = false;- bool _showBookSlider = false;+ CardScrubberMode _cardScrubberMode = CardScrubberMode.chapter;bool _notifChapterProgress = false;bool _notifSpeedBookmark = false;bool _lockSeekBar = false;@@ -701,7 +702,7 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.getWifiOnlyDownloads(), // 2PlayerSettings.getRollingDownloadCount(), // 3PlayerSettings.getRollingDownloadDeleteFinished(), // 4- PlayerSettings.getShowBookSlider(), // 5+ PlayerSettings.getCardScrubberMode(), // 5PlayerSettings.getNotificationChapterProgress(), // 6PlayerSettings.getSpeedAdjustedTime(), // 7PlayerSettings.getForwardSkip(), // 8@@ -768,7 +769,7 @@ class _SettingsScreenState extends State<SettingsScreen> {final wifiOnly = results[2] as bool;final rollingCount = results[3] as int;final rollingDelete = results[4] as bool;- final bookSlider = results[5] as bool;+ final cardScrubberMode = results[5] as CardScrubberMode;final notifChapter = results[6] as bool;final speedAdj = results[7] as bool;final fwd = results[8] as int;@@ -841,7 +842,7 @@ class _SettingsScreenState extends State<SettingsScreen> {_autoDownloadOnStream = autoDlStream;_rollingDownloadCount = rollingCount;_rollingDownloadDeleteFinished = rollingDelete;- _showBookSlider = bookSlider;+ _cardScrubberMode = cardScrubberMode;_notifChapterProgress = notifChapter;_notifSpeedBookmark = notifSpeedBookmark;_lockSeekBar = lockSeek;@@ -1809,16 +1810,42 @@ class _SettingsScreenState extends State<SettingsScreen> {]),),const Divider(height: 1, indent: 16, endIndent: 16),- SwitchListTile(- title: Text(l.fullBookScrubber),- subtitle: Text(- _showBookSlider ? l.fullBookScrubberOnSubtitle : l.fullBookScrubberOffSubtitle,- style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),- value: _showBookSlider,- onChanged: _loaded ? (v) {- setState(() => _showBookSlider = v);- PlayerSettings.setShowBookSlider(v);- } : null,+ Padding(+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 14),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(+ l.cardScrubbers,+ style: tt.bodyMedium?.copyWith(+ color: cs.onSurface,+ ),+ ),+ const SizedBox(height: 4),+ Text(+ switch (_cardScrubberMode) {+ CardScrubberMode.both =>+ l.cardScrubbersBothSubtitle,+ CardScrubberMode.chapter =>+ l.cardScrubbersChapterSubtitle,+ CardScrubberMode.locked =>+ l.cardScrubbersLockedSubtitle,+ },+ style: tt.bodySmall?.copyWith(+ color: cs.onSurfaceVariant,+ ),+ ),+ const SizedBox(height: 10),+ CardScrubberModeSelector(+ mode: _cardScrubberMode,+ enabled: _loaded,+ onChanged: (mode) {+ setState(() => _cardScrubberMode = mode);+ PlayerSettings.setCardScrubberMode(mode);+ },+ ),+ ],+ ),),const Divider(height: 1, indent: 16, endIndent: 16),SwitchListTile(diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex bc88c21f..c3810a56 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -24,6 +24,7 @@ class BackupService {// Legacy keys for backward compat with older app versions'autoPlayNextBook': (await PlayerSettings.getQueueMode()) == 'auto_next','autoPlayNextPodcast': (await PlayerSettings.getQueueMode()) == 'auto_next',+ 'cardScrubberMode': (await PlayerSettings.getCardScrubberMode()).name,'showBookSlider': await PlayerSettings.getShowBookSlider(),'speedAdjustedTime': await PlayerSettings.getSpeedAdjustedTime(),'forwardSkip': await PlayerSettings.getForwardSkip(),@@ -407,7 +408,16 @@ class BackupService {if (s['bookQueueMode'] != null) PlayerSettings.setBookQueueMode(s['bookQueueMode'] as String);if (s['podcastQueueMode'] != null) PlayerSettings.setPodcastQueueMode(s['podcastQueueMode'] as String);if (s['whenFinished'] != null) PlayerSettings.setWhenFinished(s['whenFinished'] as String);- if (s['showBookSlider'] != null) PlayerSettings.setShowBookSlider(s['showBookSlider'] as bool);+ final cardScrubberMode = s['cardScrubberMode'] as String?;+ if (cardScrubberMode != null) {+ final mode = CardScrubberMode.values.firstWhere(+ (value) => value.name == cardScrubberMode,+ orElse: () => CardScrubberMode.chapter,+ );+ await PlayerSettings.setCardScrubberMode(mode);+ } else if (s['showBookSlider'] != null) {+ await PlayerSettings.setShowBookSlider(s['showBookSlider'] as bool);+ }if (s['speedAdjustedTime'] != null) PlayerSettings.setSpeedAdjustedTime(s['speedAdjustedTime'] as bool);if (s['forwardSkip'] != null) PlayerSettings.setForwardSkip(s['forwardSkip'] as int);if (s['backSkip'] != null) PlayerSettings.setBackSkip(s['backSkip'] as int);diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex 5e07817d..39009fed 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -44,6 +44,13 @@ class AutoRewindSettings {}}+enum CardScrubberMode { both, chapter, locked }++extension CardScrubberModeBehavior on CardScrubberMode {+ bool get allowsBookSeeking => this == CardScrubberMode.both;+ bool get allowsChapterSeeking => this != CardScrubberMode.locked;+}+class PlayerSettings {/// Notifier that fires when any player setting changes./// Widgets can listen to this instead of polling SharedPreferences.@@ -375,8 +382,28 @@ class PlayerSettings {// ── Player UI settings (notify listeners on change) ──- static Future<bool> getShowBookSlider() => _get('showBookSlider', false);- static Future<void> setShowBookSlider(bool value) => _set('showBookSlider', value, notify: true);+ static Future<CardScrubberMode> getCardScrubberMode() async {+ final stored = await _get('cardScrubberMode', '');+ for (final mode in CardScrubberMode.values) {+ if (mode.name == stored) return mode;+ }+ final legacyBookSlider = await _get('showBookSlider', false);+ return legacyBookSlider+ ? CardScrubberMode.both+ : CardScrubberMode.chapter;+ }++ static Future<void> setCardScrubberMode(CardScrubberMode mode) async {+ await _set('cardScrubberMode', mode.name);+ await _set('showBookSlider', mode == CardScrubberMode.both);+ _notify();+ }++ static Future<bool> getShowBookSlider() async =>+ await getCardScrubberMode() == CardScrubberMode.both;+ static Future<void> setShowBookSlider(bool value) => setCardScrubberMode(+ value ? CardScrubberMode.both : CardScrubberMode.chapter,+ );static Future<bool> getSpeedAdjustedTime() => _get('speedAdjustedTime', true);static Future<void> setSpeedAdjustedTime(bool value) => _set('speedAdjustedTime', value, notify: true);diff --git a/lib/widgets/card_edge_progress_bar.dart b/lib/widgets/card_edge_progress_bar.dartindex 422e397c..1cba88f6 100644--- a/lib/widgets/card_edge_progress_bar.dart+++ b/lib/widgets/card_edge_progress_bar.dart@@ -56,7 +56,7 @@ class _CardEdgeProgressBarState extends State<CardEdgeProgressBar>double _dragStartDy = 0;double _lastLongPressDx = 0;double _edgeScrubSpeed = 1.0;- bool _showBookSlider = false;+ CardScrubberMode _scrubberMode = CardScrubberMode.chapter;static const _thinHeight = 3.5;static const _expandedHeight = 50.0;@@ -83,9 +83,9 @@ class _CardEdgeProgressBarState extends State<CardEdgeProgressBar>PlayerSettings.getSpeedAdjustedTime().then((v) {if (mounted && v != _speedAdjustedTime) setState(() => _speedAdjustedTime = v);});- PlayerSettings.getShowBookSlider().then((v) {- if (mounted && v != _showBookSlider) {- setState(() => _showBookSlider = v);+ PlayerSettings.getCardScrubberMode().then((mode) {+ if (mounted && mode != _scrubberMode) {+ setState(() => _scrubberMode = mode);}});}@@ -284,7 +284,7 @@ class _CardEdgeProgressBarState extends State<CardEdgeProgressBar>final barHeight = lerpDouble(_thinHeight, 8.0, expandT)!;final displayProgress = _dragValue ?? bookProgress;- final interactive = active && _showBookSlider;+ final interactive = active && _scrubberMode.allowsBookSeeking;return GestureDetector(behavior: HitTestBehavior.translucent,onHorizontalDragStart: interactive ? (d) {diff --git a/lib/widgets/card_progress_bar.dart b/lib/widgets/card_progress_bar.dartindex 6aa6ce11..a15b38bf 100644--- a/lib/widgets/card_progress_bar.dart+++ b/lib/widgets/card_progress_bar.dart@@ -33,7 +33,7 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsBdouble _chapterDragStartDy = 0;double _bookScrubSpeed = 1.0;double _chapterScrubSpeed = 1.0;- bool _showBookSlider = false;+ CardScrubberMode _scrubberMode = CardScrubberMode.chapter;bool _speedAdjustedTime = true;Timer? _smoothTicker;final _tickNotifier = ChangeNotifier(); // drives ListenableBuilder rebuilds@@ -62,7 +62,11 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsB}void _loadSettings() {- PlayerSettings.getShowBookSlider().then((v) { if (mounted && v != _showBookSlider) setState(() => _showBookSlider = v); });+ PlayerSettings.getCardScrubberMode().then((mode) {+ if (mounted && mode != _scrubberMode) {+ setState(() => _scrubberMode = mode);+ }+ });PlayerSettings.getSpeedAdjustedTime().then((v) { if (mounted && v != _speedAdjustedTime) setState(() => _speedAdjustedTime = v); });PlayerSettings.getProgressTextScale().then((v) { if (mounted && v != _progressTextScale) setState(() => _progressTextScale = v); });_loadSavedSpeed();@@ -327,7 +331,7 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsBchild: Column(children: [// Book barif (widget.showBookBar) ...[- if (_showBookSlider) ...[+ if (_scrubberMode.allowsBookSeeking) ...[SizedBox(height: 32, child: LayoutBuilder(builder: (_, cons) {final w = cons.maxWidth;final p = _bookDragValue ?? bookProgress;@@ -375,13 +379,15 @@ class _CardDualProgressBarState extends State<CardDualProgressBar> with WidgetsBfinal chName = rawName != null? _smartChapterName(l, rawName, chIdx, widget.totalChapters): null;+ final chapterInteractive =+ active && _scrubberMode.allowsChapterSeeking;return GestureDetector(behavior: HitTestBehavior.opaque,- onHorizontalDragStart: active ? (d) { _chapterDragStartDy = d.localPosition.dy; _chapterScrubSpeed = 1.0; setState(() => _chapterDragValue = (d.localPosition.dx / w).clamp(0.0, 1.0)); } : null,- onHorizontalDragUpdate: active ? (d) { _chapterScrubSpeed = _scrubScale((d.localPosition.dy - _chapterDragStartDy).abs()); setState(() => _chapterDragValue = ((_chapterDragValue ?? chapterProgress) + d.delta.dx / w * _chapterScrubSpeed).clamp(0.0, 1.0)); } : null,- onHorizontalDragEnd: active ? (_) { if (_chapterDragValue != null) { final seekMs = ((chapterStart + _chapterDragValue! * chapterDur) * 1000).round(); _doSeek(seekMs); } setState(() => _chapterDragValue = null); } : null,- onTapUp: active ? (d) { final v = (d.localPosition.dx / w).clamp(0.0, 1.0); final seekMs = ((chapterStart + v * chapterDur) * 1000).round(); _doSeek(seekMs); } : null,+ onHorizontalDragStart: chapterInteractive ? (d) { _chapterDragStartDy = d.localPosition.dy; _chapterScrubSpeed = 1.0; setState(() => _chapterDragValue = (d.localPosition.dx / w).clamp(0.0, 1.0)); } : null,+ onHorizontalDragUpdate: chapterInteractive ? (d) { _chapterScrubSpeed = _scrubScale((d.localPosition.dy - _chapterDragStartDy).abs()); setState(() => _chapterDragValue = ((_chapterDragValue ?? chapterProgress) + d.delta.dx / w * _chapterScrubSpeed).clamp(0.0, 1.0)); } : null,+ onHorizontalDragEnd: chapterInteractive ? (_) { if (_chapterDragValue != null) { final seekMs = ((chapterStart + _chapterDragValue! * chapterDur) * 1000).round(); _doSeek(seekMs); } setState(() => _chapterDragValue = null); } : null,+ onTapUp: chapterInteractive ? (d) { final v = (d.localPosition.dx / w).clamp(0.0, 1.0); final seekMs = ((chapterStart + v * chapterDur) * 1000).round(); _doSeek(seekMs); } : null,child: CustomPaint(size: Size(w, 30),painter: ChapterPillPainter(diff --git a/lib/widgets/card_scrubber_mode_selector.dart b/lib/widgets/card_scrubber_mode_selector.dartnew file mode 100644index 00000000..e3e07d46--- /dev/null+++ b/lib/widgets/card_scrubber_mode_selector.dart@@ -0,0 +1,72 @@+import 'package:flutter/material.dart';++import '../l10n/app_localizations.dart';+import '../services/player_settings.dart';++class CardScrubberModeSelector extends StatelessWidget {+ const CardScrubberModeSelector({+ super.key,+ required this.mode,+ required this.onChanged,+ this.enabled = true,+ });++ final CardScrubberMode mode;+ final ValueChanged<CardScrubberMode> onChanged;+ final bool enabled;++ @override+ Widget build(BuildContext context) {+ final l = AppLocalizations.of(context)!;+ return LayoutBuilder(+ builder: (context, constraints) {+ final scaledLabelSize = MediaQuery.textScalerOf(context).scale(14);+ final compact = constraints.maxWidth < 360 || scaledLabelSize > 18;++ Widget label(String text) => Padding(+ padding: EdgeInsets.symmetric(horizontal: compact ? 0 : 4),+ child: FittedBox(+ fit: BoxFit.scaleDown,+ child: Text(text, maxLines: 1, softWrap: false),+ ),+ );++ return SizedBox(+ width: double.infinity,+ child: SegmentedButton<CardScrubberMode>(+ key: const Key('card-scrubber-mode-selector'),+ showSelectedIcon: false,+ segments: [+ ButtonSegment(+ value: CardScrubberMode.both,+ label: label(l.cardScrubbersBoth),+ ),+ ButtonSegment(+ value: CardScrubberMode.chapter,+ label: label(l.cardScrubbersChapter),+ ),+ ButtonSegment(+ value: CardScrubberMode.locked,+ label: label(l.cardScrubbersLocked),+ ),+ ],+ selected: {mode},+ onSelectionChanged: enabled+ ? (selection) {+ if (selection.isNotEmpty) onChanged(selection.first);+ }+ : null,+ style: ButtonStyle(+ visualDensity: compact+ ? VisualDensity.compact+ : VisualDensity.standard,+ padding: WidgetStatePropertyAll(+ EdgeInsets.symmetric(horizontal: compact ? 4 : 10),+ ),+ ),+ ),+ );+ },+ );+ }+}diff --git a/pubspec.yaml b/pubspec.yamlindex 7dfee5d8..e85bde2d 100644--- a/pubspec.yaml+++ b/pubspec.yaml@@ -1,7 +1,7 @@name: absorbdescription: An Audiobookshelf Clientpublish_to: 'none'-version: 1.9.3+222+version: 1.9.3+223environment:sdk: '>=3.10.0 <4.0.0'