Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

fix absoring screen not updating all elements when switch appearance modes.

Nathan Poulsonda78042e9936
diff --git a/android/.kotlin/sessions/kotlin-compiler-6906615826790267457.salive b/android/.kotlin/sessions/kotlin-compiler-6906615826790267457.salive
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 2901bb53..284b8eda 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -33,6 +33,8 @@ class AbsorbingCard extends StatefulWidget {
class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClientMixin {
ColorScheme? _coverScheme;
+ Brightness? _coverBrightness; // brightness used to generate _coverScheme
+ ImageProvider? _coverProvider; // cached for re-deriving on theme change
bool _isStarting = false;
List<dynamic>? _fetchedChapters;
StreamSubscription<Duration>? _chapterTrackSub;
@@ -146,6 +148,13 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
});
}
+ @override
+ void didChangeDependencies() {
+ super.didChangeDependencies();
+ // Re-derive cover color scheme when theme brightness changes
+ _rederiveCoverScheme();
+ }
+
@override
void didUpdateWidget(AbsorbingCard old) {
super.didUpdateWidget(old);
@@ -153,6 +162,8 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
if (oldId != _itemId) {
// Item changed — reset all stale state
_coverScheme = null;
+ _coverBrightness = null;
+ _coverProvider = null;
_blurredCover?.dispose();
_blurredCover = null;
_fetchedChapters = null;
@@ -170,8 +181,21 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
}
void _onCoverLoaded(ImageProvider provider) {
- if (_coverScheme != null) return;
- ColorScheme.fromImageProvider(provider: provider, brightness: Theme.of(context).brightness)
+ _coverProvider = provider;
+ _rederiveCoverScheme();
+ // Precache the blurred version of the cover
+ if (_blurredCover == null) {
+ _precacheBlur(provider);
+ }
+ }
+
+ void _rederiveCoverScheme() {
+ final provider = _coverProvider;
+ if (provider == null) return;
+ final brightness = Theme.of(context).brightness;
+ if (_coverScheme != null && _coverBrightness == brightness) return;
+ _coverBrightness = brightness;
+ ColorScheme.fromImageProvider(provider: provider, brightness: brightness)
.then((s) {
if (mounted) {
WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -180,10 +204,6 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
}
})
.catchError((_) {});
- // Precache the blurred version of the cover
- if (_blurredCover == null) {
- _precacheBlur(provider);
- }
}
/// Resolve the image, render it blurred to an offscreen canvas, cache the result.
diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dart
index c053cea5..90fce799 100644
--- a/lib/widgets/expanded_card.dart
+++ b/lib/widgets/expanded_card.dart
@@ -72,6 +72,8 @@ class ExpandedCard extends StatefulWidget {
class _ExpandedCardState extends State<ExpandedCard> {
ColorScheme? _coverScheme;
+ Brightness? _coverBrightness;
+ ImageProvider? _coverProvider;
ui.Image? _blurredCover;
List<dynamic>? _fetchedChapters;
bool _isStarting = false;
@@ -151,6 +153,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
void didChangeDependencies() {
super.didChangeDependencies();
_ownRoute ??= ModalRoute.of(context);
+ _rederiveCoverScheme();
}
@override
@@ -243,6 +246,8 @@ class _ExpandedCardState extends State<ExpandedCard> {
setState(() {
_item = newItem!;
_coverScheme = null;
+ _coverBrightness = null;
+ _coverProvider = null;
_fetchedChapters = null;
_lastChapterIdx = -1;
});
@@ -305,8 +310,17 @@ class _ExpandedCardState extends State<ExpandedCard> {
}
void _onCoverLoaded(ImageProvider provider) {
- if (_coverScheme != null) return;
- ColorScheme.fromImageProvider(provider: provider, brightness: Theme.of(context).brightness)
+ _coverProvider = provider;
+ _rederiveCoverScheme();
+ }
+
+ void _rederiveCoverScheme() {
+ final provider = _coverProvider;
+ if (provider == null) return;
+ final brightness = Theme.of(context).brightness;
+ if (_coverScheme != null && _coverBrightness == brightness) return;
+ _coverBrightness = brightness;
+ ColorScheme.fromImageProvider(provider: provider, brightness: brightness)
.then((s) {
if (mounted) {
WidgetsBinding.instance.addPostFrameCallback((_) {