A cross platform Audiobookshelf client for Android and iOS
Dart
Merge branch 'main' into card-flip-animation
Barnabas6060537f7143
diff --cc lib/services/player_settings.dartindex a42070a8,c62e5cf7..077c61e5--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@@ -518,7 -566,7 +566,7 @@@ class PlayerSettings// ── Card button order ──- static const defaultButtonOrder = ['chapters', 'speed', 'sleep', 'bookmarks', 'details', 'ebook', 'equalizer', 'cast', 'history', 'remove', 'car', 'notes', 'download'];- static const defaultButtonOrder = ['chapters', 'speed', 'sleep', 'bookmarks', 'details', 'equalizer', 'cast', 'airplay', 'history', 'remove', 'car', 'notes', 'download'];++ static const defaultButtonOrder = ['chapters', 'speed', 'sleep', 'bookmarks', 'details', 'ebook', 'equalizer', 'cast', 'airplay', 'history', 'remove', 'car', 'notes', 'download'];static Future<List<String>> getCardButtonOrder() async {final stored = await ScopedPrefs.getStringList('card_button_order');diff --cc lib/widgets/absorbing_card.dartindex b3fcad18,f7e46700..6c67a05e--- a/lib/widgets/absorbing_card.dart+++ b/lib/widgets/absorbing_card.dart@@@ -483,27 -475,9 +492,11 @@@ class AbsorbingCardState extends State<// In gradient/off mode the cover image isn't painted, so derive its scheme separately.if (_cardBackground != 'blurred') _ensureCoverScheme();- final showBookBar = (!_isPodcastEpisode || _chapters.isNotEmpty) && (!lib.isPodcastLibrary || _chapters.isNotEmpty);-- return _buildFront(context, cs, accent, isDark, l, lib, progress, chapterIdx, totalChapters, bookProgress, showBookBar);- }-- Widget _buildFront(- BuildContext context,- ColorScheme cs,- Color accent,- bool isDark,- AppLocalizations l,- LibraryProvider lib,- double progress,- int chapterIdx,- int totalChapters,- double bookProgress,- bool showBookBar,- ) {+ final tt = Theme.of(context).textTheme;+ final mediaHeaders = lib.mediaHeaders;- final cast = ChromecastService();+ // A chapterless book gets the same single-bar look as a chapterless+ // podcast: no top book bar, just the scrubber bar carrying the title.+ final showBookBar = _chapters.isNotEmpty;return GestureDetector(onVerticalDragEnd: (details) {final vy = details.primaryVelocity ?? 0;diff --cc lib/widgets/expanded_card.dartindex a3150d06,833bd581..5beb5db5--- a/lib/widgets/expanded_card.dart+++ b/lib/widgets/expanded_card.dart@@@ -14,7 -14,7 +14,8 @@@ import 'absorbing_shared.dart'import 'card_progress_bar.dart';import 'card_playback_controls.dart';import 'card_buttons.dart';+import 'ebook_reader_view.dart';+ import '../main.dart' show colorSourceNotifier, useColorEverywhereNotifier, manualSeedNotifier, manualColorScheme;// ─── Custom route: slide-up + fade ────────────────────────────