Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Add optional long-skip buttons to the player card

Barnabasa7dbbd197e3f
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 98293572..653b7a57 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -579,6 +579,11 @@
"defaultSpeedSubtitle": "New books start at this speed - each book remembers its own",
"skipBack": "Skip back",
"skipForward": "Skip forward",
+ "longSkipButtons": "Long skip buttons",
+ "longSkipButtonsOnSubtitle": "On - the player shows a second, bigger skip pair",
+ "longSkipButtonsOffSubtitle": "Off - just the regular skip buttons",
+ "longSkipBack": "Long skip back",
+ "longSkipForward": "Long skip forward",
"chapterProgressInNotification": "Chapter progress in notification & Android Auto",
"chapterProgressOnSubtitle": "On - notification & Android Auto show chapter progress",
"chapterProgressOffSubtitle": "Off - they show full book progress",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index d7c5d426..2bc401ac 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -2314,6 +2314,36 @@ abstract class AppLocalizations {
/// **'Skip forward'**
String get skipForward;
+ /// No description provided for @longSkipButtons.
+ ///
+ /// In en, this message translates to:
+ /// **'Long skip buttons'**
+ String get longSkipButtons;
+
+ /// No description provided for @longSkipButtonsOnSubtitle.
+ ///
+ /// In en, this message translates to:
+ /// **'On - the player shows a second, bigger skip pair'**
+ String get longSkipButtonsOnSubtitle;
+
+ /// No description provided for @longSkipButtonsOffSubtitle.
+ ///
+ /// In en, this message translates to:
+ /// **'Off - just the regular skip buttons'**
+ String get longSkipButtonsOffSubtitle;
+
+ /// No description provided for @longSkipBack.
+ ///
+ /// In en, this message translates to:
+ /// **'Long skip back'**
+ String get longSkipBack;
+
+ /// No description provided for @longSkipForward.
+ ///
+ /// In en, this message translates to:
+ /// **'Long skip forward'**
+ String get longSkipForward;
+
/// No description provided for @chapterProgressInNotification.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 2f945ae4..239b96ae 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -1221,6 +1221,23 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get skipForward => 'Vorspulen';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Kapitelfortschritt in der Benachrichtigung';
diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dart
index 35d01dce..f3f1d157 100644
--- a/lib/l10n/app_localizations_el.dart
+++ b/lib/l10n/app_localizations_el.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 7886ba76..5ee63d87 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 0ad907b8..d217e45d 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index b5bd07c1..6d1295ca 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -1215,6 +1215,23 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 65e76167..9791b0a1 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 9ae02993..78f06540 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dart
index 44285b2a..d107777c 100644
--- a/lib/l10n/app_localizations_no.dart
+++ b/lib/l10n/app_localizations_no.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index ba0036b3..c8624394 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dart
index 0be96cf7..ace78f39 100644
--- a/lib/l10n/app_localizations_ro.dart
+++ b/lib/l10n/app_localizations_ro.dart
@@ -1213,6 +1213,23 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index b431e583..d20f53ae 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -1216,6 +1216,23 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get skipForward => 'Skip forward';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification =>
'Chapter progress in notification & Android Auto';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index bba18149..5124bfbc 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -1189,6 +1189,23 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get skipForward => '快进';
+ @override
+ String get longSkipButtons => 'Long skip buttons';
+
+ @override
+ String get longSkipButtonsOnSubtitle =>
+ 'On - the player shows a second, bigger skip pair';
+
+ @override
+ String get longSkipButtonsOffSubtitle =>
+ 'Off - just the regular skip buttons';
+
+ @override
+ String get longSkipBack => 'Long skip back';
+
+ @override
+ String get longSkipForward => 'Long skip forward';
+
@override
String get chapterProgressInNotification => '通知中显示章节进度';
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index d0d0b0e9..0e4fbaa2 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -74,6 +74,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
int _forwardSkip = 30;
int _backSkip = 10;
bool _skipChapterBarrier = true;
+ bool _longSkipButtons = false;
+ int _longForwardSkip = 60;
+ int _longBackSkip = 60;
String _shakeMode = 'addTime';
int _sleepRewindSeconds = 0;
static const _maxRewindMinutes = 120;
@@ -707,6 +710,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
final sleepRewind = await PlayerSettings.getSleepRewindSeconds();
final lockPortrait = await PlayerSettings.getLockPortrait();
final autoSeriesDownload = await PlayerSettings.getAutoSeriesDownloadDefault();
+ final longSkipButtons = await PlayerSettings.getLongSkipButtons();
+ final longFwd = await PlayerSettings.getLongForwardSkip();
+ final longBack = await PlayerSettings.getLongBackSkip();
if (mounted) setState(() {
_sleepRewindSeconds = sleepRewind;
_lockPortrait = lockPortrait;
@@ -769,6 +775,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
_cardBackground = cardBg;
_progressTextScale = progressScale;
_skipChapterBarrier = skipBarrier;
+ _longSkipButtons = longSkipButtons;
+ _longForwardSkip = longFwd;
+ _longBackSkip = longBack;
_trustAllCerts = trustCerts;
_showExplicitBadge = showExplicit;
_includePreReleases = preReleases;
@@ -1932,6 +1941,59 @@ class _SettingsScreenState extends State<SettingsScreen> {
PlayerSettings.setSkipChapterBarrier(v);
} : null,
),
+ // Long skip pair (GH #242)
+ SwitchListTile(
+ title: Text(l.longSkipButtons),
+ subtitle: Text(
+ _longSkipButtons ? l.longSkipButtonsOnSubtitle : l.longSkipButtonsOffSubtitle,
+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant),
+ ),
+ value: _longSkipButtons,
+ onChanged: _loaded ? (v) {
+ setState(() => _longSkipButtons = v);
+ PlayerSettings.setLongSkipButtons(v);
+ } : null,
+ ),
+ if (_longSkipButtons) ...[
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(l.longSkipBack, style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant)),
+ Text(l.minutesValue(_longBackSkip ~/ 60), style: tt.bodyMedium?.copyWith(
+ fontWeight: FontWeight.w600, color: cs.primary)),
+ ],
+ ),
+ ),
+ AbsorbSlider(
+ value: (_longBackSkip ~/ 60).toDouble(),
+ min: 1, max: 10, divisions: 9,
+ onChanged: _loaded ? (v) {
+ setState(() => _longBackSkip = v.round() * 60);
+ PlayerSettings.setLongBackSkip(v.round() * 60);
+ } : null,
+ ),
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 0, 16, 4),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(l.longSkipForward, style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant)),
+ Text(l.minutesValue(_longForwardSkip ~/ 60), style: tt.bodyMedium?.copyWith(
+ fontWeight: FontWeight.w600, color: cs.primary)),
+ ],
+ ),
+ ),
+ AbsorbSlider(
+ value: (_longForwardSkip ~/ 60).toDouble(),
+ min: 1, max: 10, divisions: 9,
+ onChanged: _loaded ? (v) {
+ setState(() => _longForwardSkip = v.round() * 60);
+ PlayerSettings.setLongForwardSkip(v.round() * 60);
+ } : null,
+ ),
+ ],
const Divider(height: 1, indent: 16, endIndent: 16),
// ── Auto-Rewind ──
SwitchListTile(
diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart
index 629bf77f..147ace89 100644
--- a/lib/services/backup_service.dart
+++ b/lib/services/backup_service.dart
@@ -27,6 +27,9 @@ class BackupService {
'speedAdjustedTime': await PlayerSettings.getSpeedAdjustedTime(),
'forwardSkip': await PlayerSettings.getForwardSkip(),
'backSkip': await PlayerSettings.getBackSkip(),
+ 'longSkipButtons': await PlayerSettings.getLongSkipButtons(),
+ 'longForwardSkip': await PlayerSettings.getLongForwardSkip(),
+ 'longBackSkip': await PlayerSettings.getLongBackSkip(),
'shakeMode': await PlayerSettings.getShakeMode(),
'shakeAddMinutes': await PlayerSettings.getShakeAddMinutes(),
'shakeSensitivity': await PlayerSettings.getShakeSensitivity(),
@@ -440,6 +443,9 @@ class BackupService {
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);
+ if (s['longSkipButtons'] != null) PlayerSettings.setLongSkipButtons(s['longSkipButtons'] as bool);
+ if (s['longForwardSkip'] != null) PlayerSettings.setLongForwardSkip(s['longForwardSkip'] as int);
+ if (s['longBackSkip'] != null) PlayerSettings.setLongBackSkip(s['longBackSkip'] as int);
if (s['audibleRegion'] != null) await PlayerSettings.setAudibleRegion(s['audibleRegion'] as String);
if (s['upcomingReleasesSortByDate'] != null) await PlayerSettings.setUpcomingReleasesSortByDate(s['upcomingReleasesSortByDate'] as bool);
if (s['libraryTagFilter'] != null) await PlayerSettings.setLibraryTagFilter(s['libraryTagFilter'] as String);
diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dart
index 59bc0787..ea448511 100644
--- a/lib/services/player_settings.dart
+++ b/lib/services/player_settings.dart
@@ -355,6 +355,14 @@ class PlayerSettings {
static Future<bool> getSkipChapterBarrier() => _get('skipChapterBarrier', true);
static Future<void> setSkipChapterBarrier(bool value) => _set('skipChapterBarrier', value);
+ // Optional second, bigger skip pair on the player card (GH #242).
+ static Future<bool> getLongSkipButtons() => _get('longSkipButtons', false);
+ static Future<void> setLongSkipButtons(bool value) => _set('longSkipButtons', value, notify: true);
+ static Future<int> getLongForwardSkip() => _get('longForwardSkip', 60);
+ static Future<void> setLongForwardSkip(int seconds) => _set('longForwardSkip', seconds, notify: true);
+ static Future<int> getLongBackSkip() => _get('longBackSkip', 60);
+ static Future<void> setLongBackSkip(int seconds) => _set('longBackSkip', seconds, notify: true);
+
/// Cached value for synchronous access in widget build methods.
static bool showExplicitBadge = true;
static Future<bool> getShowExplicitBadge() => _get('showExplicitBadge', true);
diff --git a/lib/widgets/card_playback_controls.dart b/lib/widgets/card_playback_controls.dart
index b8c947d4..dc23fa12 100644
--- a/lib/widgets/card_playback_controls.dart
+++ b/lib/widgets/card_playback_controls.dart
@@ -21,6 +21,9 @@ class CardPlaybackControls extends StatefulWidget {
class _CardPlaybackControlsState extends State<CardPlaybackControls> {
int _backSkip = 10;
int _forwardSkip = 30;
+ bool _longSkip = false;
+ int _longBackSkip = 60;
+ int _longForwardSkip = 60;
@override void initState() {
super.initState();
@@ -31,6 +34,9 @@ class _CardPlaybackControlsState extends State<CardPlaybackControls> {
void _loadSkipSettings() {
PlayerSettings.getBackSkip().then((v) { if (mounted && v != _backSkip) setState(() => _backSkip = v); });
PlayerSettings.getForwardSkip().then((v) { if (mounted && v != _forwardSkip) setState(() => _forwardSkip = v); });
+ PlayerSettings.getLongSkipButtons().then((v) { if (mounted && v != _longSkip) setState(() => _longSkip = v); });
+ PlayerSettings.getLongBackSkip().then((v) { if (mounted && v != _longBackSkip) setState(() => _longBackSkip = v); });
+ PlayerSettings.getLongForwardSkip().then((v) { if (mounted && v != _longForwardSkip) setState(() => _longForwardSkip = v); });
}
@override void dispose() {
@@ -38,21 +44,38 @@ class _CardPlaybackControlsState extends State<CardPlaybackControls> {
super.dispose();
}
- Widget _skipIcon(int seconds, bool isForward, {bool active = true}) {
+ Widget _skipIcon(int seconds, bool isForward, {bool active = true, double size = 42}) {
final cs = Theme.of(context).colorScheme;
final hasBuiltIn = [5, 10, 30].contains(seconds);
if (hasBuiltIn) {
IconData icon;
if (isForward) { icon = seconds == 5 ? Icons.forward_5_rounded : seconds == 10 ? Icons.forward_10_rounded : Icons.forward_30_rounded; }
else { icon = seconds == 5 ? Icons.replay_5_rounded : seconds == 10 ? Icons.replay_10_rounded : Icons.replay_30_rounded; }
- return Icon(icon, size: 42, color: active ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurface.withValues(alpha: 0.24));
+ return Icon(icon, size: size, color: active ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurface.withValues(alpha: 0.24));
}
return Stack(alignment: Alignment.center, children: [
- Icon(isForward ? Icons.rotate_right_rounded : Icons.rotate_left_rounded, size: 42, color: active ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurface.withValues(alpha: 0.24)),
+ Icon(isForward ? Icons.rotate_right_rounded : Icons.rotate_left_rounded, size: size, color: active ? cs.onSurface.withValues(alpha: 0.7) : cs.onSurface.withValues(alpha: 0.24)),
Padding(padding: const EdgeInsets.only(top: 2), child: Text('$seconds', style: TextStyle(fontSize: 10, fontWeight: FontWeight.w900, color: active ? cs.onSurface : cs.onSurface.withValues(alpha: 0.24)))),
]);
}
+ // With the play circle plus the long pair the row holds seven controls, so
+ // everything steps down a notch to keep it airy. The six-control cover-play
+ // row keeps the regular sizes.
+ bool get _sevenControls => _longSkip && widget.showPlayButton;
+
+ /// The optional bigger jump (GH #242): same rotate glyph as the custom
+ /// short-skip fallback but smaller, with a minutes label so the two pairs
+ /// read differently at a glance.
+ Widget _longSkipIcon(int seconds, bool isForward, {bool active = true}) {
+ final cs = Theme.of(context).colorScheme;
+ final label = seconds % 60 == 0 ? '${seconds ~/ 60}m' : '$seconds';
+ return Stack(alignment: Alignment.center, children: [
+ Icon(isForward ? Icons.rotate_right_rounded : Icons.rotate_left_rounded, size: 34, color: active ? cs.onSurface.withValues(alpha: 0.55) : cs.onSurface.withValues(alpha: 0.24)),
+ Padding(padding: const EdgeInsets.only(top: 2), child: Text(label, style: TextStyle(fontSize: 9, fontWeight: FontWeight.w900, color: active ? cs.onSurface.withValues(alpha: 0.8) : cs.onSurface.withValues(alpha: 0.24)))),
+ ]);
+ }
+
@override
Widget build(BuildContext context) {
final cast = ChromecastService();
@@ -74,7 +97,7 @@ class _CardPlaybackControlsState extends State<CardPlaybackControls> {
}
Widget _playPauseButton(ColorScheme cs, {required bool playing, required bool loading, required VoidCallback? onTap}) {
- final s = widget.playButtonSize;
+ final s = _sevenControls ? 56.0 : widget.playButtonSize;
final iconSize = s * 0.49;
final spinnerSize = s * 0.4;
return Pressable(
@@ -96,30 +119,44 @@ class _CardPlaybackControlsState extends State<CardPlaybackControls> {
/// Controls that route to ChromecastService
Widget _buildCastControls(ChromecastService cast) {
final cs = Theme.of(context).colorScheme;
+ final chIcon = _sevenControls ? 30.0 : 34.0;
+ final chBox = _sevenControls ? 46.0 : 52.0;
+ final skIcon = _sevenControls ? 38.0 : 42.0;
+ final skBox = _sevenControls ? 54.0 : 60.0;
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(child: Pressable(
onTap: cast.skipToPreviousChapter,
- child: SizedBox(width: 52, height: 52, child: Center(
- child: Icon(Icons.skip_previous_rounded, size: 34, color: cs.onSurfaceVariant),
+ child: SizedBox(width: chBox, height: chBox, child: Center(
+ child: Icon(Icons.skip_previous_rounded, size: chIcon, color: cs.onSurfaceVariant),
)),
)),
+ if (_longSkip)
+ Flexible(child: Pressable(
+ onTap: () => cast.skipBackward(_longBackSkip),
+ child: SizedBox(width: 48, height: skBox, child: Center(child: _longSkipIcon(_longBackSkip, false))),
+ )),
Flexible(child: Pressable(
onTap: () => cast.skipBackward(_backSkip),
- child: SizedBox(width: 60, height: 60, child: Center(child: _skipIcon(_backSkip, false))),
+ child: SizedBox(width: skBox, height: skBox, child: Center(child: _skipIcon(_backSkip, false, size: skIcon))),
)),
if (widget.showPlayButton)
Flexible(child: _playPauseButton(cs, playing: cast.isPlaying, loading: false, onTap: cast.togglePlayPause)),
Flexible(child: Pressable(
onTap: () => cast.skipForward(_forwardSkip),
- child: SizedBox(width: 60, height: 60, child: Center(child: _skipIcon(_forwardSkip, true))),
+ child: SizedBox(width: skBox, height: skBox, child: Center(child: _skipIcon(_forwardSkip, true, size: skIcon))),
)),
+ if (_longSkip)
+ Flexible(child: Pressable(
+ onTap: () => cast.skipForward(_longForwardSkip),
+ child: SizedBox(width: 48, height: skBox, child: Center(child: _longSkipIcon(_longForwardSkip, true))),
+ )),
Flexible(child: Pressable(
onTap: cast.skipToNextChapter,
- child: SizedBox(width: 52, height: 52, child: Center(
- child: Icon(Icons.skip_next_rounded, size: 34, color: cs.onSurfaceVariant),
+ child: SizedBox(width: chBox, height: chBox, child: Center(
+ child: Icon(Icons.skip_next_rounded, size: chIcon, color: cs.onSurfaceVariant),
)),
)),
],
@@ -130,30 +167,45 @@ class _CardPlaybackControlsState extends State<CardPlaybackControls> {
Widget _buildLocalControls() {
final cs = Theme.of(context).colorScheme;
final loading = widget.isStarting || (widget.isActive && widget.player.isLoadingOrBuffering && !widget.player.isPlaying);
+ final chIcon = _sevenControls ? 30.0 : 34.0;
+ final chBox = _sevenControls ? 46.0 : 52.0;
+ final skIcon = _sevenControls ? 38.0 : 42.0;
+ final skBox = _sevenControls ? 54.0 : 60.0;
+
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(child: Pressable(
onTap: widget.isActive ? widget.player.skipToPreviousChapter : null,
- child: SizedBox(width: 52, height: 52, child: Center(
- child: Icon(Icons.skip_previous_rounded, size: 34, color: widget.isActive ? cs.onSurfaceVariant : cs.onSurface.withValues(alpha: 0.12)),
+ child: SizedBox(width: chBox, height: chBox, child: Center(
+ child: Icon(Icons.skip_previous_rounded, size: chIcon, color: widget.isActive ? cs.onSurfaceVariant : cs.onSurface.withValues(alpha: 0.12)),
)),
)),
+ if (_longSkip)
+ Flexible(child: Pressable(
+ onTap: widget.isActive ? () => widget.player.skipBackward(_longBackSkip) : null,
+ child: SizedBox(width: 48, height: skBox, child: Center(child: _longSkipIcon(_longBackSkip, false, active: widget.isActive))),
+ )),
Flexible(child: Pressable(
onTap: widget.isActive ? () => widget.player.skipBackward(_backSkip) : null,
- child: SizedBox(width: 60, height: 60, child: Center(child: _skipIcon(_backSkip, false, active: widget.isActive))),
+ child: SizedBox(width: skBox, height: skBox, child: Center(child: _skipIcon(_backSkip, false, active: widget.isActive, size: skIcon))),
)),
if (widget.showPlayButton)
Flexible(child: _playPauseButton(cs, playing: widget.isActive && widget.player.isPlaying, loading: loading,
onTap: widget.isActive ? widget.player.togglePlayPause : widget.onStart)),
Flexible(child: Pressable(
onTap: widget.isActive ? () => widget.player.skipForward(_forwardSkip) : null,
- child: SizedBox(width: 60, height: 60, child: Center(child: _skipIcon(_forwardSkip, true, active: widget.isActive))),
+ child: SizedBox(width: skBox, height: skBox, child: Center(child: _skipIcon(_forwardSkip, true, active: widget.isActive, size: skIcon))),
)),
+ if (_longSkip)
+ Flexible(child: Pressable(
+ onTap: widget.isActive ? () => widget.player.skipForward(_longForwardSkip) : null,
+ child: SizedBox(width: 48, height: skBox, child: Center(child: _longSkipIcon(_longForwardSkip, true, active: widget.isActive))),
+ )),
Flexible(child: Pressable(
onTap: widget.isActive ? widget.player.skipToNextChapter : null,
- child: SizedBox(width: 52, height: 52, child: Center(
- child: Icon(Icons.skip_next_rounded, size: 34, color: widget.isActive ? cs.onSurfaceVariant : cs.onSurface.withValues(alpha: 0.12)),
+ child: SizedBox(width: chBox, height: chBox, child: Center(
+ child: Icon(Icons.skip_next_rounded, size: chIcon, color: widget.isActive ? cs.onSurfaceVariant : cs.onSurface.withValues(alpha: 0.12)),
)),
)),
],