A cross platform Audiobookshelf client for Android and iOS
Dart
Separate podcast sort from book libraries, add floating sort button
Nathan Poulson312bfab15a55
diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dartindex cc5d5049..475a5bff 100644--- a/lib/screens/library_screen.dart+++ b/lib/screens/library_screen.dart@@ -82,6 +82,10 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMibool _seriesSortAsc = true;final _seriesScrollController = ScrollController();+ // ── Podcast-specific sort (persisted separately) ──+ LibrarySort _podcastSort = LibrarySort.recentlyAdded;+ bool _podcastSortAsc = false;+// ── Authors tab state ──List<Map<String, dynamic>> _authors = [];bool _isLoadingAuthors = false;@@ -157,9 +161,6 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi_hasMore = true;_isLoadingPage = false;_availableGenres = [];- // Reset filter on library switch- _filter = LibraryFilter.none;- _genreFilter = null;// Clear series and author data_seriesItems.clear();_seriesPage = 0;@@ -170,12 +171,13 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi_authorsLoaded = false;_isLoadingAuthors = false;});- PlayerSettings.setLibraryFilter('none');- PlayerSettings.setLibraryGenreFilter(null);if (_scrollController.hasClients) _scrollController.jumpTo(0);if (_seriesScrollController.hasClients) _seriesScrollController.jumpTo(0);if (_authorsScrollController.hasClients) _authorsScrollController.jumpTo(0);- _loadPage();+ // Restore sort/filter for the new library type, then load+ _restoreSortFilter().then((_) {+ if (mounted) _loadPage();+ });_loadGenres();}}@@ -212,6 +214,8 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiPlayerSettings.getSeriesSortAsc(),PlayerSettings.getAuthorSort(),PlayerSettings.getAuthorSortAsc(),+ PlayerSettings.getPodcastSort(),+ PlayerSettings.getPodcastSortAsc(),]);if (!mounted) return;final sortName = results[0] as String;@@ -222,7 +226,11 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMifinal seriesSortAsc = results[5] as bool;final authorSortName = results[6] as String;final authorSortAsc = results[7] as bool;+ final podcastSortName = results[8] as String;+ final podcastSortAsc = results[9] as bool;+ final isPodcast = context.read<LibraryProvider>().isPodcastLibrary;setState(() {+ // Book library sort/filter_sort = LibrarySort.values.firstWhere((s) => s.name == sortName,orElse: () => LibrarySort.recentlyAdded,@@ -244,6 +252,19 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiorElse: () => LibrarySort.alphabetical,);_authorSortAsc = authorSortAsc;+ // Podcast sort+ _podcastSort = LibrarySort.values.firstWhere(+ (s) => s.name == podcastSortName,+ orElse: () => LibrarySort.recentlyAdded,+ );+ _podcastSortAsc = podcastSortAsc;+ // Apply podcast settings if currently on a podcast library+ if (isPodcast) {+ _sort = _podcastSort;+ _sortAsc = _podcastSortAsc;+ _filter = LibraryFilter.none;+ _genreFilter = null;+ }});}@@ -525,6 +546,7 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiif (_currentTab == 1) { _changeSeriesSort(newSort); return; }if (_currentTab == 2) { _changeAuthorSort(newSort); return; }+ final isPodcast = context.read<LibraryProvider>().isPodcastLibrary;if (newSort == _sort) {// Tapping the same sort toggles direction (except Random)if (newSort == LibrarySort.random) return;@@ -535,7 +557,12 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi_hasMore = true;_isLoadingPage = false;});- PlayerSettings.setLibrarySortAsc(_sortAsc);+ if (isPodcast) {+ _podcastSortAsc = _sortAsc;+ PlayerSettings.setPodcastSortAsc(_sortAsc);+ } else {+ PlayerSettings.setLibrarySortAsc(_sortAsc);+ }if (_scrollController.hasClients) _scrollController.jumpTo(0);_loadPage();return;@@ -552,8 +579,15 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi_randomSeed = Random().nextInt(100000);}});- PlayerSettings.setLibrarySort(_sort.name);- PlayerSettings.setLibrarySortAsc(_sortAsc);+ if (isPodcast) {+ _podcastSort = _sort;+ _podcastSortAsc = _sortAsc;+ PlayerSettings.setPodcastSort(_sort.name);+ PlayerSettings.setPodcastSortAsc(_sortAsc);+ } else {+ PlayerSettings.setLibrarySort(_sort.name);+ PlayerSettings.setLibrarySortAsc(_sortAsc);+ }if (_scrollController.hasClients) _scrollController.jumpTo(0);_loadPage();}@@ -598,6 +632,7 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMivoid _changeFilter(LibraryFilter newFilter, {String? genre}) {final effective = (newFilter == _filter && genre == _genreFilter) ? LibraryFilter.none : newFilter;if (effective == _filter && genre == _genreFilter) return;+ final isPodcast = context.read<LibraryProvider>().isPodcastLibrary;_loadGeneration++;setState(() {_filter = effective;@@ -607,8 +642,10 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi_hasMore = true;_isLoadingPage = false;});- PlayerSettings.setLibraryFilter(_filter.name);- PlayerSettings.setLibraryGenreFilter(_genreFilter);+ if (!isPodcast) {+ PlayerSettings.setLibraryFilter(_filter.name);+ PlayerSettings.setLibraryGenreFilter(_genreFilter);+ }if (_scrollController.hasClients) _scrollController.jumpTo(0);_loadPage();}@@ -835,6 +872,13 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiif (_authorsScrollController.hasClients) _authorsScrollController.jumpTo(0);} else {setState(() { _sortAsc = !_sortAsc; _items.clear(); _page = 0; _hasMore = true; _isLoadingPage = false; });+ final isPodcast = context.read<LibraryProvider>().isPodcastLibrary;+ if (isPodcast) {+ _podcastSortAsc = _sortAsc;+ PlayerSettings.setPodcastSortAsc(_sortAsc);+ } else {+ PlayerSettings.setLibrarySortAsc(_sortAsc);+ }if (_scrollController.hasClients) _scrollController.jumpTo(0);_loadPage();}@@ -952,6 +996,13 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMibottom: 12,child: _buildFloatingTabBar(cs),),+ // Floating sort button for podcast libraries+ if (!hasTabs && !_isInSearchMode)+ Positioned(+ left: 0, right: 0,+ bottom: 12,+ child: Center(child: _buildFloatingSortButton(cs, tt)),+ ),],),),@@ -1022,6 +1073,41 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi);}+ Widget _buildFloatingSortButton(ColorScheme cs, TextTheme tt) {+ return GestureDetector(+ onTap: () => _showSortFilterSheet(context, cs, tt),+ child: ClipRRect(+ borderRadius: BorderRadius.circular(24),+ child: BackdropFilter(+ filter: ui.ImageFilter.blur(sigmaX: 20, sigmaY: 20),+ child: Container(+ padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 8),+ decoration: BoxDecoration(+ color: cs.surface.withValues(alpha: 0.6),+ borderRadius: BorderRadius.circular(24),+ border: Border.all(color: cs.primary.withValues(alpha: 0.25)),+ ),+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ Text(+ 'Sort',+ style: TextStyle(+ fontSize: 13,+ fontWeight: FontWeight.w700,+ color: cs.primary,+ ),+ ),+ const SizedBox(width: 4),+ Icon(Icons.sort_rounded, size: 14, color: cs.primary),+ ],+ ),+ ),+ ),+ ),+ );+ }+Widget _buildInfoRow(ColorScheme cs, TextTheme tt) {String countText;switch (_currentTab) {diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex b2ea58e2..838818ff 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -208,6 +208,14 @@ class PlayerSettings {static Future<String> getLibraryGenreFilter() => _get('libraryGenreFilter', '');static Future<void> setLibraryGenreFilter(String? value) => _set('libraryGenreFilter', value ?? '');+ // ── Podcast library sort persistence ──++ static Future<String> getPodcastSort() => _get('podcastSort', 'recentlyAdded');+ static Future<void> setPodcastSort(String value) => _set('podcastSort', value);++ static Future<bool> getPodcastSortAsc() => _get('podcastSortAsc', false);+ static Future<void> setPodcastSortAsc(bool value) => _set('podcastSortAsc', value);+static Future<String> getSeriesSort() => _get('seriesSort', 'alphabetical');static Future<void> setSeriesSort(String value) => _set('seriesSort', value);diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex 3f98f628..29399543 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -36,6 +36,8 @@ class BackupService {'librarySortAsc': await PlayerSettings.getLibrarySortAsc(),'libraryFilter': await PlayerSettings.getLibraryFilter(),'libraryGenreFilter': await PlayerSettings.getLibraryGenreFilter(),+ 'podcastSort': await PlayerSettings.getPodcastSort(),+ 'podcastSortAsc': await PlayerSettings.getPodcastSortAsc(),'showGoodreadsButton': await PlayerSettings.getShowGoodreadsButton(),'loggingEnabled': await PlayerSettings.getLoggingEnabled(),'fullScreenPlayer': await PlayerSettings.getFullScreenPlayer(),@@ -178,6 +180,8 @@ class BackupService {if (s['librarySortAsc'] != null) PlayerSettings.setLibrarySortAsc(s['librarySortAsc'] as bool);if (s['libraryFilter'] != null) PlayerSettings.setLibraryFilter(s['libraryFilter'] as String);if (s.containsKey('libraryGenreFilter')) PlayerSettings.setLibraryGenreFilter(s['libraryGenreFilter'] as String?);+ if (s['podcastSort'] != null) PlayerSettings.setPodcastSort(s['podcastSort'] as String);+ if (s['podcastSortAsc'] != null) PlayerSettings.setPodcastSortAsc(s['podcastSortAsc'] as bool);if (s['showGoodreadsButton'] != null) PlayerSettings.setShowGoodreadsButton(s['showGoodreadsButton'] as bool);if (s['loggingEnabled'] != null) PlayerSettings.setLoggingEnabled(s['loggingEnabled'] as bool);if (s['fullScreenPlayer'] != null) PlayerSettings.setFullScreenPlayer(s['fullScreenPlayer'] as bool);diff --git a/lib/widgets/library_sort_filter_sheet.dart b/lib/widgets/library_sort_filter_sheet.dartindex e874d993..d348fb6b 100644--- a/lib/widgets/library_sort_filter_sheet.dart+++ b/lib/widgets/library_sort_filter_sheet.dart@@ -48,7 +48,7 @@ class _SortFilterSheetState extends State<SortFilterSheet> with SingleTickerProvbool _genreExpanded = false;late bool _collapseSeries;- bool get _showFilterTab => widget.libraryTab == LibraryTab.library;+ bool get _showFilterTab => widget.libraryTab == LibraryTab.library && !widget.isPodcastLibrary;@overridevoid initState() {@@ -116,7 +116,7 @@ class _SortFilterSheetState extends State<SortFilterSheet> with SingleTickerProvdouble _calcHeight() {if (widget.libraryTab == LibraryTab.series) return 230;if (widget.libraryTab == LibraryTab.authors) return 180;- return _genreExpanded ? 420 : (widget.isPodcastLibrary ? 320 : 400);+ return _genreExpanded ? 420 : (widget.isPodcastLibrary ? 200 : 400);}Widget _buildSortTab(ColorScheme cs) {@@ -197,6 +197,13 @@ class _SortFilterSheetState extends State<SortFilterSheet> with SingleTickerProv(LibrarySort.totalDuration, 'Number of Books', Icons.auto_stories_rounded),];case LibraryTab.library:+ if (widget.isPodcastLibrary) {+ return [+ (LibrarySort.recentlyAdded, 'Date Added', Icons.schedule_rounded),+ (LibrarySort.alphabetical, 'Title', Icons.sort_by_alpha_rounded),+ (LibrarySort.random, 'Random', Icons.shuffle_rounded),+ ];+ }return [(LibrarySort.recentlyAdded, 'Date Added', Icons.schedule_rounded),(LibrarySort.alphabetical, 'Title', Icons.sort_by_alpha_rounded),