A cross platform Audiobookshelf client for Android and iOS
Dart
Choose how books and podcasts are sorted in Android Auto and CarPlay
Barnabas8a2185b62895
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex ed37f2c4..4b5fb963 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -4180,6 +4180,12 @@"carConnectAutoplayIos": "Start playback when CarPlay connects","carConnectAutoplayOnSubtitle": "The last book you were listening to starts by itself when the car connects","carConnectAutoplayOffSubtitle": "Playback waits for you to press play",+ "carBookOrder": "Book order in the car",+ "carBookOrderReverse": "Reverse book order",+ "carBookOrderReverseSubtitle": "Z to A, or oldest added first",+ "carPodcastOrder": "Podcast order in the car",+ "carEpisodesOldestFirst": "Oldest episodes first",+ "carEpisodesOldestFirstSubtitle": "For shows you listen to from the start","androidAutoCatBooks": "Books","androidAutoCatSeries": "Series","androidAutoCatAuthors": "Authors",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 08fb16a2..5f60a1bf 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -11979,6 +11979,42 @@ abstract class AppLocalizations {/// **'Playback waits for you to press play'**String get carConnectAutoplayOffSubtitle;+ /// No description provided for @carBookOrder.+ ///+ /// In en, this message translates to:+ /// **'Book order in the car'**+ String get carBookOrder;++ /// No description provided for @carBookOrderReverse.+ ///+ /// In en, this message translates to:+ /// **'Reverse book order'**+ String get carBookOrderReverse;++ /// No description provided for @carBookOrderReverseSubtitle.+ ///+ /// In en, this message translates to:+ /// **'Z to A, or oldest added first'**+ String get carBookOrderReverseSubtitle;++ /// No description provided for @carPodcastOrder.+ ///+ /// In en, this message translates to:+ /// **'Podcast order in the car'**+ String get carPodcastOrder;++ /// No description provided for @carEpisodesOldestFirst.+ ///+ /// In en, this message translates to:+ /// **'Oldest episodes first'**+ String get carEpisodesOldestFirst;++ /// No description provided for @carEpisodesOldestFirstSubtitle.+ ///+ /// In en, this message translates to:+ /// **'For shows you listen to from the start'**+ String get carEpisodesOldestFirstSubtitle;+/// No description provided for @androidAutoCatBooks.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex b2572485..214cd179 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -7103,6 +7103,25 @@ class AppLocalizationsDe extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Bücher';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 3fbeb808..87ac40d2 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsEl extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 56cb41f0..e5bf2d78 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsEn extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex e2d0331c..a91a9c69 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -7006,6 +7006,25 @@ class AppLocalizationsEs extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex a57792e8..5c3730f6 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -7055,6 +7055,25 @@ class AppLocalizationsFr extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Livres';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex ec6cf52c..f2737bdf 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsIt extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 095284e7..0e6bedba 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsJa extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 8e00a138..e7b45bda 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsNo extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex e856fa15..6718801c 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsPt extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 3634987d..d55eb717 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -7004,6 +7004,25 @@ class AppLocalizationsRo extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex ee040e0b..caa565d3 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -7008,6 +7008,25 @@ class AppLocalizationsRu extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 6e4442a1..2e6b7ad3 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -6914,6 +6914,25 @@ class AppLocalizationsZh extends AppLocalizations {String get carConnectAutoplayOffSubtitle =>'Playback waits for you to press play';+ @override+ String get carBookOrder => 'Book order in the car';++ @override+ String get carBookOrderReverse => 'Reverse book order';++ @override+ String get carBookOrderReverseSubtitle => 'Z to A, or oldest added first';++ @override+ String get carPodcastOrder => 'Podcast order in the car';++ @override+ String get carEpisodesOldestFirst => 'Oldest episodes first';++ @override+ String get carEpisodesOldestFirstSubtitle =>+ 'For shows you listen to from the start';+@overrideString get androidAutoCatBooks => 'Books';diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex ba389917..39f895e5 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -11,6 +11,7 @@ import '../providers/auth_provider.dart';import '../providers/library_provider.dart';import '../services/audio_player_service.dart';import '../services/download_service.dart';+import '../services/android_auto_service.dart';import '../services/episode_notification_service.dart';import '../services/sleep_timer_service.dart';import '../services/user_account_service.dart';@@ -94,6 +95,10 @@ class _SettingsScreenState extends State<SettingsScreen> {bool _notifSpeedBookmark = false;bool _duckBriefInterruptions = false;bool _autoplayOnCarConnect = false;+ String _carBookSort = 'title';+ bool _carBookSortReverse = false;+ String _carPodcastSort = 'title';+ bool _carEpisodesOldestFirst = false;bool _lockSeekBar = false;bool _mp3IndexSeeking = false;bool _speedAdjustedTime = true;@@ -399,6 +404,38 @@ class _SettingsScreenState extends State<SettingsScreen> {applyManualSeed(argb);}+ Widget _carSortPicker(TextTheme tt, String label, String value,+ List<(String, String)> options, ValueChanged<String> onChanged) {+ return Padding(+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(label, style: tt.titleSmall),+ const SizedBox(height: 12),+ SizedBox(+ width: double.infinity,+ child: SegmentedButton<String>(+ showSelectedIcon: false,+ segments: [+ for (final (key, text) in options)+ ButtonSegment(+ value: key,+ label: FittedBox(+ fit: BoxFit.scaleDown, child: Text(text, maxLines: 1)),+ ),+ ],+ selected: {value},+ onSelectionChanged:+ _loaded ? (selected) => onChanged(selected.first) : null,+ style: const ButtonStyle(visualDensity: VisualDensity.compact),+ ),+ ),+ ],+ ),+ );+ }+Widget _buildColorSwatches(ColorScheme cs) {final l = AppLocalizations.of(context)!;return Wrap(@@ -1041,6 +1078,10 @@ class _SettingsScreenState extends State<SettingsScreen> {final episodeNotifMinutes = await PlayerSettings.getEpisodeNotifIntervalMinutes();final duckBriefInterruptions = await PlayerSettings.getDuckBriefInterruptions();final autoplayOnCarConnect = await PlayerSettings.getAutoplayOnCarConnect();+ final carBookSort = await PlayerSettings.getCarBookSort();+ final carBookSortReverse = await PlayerSettings.getCarBookSortReverse();+ final carPodcastSort = await PlayerSettings.getCarPodcastSort();+ final carEpisodesOldestFirst = await PlayerSettings.getCarEpisodesOldestFirst();if (mounted) setState(() {_podcastTabEnabled = podcastTabEnabled;_podcastTabLibraryId = podcastTabLibraryId;@@ -1061,6 +1102,10 @@ class _SettingsScreenState extends State<SettingsScreen> {_notifSpeedBookmark = notifSpeedBookmark;_duckBriefInterruptions = duckBriefInterruptions;_autoplayOnCarConnect = autoplayOnCarConnect;+ _carBookSort = carBookSort;+ _carBookSortReverse = carBookSortReverse;+ _carPodcastSort = carPodcastSort;+ _carEpisodesOldestFirst = carEpisodesOldestFirst;_lockSeekBar = lockSeek;_speedAdjustedTime = speedAdj;_forwardSkip = fwd;@@ -3006,6 +3051,52 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.setAutoplayOnCarConnect(v);} : null,),+ const Divider(height: 1, indent: 16, endIndent: 16),+ _carSortPicker(+ tt,+ l.carBookOrder,+ _carBookSort,+ [('title', l.title), ('author', l.author), ('added', l.dateAdded)],+ (v) {+ setState(() => _carBookSort = v);+ PlayerSettings.setCarBookSort(v)+ .then((_) => AndroidAutoService.browseOrderChanged());+ },+ ),+ SwitchListTile(+ title: Text(l.carBookOrderReverse),+ subtitle: Text(l.carBookOrderReverseSubtitle,+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _carBookSortReverse,+ onChanged: _loaded ? (v) {+ setState(() => _carBookSortReverse = v);+ PlayerSettings.setCarBookSortReverse(v)+ .then((_) => AndroidAutoService.browseOrderChanged());+ } : null,+ ),+ const Divider(height: 1, indent: 16, endIndent: 16),+ _carSortPicker(+ tt,+ l.carPodcastOrder,+ _carPodcastSort,+ [('title', l.title), ('added', l.dateAdded)],+ (v) {+ setState(() => _carPodcastSort = v);+ PlayerSettings.setCarPodcastSort(v)+ .then((_) => AndroidAutoService.browseOrderChanged());+ },+ ),+ SwitchListTile(+ title: Text(l.carEpisodesOldestFirst),+ subtitle: Text(l.carEpisodesOldestFirstSubtitle,+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _carEpisodesOldestFirst,+ onChanged: _loaded ? (v) {+ setState(() => _carEpisodesOldestFirst = v);+ PlayerSettings.setCarEpisodesOldestFirst(v)+ .then((_) => AndroidAutoService.browseOrderChanged());+ } : null,+ ),// Android only: chooses which pair fills the phone media// player's two extra slots. iOS uses CarPlay's own buttons.if (Platform.isAndroid) ...[diff --git a/lib/services/android_auto_service.dart b/lib/services/android_auto_service.dartindex 4a195d4c..4c1782a0 100644--- a/lib/services/android_auto_service.dart+++ b/lib/services/android_auto_service.dart@@ -132,6 +132,8 @@ class AutoBookEntry {final String mediaType;/// Library ID. Required to build a `show:` browse id for podcast shows.final String? libraryId;+ /// When the item was added to the server (ms), for the Date Added sort.+ final int? addedAt;const AutoBookEntry({required this.id,@@ -145,6 +147,7 @@ class AutoBookEntry {this.showId,this.mediaType = 'book',this.libraryId,+ this.addedAt,});/// True when this entry represents a podcast show (not a single episode)@@ -473,6 +476,17 @@ class AndroidAutoService {}}+ /// A car sort setting changed, so every cached list may be in the old order.+ static void browseOrderChanged() {+ _instance._childrenCache.clear();+ if (Platform.isAndroid) {+ // ignore: deprecated_member_use+ unawaited(AudioServiceBackground+ .notifyChildrenChanged(AutoMediaIds.root)+ .catchError((_) {}));+ }+ }+Future<void> _refreshDownloaded() async {final ds = DownloadService();final items = ds.downloadedItems;@@ -888,6 +902,7 @@ class AndroidAutoService {coverUrl: localCoverUri(id),chapters: chapters,libraryId: item['libraryId'] as String?,+ addedAt: (item['addedAt'] as num?)?.toInt(),);}@@ -1247,11 +1262,13 @@ class AndroidAutoService {final allShows = <MediaItem>[];int page = 0;const pageSize = 100;+ final byAdded = await PlayerSettings.getCarPodcastSort() == 'added';while (allShows.length < maxItems) {final result = await api.getLibraryItems(libraryId, page: page, limit: pageSize,- sort: 'media.metadata.title', desc: 0,+ sort: byAdded ? 'addedAt' : 'media.metadata.title',+ desc: byAdded ? 1 : 0,);if (result == null) break;@@ -1305,12 +1322,12 @@ class AndroidAutoService {final showTitle = metadata['title'] as String? ?? 'Podcast';final episodes = media?['episodes'] as List<dynamic>? ?? [];- // Sort newest firstfinal sorted = List<dynamic>.from(episodes);+ final oldestFirst = await PlayerSettings.getCarEpisodesOldestFirst();sorted.sort((a, b) {final aTime = (a['publishedAt'] as num?)?.toInt() ?? 0;final bTime = (b['publishedAt'] as num?)?.toInt() ?? 0;- return bTime.compareTo(aTime);+ return oldestFirst ? aTime.compareTo(bTime) : bTime.compareTo(aTime);});final coverUri = Uri.tryParse(localCoverUri(showId));@@ -1421,10 +1438,10 @@ class AndroidAutoService {/// are returned only when the matching list exceeds [bucketThreshold] and a/// longer prefix actually splits it; otherwise the matching books are a leaf.({List<AutoBookEntry>? books, List<({String prefix, int count})>? buckets})- resolveBrowseLevel(List<AutoBookEntry> all, String prefix) {- final matching = prefix.isEmpty- ? all- : all.where((b) => _normTitle(b.title).startsWith(prefix)).toList();+ resolveBrowseLevel(List<AutoBookEntry> all, String prefix,+ {String sort = 'title'}) {+ if (sort == 'added') return _resolveRangeLevel(all, prefix);+ final matching = booksForPrefix(all, prefix, sort: sort);if (matching.length <= bucketThreshold) {return (books: matching, buckets: null);}@@ -1434,7 +1451,7 @@ class AndroidAutoService {while (true) {final counts = <String, int>{};for (final b in matching) {- final k = _prefixOf(b.title, depth);+ final k = _prefixOf(_bucketText(b, sort), depth);counts[k] = (counts[k] ?? 0) + 1;}if (counts.length > 1) {@@ -1445,22 +1462,90 @@ class AndroidAutoService {}// Single bucket: go deeper only while some title is longer than [depth];// otherwise these titles are identical and can't be split - show them.- if (!matching.any((b) => _normTitle(b.title).length > depth)) {+ if (!matching.any((b) => _normTitle(_bucketText(b, sort)).length > depth)) {return (books: matching, buckets: null);}depth++;}}+ /// What a book is grouped by: its author for the author sort, else its title.+ static String _bucketText(AutoBookEntry b, String sort) =>+ sort == 'author' ? b.author : b.title;++ /// Date Added has no letters to group by, so it splits into numbered runs+ /// ("1-50", "51-100") in sort order. A range too big for one level splits+ /// into bigger runs first, so no level lists more than [bucketThreshold].+ ({List<AutoBookEntry>? books, List<({String prefix, int count})>? buckets})+ _resolveRangeLevel(List<AutoBookEntry> all, String prefix) {+ final range = _parseRange(prefix, all.length);+ final count = range.end - range.start;+ if (count <= bucketThreshold) {+ return (books: all.sublist(range.start, range.end), buckets: null);+ }+ var size = bucketThreshold;+ while ((count / size).ceil() > bucketThreshold) {+ size *= bucketThreshold;+ }+ final buckets = <({String prefix, int count})>[];+ for (var start = range.start; start < range.end; start += size) {+ final end = start + size < range.end ? start + size : range.end;+ buckets.add((prefix: '${start + 1}-$end', count: end - start));+ }+ return (books: null, buckets: buckets);+ }++ /// "51-100" back to list indices; anything else is the whole list.+ static ({int start, int end}) _parseRange(String prefix, int length) {+ final parts = prefix.split('-');+ if (parts.length == 2) {+ final first = int.tryParse(parts[0]);+ final last = int.tryParse(parts[1]);+ if (first != null && last != null && first >= 1 && first <= last) {+ return (+ start: (first - 1).clamp(0, length),+ end: last.clamp(0, length),+ );+ }+ }+ return (start: 0, end: length);+ }++ /// Every book in the library in the order the car sort setting asks for,+ /// plus that sort so the caller groups them to match.+ Future<({List<AutoBookEntry> books, String sort})> fetchSortedBooks(+ String libraryId) async {+ final all = await fetchAllBooks(libraryId);+ final sort = await PlayerSettings.getCarBookSort();+ final reverse = await PlayerSettings.getCarBookSortReverse();+ var books = all;+ if (sort == 'author') {+ books = [...all]+ ..sort((a, b) {+ final byAuthor = _normTitle(a.author).compareTo(_normTitle(b.author));+ return byAuthor != 0+ ? byAuthor+ : _normTitle(a.title).compareTo(_normTitle(b.title));+ });+ } else if (sort == 'added') {+ books = [...all]+ ..sort((a, b) => (b.addedAt ?? 0).compareTo(a.addedAt ?? 0));+ }+ if (reverse) books = books.reversed.toList();+ return (books: books, sort: sort);+ }+/// Flatten the recursive prefix tree into a single ordered list of LEAF/// buckets (each <= [bucketThreshold] books). Used by CarPlay, where the/// recursive push drilldown isn't possible: CarPlay caps the navigation/// stack (~5 templates), so we show one bucket level then the books instead/// of pushing a template per letter the way Android Auto can.- List<({String prefix, int count})> flattenedBookBuckets(List<AutoBookEntry> all) {+ List<({String prefix, int count})> flattenedBookBuckets(+ List<AutoBookEntry> all,+ {String sort = 'title'}) {final out = <({String prefix, int count})>[];void walk(String prefix) {- final level = resolveBrowseLevel(all, prefix);+ final level = resolveBrowseLevel(all, prefix, sort: sort);if (level.books != null) {if (level.books!.isNotEmpty) {out.add((prefix: prefix, count: level.books!.length));@@ -1478,15 +1563,22 @@ class AndroidAutoService {/// All books whose title falls under [prefix] (a leaf bucket from/// [flattenedBookBuckets]). Empty prefix = the whole library.- List<AutoBookEntry> booksForPrefix(List<AutoBookEntry> all, String prefix) {+ List<AutoBookEntry> booksForPrefix(List<AutoBookEntry> all, String prefix,+ {String sort = 'title'}) {if (prefix.isEmpty) return all;- return all.where((b) => _normTitle(b.title).startsWith(prefix)).toList();+ if (sort == 'added') {+ final range = _parseRange(prefix, all.length);+ return all.sublist(range.start, range.end);+ }+ return all+ .where((b) => _normTitle(_bucketText(b, sort)).startsWith(prefix))+ .toList();}/// Android Auto children for a books browse level at [prefix] (empty = top).Future<List<MediaItem>> _fetchBooksAtPrefix(String libraryId, String prefix) async {- final all = await fetchAllBooks(libraryId);- final level = resolveBrowseLevel(all, prefix);+ final sorted = await fetchSortedBooks(libraryId);+ final level = resolveBrowseLevel(sorted.books, prefix, sort: sorted.sort);final books = level.books;if (books != null) {return books.map((e) => e.toMediaItem()).toList();@@ -1596,10 +1688,12 @@ class AndroidAutoService {final allShows = <({String id, String title, String? coverUrl})>[];int page = 0;const pageSize = 100;+ final byAdded = await PlayerSettings.getCarPodcastSort() == 'added';while (allShows.length < maxItems) {final result = await api.getLibraryItems(libraryId, page: page, limit: pageSize,- sort: 'media.metadata.title', desc: 0,+ sort: byAdded ? 'addedAt' : 'media.metadata.title',+ desc: byAdded ? 1 : 0,);if (result == null) break;final results = result['results'] as List<dynamic>? ?? [];@@ -1639,10 +1733,11 @@ class AndroidAutoService {final showTitle = metadata['title'] as String? ?? 'Podcast';final episodes = media?['episodes'] as List<dynamic>? ?? [];final sorted = List<dynamic>.from(episodes);+ final oldestFirst = await PlayerSettings.getCarEpisodesOldestFirst();sorted.sort((a, b) {final aTime = (a['publishedAt'] as num?)?.toInt() ?? 0;final bTime = (b['publishedAt'] as num?)?.toInt() ?? 0;- return bTime.compareTo(aTime);+ return oldestFirst ? aTime.compareTo(bTime) : bTime.compareTo(aTime);});final entries = <AutoBookEntry>[];for (final ep in sorted) {diff --git a/lib/services/carplay_service.dart b/lib/services/carplay_service.dartindex ab2e1a4c..1774fb47 100644--- a/lib/services/carplay_service.dart+++ b/lib/services/carplay_service.dart@@ -432,7 +432,8 @@ class CarPlayService {/// the book list - a fixed depth of two pushes.Future<CPListTemplate> _buildBooksList(String libraryId) async {final api = await _autoService.getApi();- final all = await _autoService.fetchAllBooks(libraryId);+ final sorted = await _autoService.fetchSortedBooks(libraryId);+ final all = sorted.books;// Small library: skip the bucket level, list the books directly.if (all.length <= AndroidAutoService.bucketThreshold) {@@ -444,7 +445,7 @@ class CarPlayService {);}- final buckets = _autoService.flattenedBookBuckets(all);+ final buckets = _autoService.flattenedBookBuckets(all, sort: sorted.sort);final items = buckets.map((b) {return CPListItem(text: b.prefix.isEmpty ? '#' : b.prefix,@@ -467,8 +468,9 @@ class CarPlayService {/// Leaf book list for one flat bucket [prefix].Future<CPListTemplate> _buildBooksLeaf(String libraryId, String prefix) async {final api = await _autoService.getApi();- final all = await _autoService.fetchAllBooks(libraryId);- final books = _autoService.booksForPrefix(all, prefix);+ final sorted = await _autoService.fetchSortedBooks(libraryId);+ final books =+ _autoService.booksForPrefix(sorted.books, prefix, sort: sorted.sort);final items = books.map((e) => _playableListItem(e, api)).toList();return CPListTemplate(sections: [CPListSection(items: items)],diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dartindex b0470140..60d0a5bc 100644--- a/lib/services/player_settings.dart+++ b/lib/services/player_settings.dart@@ -849,6 +849,21 @@ class PlayerSettings {// alive but paused) belongs to the car system's own resume behavior; this// covers the cold start where no session exists for it to resume.static Future<bool> getAutoplayOnCarConnect() => _get('autoplayOnCarConnect', false);++ // Android Auto / CarPlay library browsing. Book sort is 'title', 'author' or+ // 'added' (newest first); reverse flips whichever is picked. Podcast shows+ // sort 'title' or 'added'.+ static Future<String> getCarBookSort() => _get('carBookSort', 'title');+ static Future<void> setCarBookSort(String value) => _set('carBookSort', value);+ static Future<bool> getCarBookSortReverse() => _get('carBookSortReverse', false);+ static Future<void> setCarBookSortReverse(bool value) =>+ _set('carBookSortReverse', value);+ static Future<String> getCarPodcastSort() => _get('carPodcastSort', 'title');+ static Future<void> setCarPodcastSort(String value) => _set('carPodcastSort', value);+ static Future<bool> getCarEpisodesOldestFirst() =>+ _get('carEpisodesOldestFirst', false);+ static Future<void> setCarEpisodesOldestFirst(bool value) =>+ _set('carEpisodesOldestFirst', value);static Future<void> setAutoplayOnCarConnect(bool value) =>_set('autoplayOnCarConnect', value);