A cross platform Audiobookshelf client for Android and iOS
Dart
Merge branch 'main' into browser-workspace
Barnabas1f86d0e0b59e
diff --cc lib/l10n/app_localizations_fr.dartindex 91f66158,7aa8ba4b..e6aee2ca--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@@ -1556,22 -1564,11 +1568,23 @@@ class AppLocalizationsFr extends AppLoc@overrideString get chapterProgressOnSubtitleIos =>- 'On - lock screen & CarPlay show chapter progress';+ 'Activé - l\'écran de verrouillage & CarPlay montrent la progression du chapitre';+ @override+ String get chapterProgressInNowPlayingBar =>+ 'Chapter progress in now playing bar';++ @override+ String get chapterProgressInNowPlayingBarOnSubtitle =>+ 'On - the bottom player shows current chapter progress';++ @override+ String get chapterProgressInNowPlayingBarOffSubtitle =>+ 'Off - the bottom player shows full book progress';+@override- String get speedBookmarkInControls => 'Speed & bookmark in media controls';+ String get speedBookmarkInControls =>+ 'Vitesse et signet dans les contrôles des médias';@overrideString get speedBookmarkOnSubtitle =>diff --cc lib/screens/settings_screen.dartindex ca2f5ae6,99e23270..9e09cd1e--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@@ -1290,12 -1117,17 +1291,12 @@@ class SettingsScreenState extends Statefinal cs = Theme.of(context).colorScheme;final tt = Theme.of(context).textTheme;final l = AppLocalizations.of(context)!;- const codes = ['', 'en', 'de', 'zh'];+ const codes = ['', 'en', 'de', 'fr', 'zh'];- final picked = await showModalBottomSheet<String>(+ final picked = await _showAdaptiveSettingsSurface<String>(context: context,- isScrollControlled: true,- useSafeArea: true,- backgroundColor: cs.surfaceContainerLow,- shape: const RoundedRectangleBorder(- borderRadius: BorderRadius.vertical(top: Radius.circular(24)),- ),- builder: (ctx) => SafeArea(+ maxWidth: 520,+ builder: (ctx, desktopMode) => SafeArea(child: Column(mainAxisSize: MainAxisSize.min,children: [diff --cc lib/services/audio_player_service.dartindex 5c9b9689,1d058c90..eebf5f43--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@@ -5908,9 -5903,10 +5927,10 @@@ class AudioPlayerService extends Change// include pause duration as timeListened_lastServerSync = DateTime.now();_lastAccrual = DateTime.now();+ _lastAccrualPos = null;// Re-activate audio session in case a prior stop released it.try {- (await AudioSession.instance).setActive(true);+ await _setAudioSessionActive(true);} catch (_) {}// If the player is idle (source was disposed), we need to fully re-initialize// playback instead of just calling play() on an empty player.