A cross platform Audiobookshelf client for Android and iOS
Dart
Toggleable explicit badge setting in Library settings
Nathan Poulson7353207d4fe0
diff --git a/lib/main.dart b/lib/main.dartindex 1c5c7275..87e74026 100644--- a/lib/main.dart+++ b/lib/main.dart@@ -111,6 +111,7 @@ void main() async {final savedTheme = await PlayerSettings.getThemeMode();applyThemeMode(savedTheme);snappyTransitionsNotifier.value = await PlayerSettings.getSnappyTransitions();+ PlayerSettings.showExplicitBadge = await PlayerSettings.getShowExplicitBadge();// Restore last cover seed color so the theme doesn't flash on startup{final seedInt = await PlayerSettings.getCoverSeedColor();@@ -383,6 +384,7 @@ class _AuthGateState extends State<AuthGate> {final scopedTheme = await PlayerSettings.getThemeMode();applyThemeMode(scopedTheme);snappyTransitionsNotifier.value = await PlayerSettings.getSnappyTransitions();+ PlayerSettings.showExplicitBadge = await PlayerSettings.getShowExplicitBadge();// Restore cover seed color{final seedInt = await PlayerSettings.getCoverSeedColor();diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex d749db51..713221d1 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -64,6 +64,7 @@ class _SettingsScreenState extends State<SettingsScreen> {int _maxConcurrentDownloads = 1;bool _hideEbookOnly = false;bool _showGoodreadsButton = false;+ bool _showExplicitBadge = true;bool _loggingEnabled = false;bool _fullScreenPlayer = false;String _cardButtonLayout = 'standard';@@ -167,6 +168,7 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.getTrustAllCerts(), // 40PlayerSettings.getCoverPlayButton(), // 41PlayerSettings.getSkipChapterBarrier(), // 42+ PlayerSettings.getShowExplicitBadge(), // 43]);final s = results[0] as AutoRewindSettings;final speed = results[1] as double;@@ -209,6 +211,7 @@ class _SettingsScreenState extends State<SettingsScreen> {final trustCerts = results[38] as bool;final coverPlay = results[39] as bool;final skipBarrier = results[40] as bool;+ final showExplicit = results[41] as bool;if (mounted) setState(() {_rewindSettings = s;_defaultSpeed = speed;@@ -255,6 +258,7 @@ class _SettingsScreenState extends State<SettingsScreen> {_coverPlayButton = coverPlay;_skipChapterBarrier = skipBarrier;_trustAllCerts = trustCerts;+ _showExplicitBadge = showExplicit;_loaded = true;});@@ -1609,6 +1613,20 @@ class _SettingsScreenState extends State<SettingsScreen> {PlayerSettings.setShowGoodreadsButton(v);} : null,),+ const Divider(height: 1, indent: 16, endIndent: 16),+ SwitchListTile(+ title: const Text('Show explicit badge'),+ subtitle: Text(+ _showExplicitBadge+ ? 'Explicit items show an "E" badge'+ : 'Off - explicit badge hidden',+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),+ value: _showExplicitBadge,+ onChanged: _loaded ? (v) {+ setState(() => _showExplicitBadge = v);+ PlayerSettings.setShowExplicitBadge(v);+ } : null,+ ),if (lib.libraries.length > 1) ...[const Divider(height: 1, indent: 16, endIndent: 16),...lib.librariesdiff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex 0fb39b7f..f5f46895 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -184,6 +184,14 @@ class PlayerSettings {static Future<bool> getSkipChapterBarrier() => _get('skipChapterBarrier', true);static Future<void> setSkipChapterBarrier(bool value) => _set('skipChapterBarrier', value);+ /// Cached value for synchronous access in widget build methods.+ static bool showExplicitBadge = true;+ static Future<bool> getShowExplicitBadge() => _get('showExplicitBadge', true);+ static Future<void> setShowExplicitBadge(bool value) async {+ showExplicitBadge = value;+ await _set('showExplicitBadge', value);+ }+static Future<bool> getNotificationChapterProgress() => _get('notificationChapterProgress', false);static Future<void> setNotificationChapterProgress(bool value) => _set('notificationChapterProgress', value, notify: true);diff --git a/lib/widgets/book_card.dart b/lib/widgets/book_card.dartindex 7f185c07..6d1fb12c 100644--- a/lib/widgets/book_card.dart+++ b/lib/widgets/book_card.dart@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';import 'package:provider/provider.dart';import 'package:cached_network_image/cached_network_image.dart';import '../providers/library_provider.dart';+import '../services/audio_player_service.dart';import '../services/download_service.dart';import 'book_detail_sheet.dart';import 'episode_list_sheet.dart';@@ -38,7 +39,7 @@ class BookCard extends StatelessWidget {// Progress from LibraryProvider (fetched via /api/me, same source as book detail)final progress = lib.getProgress(itemId);final isFinished = lib.getProgressData(itemId)?['isFinished'] == true;- final isExplicit = metadata['explicit'] == true;+ final isExplicit = PlayerSettings.showExplicitBadge && metadata['explicit'] == true;final isDownloaded = DownloadService().isDownloaded(itemId ?? '');final headers = lib.mediaHeaders;diff --git a/lib/widgets/collection_detail_sheet.dart b/lib/widgets/collection_detail_sheet.dartindex 7491eef0..97780cba 100644--- a/lib/widgets/collection_detail_sheet.dart+++ b/lib/widgets/collection_detail_sheet.dart@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';import 'package:cached_network_image/cached_network_image.dart';import '../providers/auth_provider.dart';import '../providers/library_provider.dart';+import '../services/audio_player_service.dart';import '../services/download_service.dart';import 'book_detail_sheet.dart';import 'stackable_sheet.dart';@@ -270,7 +271,7 @@ class _CollectionDetailSheetState extends State<CollectionDetailSheet> {final title = metadata['title'] as String? ?? 'Unknown';final author = metadata['authorName'] as String? ?? '';final coverUrl = lib.getCoverUrl(itemId);- final isExplicit = metadata['explicit'] == true;+ final isExplicit = PlayerSettings.showExplicitBadge && metadata['explicit'] == true;final progress = lib.getProgress(itemId);final isFinished = lib.getProgressData(itemId)?['isFinished'] == true;final isDownloaded = DownloadService().isDownloaded(itemId);diff --git a/lib/widgets/episode_list_sheet.dart b/lib/widgets/episode_list_sheet.dartindex bee192cd..9a4162a4 100644--- a/lib/widgets/episode_list_sheet.dart+++ b/lib/widgets/episode_list_sheet.dart@@ -74,7 +74,7 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {List<String> get _genres =>(_metadata['genres'] as List<dynamic>?)?.cast<String>() ?? [];String get _language => _metadata['language'] as String? ?? '';- bool get _explicit => _metadata['explicit'] == true;+ bool get _explicit => PlayerSettings.showExplicitBadge && _metadata['explicit'] == true;String get _type => _metadata['type'] as String? ?? '';@overridediff --git a/lib/widgets/library_grid_tiles.dart b/lib/widgets/library_grid_tiles.dartindex dd68012a..70ffec3b 100644--- a/lib/widgets/library_grid_tiles.dart+++ b/lib/widgets/library_grid_tiles.dart@@ -4,6 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart';import 'package:provider/provider.dart';import '../providers/auth_provider.dart';import '../providers/library_provider.dart';+import '../services/audio_player_service.dart';import '../services/download_service.dart';import 'book_detail_sheet.dart';import 'episode_list_sheet.dart';@@ -56,7 +57,7 @@ class _GridBookTileState extends State<GridBookTile> {final author = metadata['authorName'] as String? ?? '';final coverUrl = lib.getCoverUrl(itemId);final progress = lib.getProgress(itemId);- final isExplicit = metadata['explicit'] == true;+ final isExplicit = PlayerSettings.showExplicitBadge && metadata['explicit'] == true;final isDownloaded = _dl.isDownloaded(itemId);final isFinished = lib.getProgressData(itemId)?['isFinished'] == true;final isSubscribed = lib.isPodcastLibrary && lib.isPodcastSubscribed(itemId);diff --git a/lib/widgets/library_search_results.dart b/lib/widgets/library_search_results.dartindex 00098595..1011f8c7 100644--- a/lib/widgets/library_search_results.dart+++ b/lib/widgets/library_search_results.dart@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';import 'package:cached_network_image/cached_network_image.dart';import 'package:provider/provider.dart';import '../providers/library_provider.dart';+import '../services/audio_player_service.dart';import '../services/download_service.dart';import 'author_books_sheet.dart';import 'book_detail_sheet.dart';@@ -37,7 +38,7 @@ class BookResultTile extends StatelessWidget {final title = metadata['title'] as String? ?? 'Unknown';final authorName = metadata['authorName'] as String? ?? '';final lib = context.watch<LibraryProvider>();- final isExplicit = metadata['explicit'] == true;+ final isExplicit = PlayerSettings.showExplicitBadge && metadata['explicit'] == true;final isDownloaded = itemId != null && DownloadService().isDownloaded(itemId);final isFinished = itemId != null && lib.getProgressData(itemId)?['isFinished'] == true;final greenColor = Theme.of(context).brightness == Brightness.dark ? Colors.greenAccent[400]! : Colors.green.shade700;diff --git a/lib/widgets/playlist_detail_sheet.dart b/lib/widgets/playlist_detail_sheet.dartindex caca9682..bf7fca33 100644--- a/lib/widgets/playlist_detail_sheet.dart+++ b/lib/widgets/playlist_detail_sheet.dart@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';import 'package:cached_network_image/cached_network_image.dart';import '../providers/auth_provider.dart';import '../providers/library_provider.dart';+import '../services/audio_player_service.dart';import '../services/download_service.dart';import 'book_detail_sheet.dart';import 'episode_list_sheet.dart';@@ -419,7 +420,7 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {errorBuilder: (_, __, ___) => _placeholder(cs))): _placeholder(cs),),- if (metadata['explicit'] == true)+ if (PlayerSettings.showExplicitBadge && metadata['explicit'] == true)Positioned(top: 2, right: 2,child: Container(diff --git a/lib/widgets/series_books_sheet.dart b/lib/widgets/series_books_sheet.dartindex 25de3a7f..b6cf0b2c 100644--- a/lib/widgets/series_books_sheet.dart+++ b/lib/widgets/series_books_sheet.dart@@ -655,7 +655,7 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {? (media['duration'] as num).toDouble(): 0.0;- final isExplicit = metadata['explicit'] == true;+ final isExplicit = PlayerSettings.showExplicitBadge && metadata['explicit'] == true;final progress = lib.getProgress(bookId);final isFinished = lib.getProgressData(bookId)?['isFinished'] == true;final isDownloaded = DownloadService().isDownloaded(bookId);