Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix finish overlay showing prematurely in full screen player

Nathan Poulson97a51a8b0ea0
diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dart
index aae2de93..eb595aef 100644
--- a/lib/widgets/expanded_card.dart
+++ b/lib/widgets/expanded_card.dart
@@ -87,6 +87,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
bool _wasPlaying = false;
bool _isPopping = false; // Prevent double-pop and setState during exit
List<String> _buttonOrder = PlayerSettings.defaultButtonOrder;
+ bool _autoRemoveFinished = false;
// Our own route, captured for popUntil when modals are stacked above us
Route<dynamic>? _ownRoute;
@@ -164,6 +165,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
ChromecastService().addListener(_onCastChanged);
PlayerSettings.settingsChanged.addListener(_reloadButtonOrder);
_reloadButtonOrder();
+ _loadWhenFinished();
_startChapterTracking();
_fetchChaptersIfNeeded();
// Generate our own blurred cover
@@ -182,6 +184,12 @@ class _ExpandedCardState extends State<ExpandedCard> {
});
}
+ void _loadWhenFinished() {
+ PlayerSettings.getWhenFinished().then((mode) {
+ if (mounted) setState(() => _autoRemoveFinished = mode == 'auto_remove');
+ });
+ }
+
@override
void didChangeDependencies() {
super.didChangeDependencies();
@@ -663,7 +671,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
),
],
// Finished overlay
- if (isFinished && !isCastingThis) ...[
+ if (isFinished && !isCastingThis && !_autoRemoveFinished) ...[
Positioned.fill(
child: Container(color: Colors.black.withValues(alpha: 0.78)),
),