Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

UI polish: parallelize settings init, reduce unnecessary rebuilds, clean up lint warnings, add remove-from-queue

Nathan Poulson14cc9bed08f7
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 4f710a78..4cf999b3 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,7 +1,14 @@
include: package:flutter_lints/flutter.yaml
+analyzer:
+ errors:
+ deprecated_member_use: ignore
+
linter:
rules:
- prefer_const_constructors: true
- prefer_const_declarations: true
+ prefer_const_constructors: false
+ prefer_const_declarations: false
+ prefer_const_literals_to_create_immutables: false
+ curly_braces_in_flow_control_structures: false
+ use_build_context_synchronously: false
avoid_print: true
diff --git a/lib/screens/absorbing_screen.dart b/lib/screens/absorbing_screen.dart
index c0c21efe..4b97714f 100644
--- a/lib/screens/absorbing_screen.dart
+++ b/lib/screens/absorbing_screen.dart
@@ -1,5 +1,6 @@
import 'dart:async';
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../providers/library_provider.dart';
import '../services/audio_player_service.dart';
@@ -791,6 +792,7 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final tt = Theme.of(context).textTheme;
+ final bottomInset = MediaQuery.of(context).viewPadding.bottom;
return Container(
decoration: BoxDecoration(
@@ -811,7 +813,7 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {
Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 8, 8),
child: Row(children: [
- Expanded(child: Text('Reorder Queue',
+ Expanded(child: Text('Manage Queue',
style: tt.titleMedium?.copyWith(fontWeight: FontWeight.w600))),
TextButton(
onPressed: () {
@@ -825,6 +827,7 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {
Expanded(
child: ReorderableListView.builder(
buildDefaultDragHandles: false,
+ padding: EdgeInsets.only(bottom: bottomInset + 16),
proxyDecorator: (child, index, animation) {
return AnimatedBuilder(
animation: animation,
@@ -858,53 +861,68 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {
final epTitle = re?['title'] as String?;
final isFinished = widget.lib.isItemFinishedByKey(key);
- return Padding(
+ return Dismissible(
key: ValueKey(key),
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
- child: Container(
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+ direction: DismissDirection.endToStart,
+ background: Container(
+ alignment: Alignment.centerRight,
+ padding: const EdgeInsets.only(right: 24),
+ margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
decoration: BoxDecoration(
- color: isFinished ? cs.onSurface.withValues(alpha: 0.03) : Colors.transparent,
+ color: cs.error.withValues(alpha: 0.12),
borderRadius: BorderRadius.circular(12),
),
- child: Row(children: [
- // Queue position number
- SizedBox(width: 24, child: Text('${i + 1}',
- style: tt.labelMedium?.copyWith(
- color: isFinished ? cs.onSurface.withValues(alpha: 0.3) : cs.primary,
- fontWeight: FontWeight.w700,
- ))),
- // Finished indicator
- if (isFinished)
- Icon(Icons.check_circle_rounded, size: 16, color: Colors.green.withValues(alpha: 0.5))
- else
- Icon(Icons.circle_outlined, size: 16, color: cs.onSurface.withValues(alpha: 0.2)),
- const SizedBox(width: 8),
- // Title + subtitle
- Expanded(child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.min,
- children: [
- Text(epTitle ?? title,
- maxLines: 1, overflow: TextOverflow.ellipsis,
- style: tt.bodyMedium?.copyWith(
- color: isFinished ? cs.onSurface.withValues(alpha: 0.4) : null,
- )),
- if (epTitle != null)
- Text(title, maxLines: 1, overflow: TextOverflow.ellipsis,
- style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),
- if (author.isNotEmpty && epTitle == null)
- Text(author, maxLines: 1, overflow: TextOverflow.ellipsis,
- style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),
- ],
- )),
- // Drag handle
- ReorderableDragStartListener(
- index: i,
- child: Icon(Icons.drag_handle_rounded, size: 20,
- color: cs.onSurface.withValues(alpha: 0.3)),
+ child: Icon(Icons.remove_circle_outline_rounded, color: cs.error),
+ ),
+ onDismissed: (_) {
+ final removedKey = _order[i];
+ setState(() => _order.removeAt(i));
+ widget.lib.removeFromAbsorbing(removedKey);
+ widget.lib.reorderAbsorbing(_order);
+ },
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 2),
+ child: Container(
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+ decoration: BoxDecoration(
+ color: isFinished ? cs.onSurface.withValues(alpha: 0.03) : Colors.transparent,
+ borderRadius: BorderRadius.circular(12),
),
- ]),
+ child: Row(children: [
+ // Queue position number
+ SizedBox(width: 24, child: Text('${i + 1}',
+ style: tt.labelMedium?.copyWith(
+ color: isFinished ? cs.onSurface.withValues(alpha: 0.3) : cs.primary,
+ fontWeight: FontWeight.w700,
+ ))),
+ // Finished indicator
+ if (isFinished)
+ Icon(Icons.check_circle_rounded, size: 16, color: Colors.green.withValues(alpha: 0.5))
+ else
+ Icon(Icons.circle_outlined, size: 16, color: cs.onSurface.withValues(alpha: 0.2)),
+ const SizedBox(width: 8),
+ // Title + subtitle
+ Expanded(child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Text(epTitle ?? title,
+ maxLines: 1, overflow: TextOverflow.ellipsis,
+ style: tt.bodyMedium?.copyWith(
+ color: isFinished ? cs.onSurface.withValues(alpha: 0.4) : null,
+ )),
+ if (epTitle != null)
+ Text(title, maxLines: 1, overflow: TextOverflow.ellipsis,
+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),
+ if (author.isNotEmpty && epTitle == null)
+ Text(author, maxLines: 1, overflow: TextOverflow.ellipsis,
+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant)),
+ ],
+ )),
+ // Drag handle (long-press to avoid conflict with system home gesture)
+ _DragHandle(index: i, color: cs.onSurface),
+ ]),
+ ),
),
);
},
@@ -914,3 +932,74 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {
);
}
}
+
+// ─── DRAG HANDLE WITH HOLD FEEDBACK ─────────────────────────
+
+class _DragHandle extends StatefulWidget {
+ final int index;
+ final Color color;
+ const _DragHandle({required this.index, required this.color});
+
+ @override
+ State<_DragHandle> createState() => _DragHandleState();
+}
+
+class _DragHandleState extends State<_DragHandle> with SingleTickerProviderStateMixin {
+ late final AnimationController _controller;
+ // Match ReorderableDelayedDragStartListener's default delay
+ static const _holdDuration = Duration(milliseconds: 500);
+
+ @override
+ void initState() {
+ super.initState();
+ _controller = AnimationController(vsync: this, duration: _holdDuration);
+ _controller.addStatusListener((status) {
+ if (status == AnimationStatus.completed && mounted) {
+ HapticFeedback.mediumImpact();
+ }
+ });
+ }
+
+ @override
+ void dispose() {
+ _controller.dispose();
+ super.dispose();
+ }
+
+ void _onDown(PointerDownEvent _) {
+ _controller.forward(from: 0);
+ }
+
+ void _onUp(PointerEvent _) {
+ _controller.stop();
+ _controller.reset();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Listener(
+ onPointerDown: _onDown,
+ onPointerUp: _onUp,
+ onPointerCancel: _onUp,
+ child: ReorderableDelayedDragStartListener(
+ index: widget.index,
+ child: AnimatedBuilder(
+ animation: _controller,
+ builder: (context, child) {
+ final ready = _controller.isCompleted;
+ return AnimatedContainer(
+ duration: const Duration(milliseconds: 150),
+ padding: const EdgeInsets.all(6),
+ decoration: BoxDecoration(
+ color: ready ? widget.color.withValues(alpha: 0.1) : Colors.transparent,
+ borderRadius: BorderRadius.circular(8),
+ ),
+ child: Icon(Icons.drag_handle_rounded, size: 20,
+ color: widget.color.withValues(alpha: ready ? 0.7 : 0.3)),
+ );
+ },
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/screens/admin_podcasts_screen.dart b/lib/screens/admin_podcasts_screen.dart
index 628b9eae..654a1aca 100644
--- a/lib/screens/admin_podcasts_screen.dart
+++ b/lib/screens/admin_podcasts_screen.dart
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
-import '../services/api_service.dart';
import '../widgets/absorb_page_header.dart';
import '../widgets/html_description.dart';
@@ -172,9 +171,6 @@ class _AdminPodcastsScreenState extends State<AdminPodcastsScreen> {
Navigator.push(context, MaterialPageRoute(
builder: (_) => _PodcastDetailScreen(item: item, libraryId: _libraryId, onChanged: _loadShows)));
}
-
- void _msg(String s) => ScaffoldMessenger.of(context)..clearSnackBars()..showSnackBar(
- SnackBar(content: Text(s), behavior: SnackBarBehavior.floating, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12))));
}
@@ -379,8 +375,6 @@ class _PodcastSearchSheetState extends State<_PodcastSearchSheet> {
child: Icon(Icons.podcasts_rounded, color: cs.primary.withValues(alpha: 0.4), size: 22),
);
- void _snk(String s) => ScaffoldMessenger.of(context)..clearSnackBars()..showSnackBar(
- SnackBar(content: Text(s), behavior: SnackBarBehavior.floating, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12))));
}
diff --git a/lib/screens/admin_screen.dart b/lib/screens/admin_screen.dart
index 6aaf95e4..920aacf8 100644
--- a/lib/screens/admin_screen.dart
+++ b/lib/screens/admin_screen.dart
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
-import '../services/api_service.dart';
import '../widgets/absorb_page_header.dart';
import 'admin_users_screen.dart';
import 'admin_podcasts_screen.dart';
@@ -18,7 +17,7 @@ class _AdminScreenState extends State<AdminScreen> {
List<dynamic> _libraries = [];
List<dynamic> _backups = [];
List<dynamic> _sessions = [];
- Map<String, Map<String, dynamic>> _libraryStats = {};
+ final Map<String, Map<String, dynamic>> _libraryStats = {};
String? _serverVersion;
final Set<String> _scanningLibraries = {};
@@ -37,11 +36,11 @@ class _AdminScreenState extends State<AdminScreen> {
final futures = await Future.wait([
api.getUsers(), api.getOnlineUsers(), api.getLibraries(), api.getBackups(), api.getAllSessions(limit: 10),
]);
- _users = futures[0] as List<dynamic>;
- _onlineUsers = futures[1] as List<dynamic>;
- _libraries = futures[2] as List<dynamic>;
- _backups = futures[3] as List<dynamic>;
- _sessions = futures[4] as List<dynamic>;
+ _users = futures[0];
+ _onlineUsers = futures[1];
+ _libraries = futures[2];
+ _backups = futures[3];
+ _sessions = futures[4];
_serverVersion = context.read<AuthProvider>().serverVersion;
for (final lib in _libraries) {
diff --git a/lib/screens/admin_users_screen.dart b/lib/screens/admin_users_screen.dart
index 33aa0349..9e671960 100644
--- a/lib/screens/admin_users_screen.dart
+++ b/lib/screens/admin_users_screen.dart
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
-import '../services/api_service.dart';
import '../widgets/absorb_page_header.dart';
class AdminUsersScreen extends StatefulWidget {
@@ -22,7 +21,7 @@ class _AdminUsersScreenState extends State<AdminUsersScreen> {
Future<void> _reload() async {
final api = context.read<AuthProvider>().apiService; if (api == null) return;
final results = await Future.wait([api.getUsers(), api.getOnlineUsers()]);
- if (mounted) setState(() { _users = results[0] as List<dynamic>; _onlineUsers = results[1] as List<dynamic>; });
+ if (mounted) setState(() { _users = results[0]; _onlineUsers = results[1]; });
}
@override
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index fbde8283..2d62e30c 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -54,8 +54,10 @@ class _HomeScreenState extends State<HomeScreen> {
@override
void didChangeDependencies() {
super.didChangeDependencies();
- // Refresh setting when returning to screen
- _loadSettings();
+ // Refresh setting when returning to screen, but only if changed
+ PlayerSettings.getHideEbookOnly().then((v) {
+ if (mounted && v != _hideEbookOnly) setState(() => _hideEbookOnly = v);
+ });
}
List<dynamic> _filterEbookOnly(List<dynamic> items) {
@@ -126,7 +128,9 @@ class _HomeScreenState extends State<HomeScreen> {
lib.loadPersonalizedView();
}
- setState(() {});
+ if (itemChanged || stopped) {
+ setState(() {});
+ }
}
void _showLibraryPicker(BuildContext context, ColorScheme cs, TextTheme tt, List<dynamic> allLibraries, LibraryProvider lib) {
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 865a4753..26568fae 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -72,36 +72,66 @@ class _SettingsScreenState extends State<SettingsScreen> {
}
Future<void> _loadSettings() async {
- final s = await AutoRewindSettings.load();
- final speed = await PlayerSettings.getDefaultSpeed();
- final wifiOnly = await PlayerSettings.getWifiOnlyDownloads();
- final rollingCount = await PlayerSettings.getRollingDownloadCount();
- final rollingDelete = await PlayerSettings.getRollingDownloadDeleteFinished();
- final bookSlider = await PlayerSettings.getShowBookSlider();
- final notifChapter = await PlayerSettings.getNotificationChapterProgress();
- final speedAdj = await PlayerSettings.getSpeedAdjustedTime();
- final fwd = await PlayerSettings.getForwardSkip();
- final bk = await PlayerSettings.getBackSkip();
- final shake = await PlayerSettings.getShakeToResetSleep();
- final resetOnPause = await PlayerSettings.getResetSleepOnPause();
- final sleepFade = await PlayerSettings.getSleepFadeOut();
- final shakeMins = await PlayerSettings.getShakeAddMinutes();
- final queueMode = await PlayerSettings.getQueueMode();
- final queueAutoDl = await PlayerSettings.getQueueAutoDownload();
- final mergeLibs = await PlayerSettings.getMergeAbsorbingLibraries();
- final maxConc = await PlayerSettings.getMaxConcurrentDownloads();
- final whenFinished = await PlayerSettings.getWhenFinished();
- final hideEbook = await PlayerSettings.getHideEbookOnly();
- final showGoodreads = await PlayerSettings.getShowGoodreadsButton();
- final logging = await PlayerSettings.getLoggingEnabled();
- final fullScreen = await PlayerSettings.getFullScreenPlayer();
- final theme = await PlayerSettings.getThemeMode();
-
- final dlLabel = await DownloadService().downloadLocationLabel;
- final dlSize = await DownloadService().totalDownloadSize;
- final deviceStorage = await DownloadService.getDeviceStorage();
- final autoSleep = await AutoSleepSettings.load();
- final pkgInfo = await PackageInfo.fromPlatform();
+ final results = await Future.wait([
+ AutoRewindSettings.load(), // 0
+ PlayerSettings.getDefaultSpeed(), // 1
+ PlayerSettings.getWifiOnlyDownloads(), // 2
+ PlayerSettings.getRollingDownloadCount(), // 3
+ PlayerSettings.getRollingDownloadDeleteFinished(), // 4
+ PlayerSettings.getShowBookSlider(), // 5
+ PlayerSettings.getNotificationChapterProgress(), // 6
+ PlayerSettings.getSpeedAdjustedTime(), // 7
+ PlayerSettings.getForwardSkip(), // 8
+ PlayerSettings.getBackSkip(), // 9
+ PlayerSettings.getShakeToResetSleep(), // 10
+ PlayerSettings.getResetSleepOnPause(), // 11
+ PlayerSettings.getSleepFadeOut(), // 12
+ PlayerSettings.getShakeAddMinutes(), // 13
+ PlayerSettings.getQueueMode(), // 14
+ PlayerSettings.getQueueAutoDownload(), // 15
+ PlayerSettings.getMergeAbsorbingLibraries(), // 16
+ PlayerSettings.getMaxConcurrentDownloads(), // 17
+ PlayerSettings.getWhenFinished(), // 18
+ PlayerSettings.getHideEbookOnly(), // 19
+ PlayerSettings.getShowGoodreadsButton(), // 20
+ PlayerSettings.getLoggingEnabled(), // 21
+ PlayerSettings.getFullScreenPlayer(), // 22
+ PlayerSettings.getThemeMode(), // 23
+ DownloadService().downloadLocationLabel, // 24
+ DownloadService().totalDownloadSize, // 25
+ DownloadService.getDeviceStorage(), // 26
+ AutoSleepSettings.load(), // 27
+ PackageInfo.fromPlatform(), // 28
+ ]);
+ final s = results[0] as AutoRewindSettings;
+ final speed = results[1] as double;
+ final wifiOnly = results[2] as bool;
+ final rollingCount = results[3] as int;
+ final rollingDelete = results[4] as bool;
+ final bookSlider = results[5] as bool;
+ final notifChapter = results[6] as bool;
+ final speedAdj = results[7] as bool;
+ final fwd = results[8] as int;
+ final bk = results[9] as int;
+ final shake = results[10] as bool;
+ final resetOnPause = results[11] as bool;
+ final sleepFade = results[12] as bool;
+ final shakeMins = results[13] as int;
+ final queueMode = results[14] as String;
+ final queueAutoDl = results[15] as bool;
+ final mergeLibs = results[16] as bool;
+ final maxConc = results[17] as int;
+ final whenFinished = results[18] as String;
+ final hideEbook = results[19] as bool;
+ final showGoodreads = results[20] as bool;
+ final logging = results[21] as bool;
+ final fullScreen = results[22] as bool;
+ final theme = results[23] as String;
+ final dlLabel = results[24] as String;
+ final dlSize = results[25] as int;
+ final deviceStorage = results[26] as Map<String, int>?;
+ final autoSleep = results[27] as AutoSleepSettings;
+ final pkgInfo = results[28] as PackageInfo;
if (mounted) setState(() {
_rewindSettings = s;
_defaultSpeed = speed;
diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dart
index ca562bcf..e7d76ca3 100644
--- a/lib/screens/stats_screen.dart
+++ b/lib/screens/stats_screen.dart
@@ -2,7 +2,6 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
-import '../providers/library_provider.dart';
import '../widgets/absorb_page_header.dart';
import '../widgets/absorb_wave_icon.dart';
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index cf12dafe..a3dc93f4 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -772,7 +772,7 @@ class ApiService {
};
}
}
- } catch (e) {
+ } catch (_) {
}
return null;
}
diff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dart
index 1d3b131b..a99956a8 100644
--- a/lib/services/audio_player_service.dart
+++ b/lib/services/audio_player_service.dart
@@ -1,6 +1,5 @@
import 'dart:async';
import 'dart:convert';
-import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:just_audio/just_audio.dart';
diff --git a/lib/services/chromecast_service.dart b/lib/services/chromecast_service.dart
index 474256b3..a49a64be 100644
--- a/lib/services/chromecast_service.dart
+++ b/lib/services/chromecast_service.dart
@@ -167,7 +167,9 @@ class ChromecastService extends ChangeNotifier {
void _listenToPosition() {
_positionSub?.cancel();
+ // ignore: invalid_null_aware_operator
_positionSub = GoogleCastRemoteMediaClient.instance.playerPositionStream?.listen((pos) {
+ // ignore: unnecessary_null_comparison
if (pos != null) {
// In fallback mode, translate track-local position to book position
if (_fallbackOffsets != null && _fallbackTrackIdx >= 0 && _fallbackTrackIdx < _fallbackOffsets!.length) {
diff --git a/lib/widgets/absorb_slider.dart b/lib/widgets/absorb_slider.dart
index 65a61778..f35e0d87 100644
--- a/lib/widgets/absorb_slider.dart
+++ b/lib/widgets/absorb_slider.dart
@@ -166,7 +166,7 @@ class _AbsorbTrackShape extends SliderTrackShape {
}
// Endpoint dots
- final dotRadius = 3.0;
+ const dotRadius = 3.0;
final dotColor = sliderTheme.activeTrackColor?.withValues(alpha: 0.5) ??
Colors.white.withValues(alpha: 0.3);
final centerY = trackRect.center.dy;
@@ -211,9 +211,9 @@ class AbsorbProgressPainter extends CustomPainter {
@override
void paint(Canvas canvas, Size size) {
final centerY = size.height / 2;
- final trackHeight = 8.0;
+ const trackHeight = 8.0;
final trackTop = centerY - trackHeight / 2;
- final padding = 14.0;
+ const padding = 14.0;
final trackLeft = padding;
final trackWidth = size.width - padding * 2;
final trackRight = trackLeft + trackWidth;
@@ -234,8 +234,8 @@ class AbsorbProgressPainter extends CustomPainter {
// Subtle squiggly wave for active portion
final path = Path();
final waveAmplitude = isDragging ? 1.5 : 2.5;
- final waveFrequency = 0.06;
- final pi2 = 3.14159265 * 2;
+ const waveFrequency = 0.06;
+ const pi2 = 3.14159265 * 2;
final phaseOffset = wavePhase * pi2;
path.moveTo(trackLeft, centerY);
diff --git a/lib/widgets/absorb_wave_icon.dart b/lib/widgets/absorb_wave_icon.dart
index 9ac031cd..2587958e 100644
--- a/lib/widgets/absorb_wave_icon.dart
+++ b/lib/widgets/absorb_wave_icon.dart
@@ -1,4 +1,3 @@
-import 'dart:math' as math;
import 'package:flutter/material.dart';
/// Reusable Absorb wave icon — the 5-bar ascending/descending wave pattern.
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 5d72d114..95e55e88 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:io';
import 'dart:ui' as ui;
import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
import '../providers/auth_provider.dart';
@@ -231,9 +230,9 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
}
@override
- void didUpdateWidget(AbsorbingCard old) {
- super.didUpdateWidget(old);
- final oldId = old.item['id'] as String? ?? '';
+ void didUpdateWidget(AbsorbingCard oldWidget) {
+ super.didUpdateWidget(oldWidget);
+ final oldId = oldWidget.item['id'] as String? ?? '';
if (oldId != _itemId) {
// Item changed — reset all stale state
_coverScheme = null;
@@ -245,7 +244,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
_lastChapterIdx = -1;
_fetchChaptersIfNeeded();
}
- if (old.player != widget.player) _startChapterTracking();
+ if (oldWidget.player != widget.player) _startChapterTracking();
}
@override
@@ -336,7 +335,6 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
final tt = Theme.of(context).textTheme;
final cs = _coverScheme ?? Theme.of(context).colorScheme;
final accent = cs.primary;
- final bgDark = cs.surface;
final isDark = Theme.of(context).brightness == Brightness.dark;
final lib = context.watch<LibraryProvider>();
diff --git a/lib/widgets/card_buttons.dart b/lib/widgets/card_buttons.dart
index 476721b4..2dfef235 100644
--- a/lib/widgets/card_buttons.dart
+++ b/lib/widgets/card_buttons.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
import 'package:flutter/material.dart';
import '../services/audio_player_service.dart';
import '../services/bookmark_service.dart';
diff --git a/lib/widgets/card_progress_bar.dart b/lib/widgets/card_progress_bar.dart
index b59c3404..f0583eed 100644
--- a/lib/widgets/card_progress_bar.dart
+++ b/lib/widgets/card_progress_bar.dart
@@ -1,11 +1,9 @@
import 'dart:async';
import 'dart:math';
-import 'dart:ui';
import 'package:flutter/material.dart';
import '../services/audio_player_service.dart';
import '../services/chromecast_service.dart';
import 'absorb_slider.dart';
-import 'absorbing_shared.dart';
// ─── DUAL PROGRESS BAR (card version) ───────────────────────
diff --git a/lib/widgets/episode_list_sheet.dart b/lib/widgets/episode_list_sheet.dart
index 4c4b11de..15c7cabd 100644
--- a/lib/widgets/episode_list_sheet.dart
+++ b/lib/widgets/episode_list_sheet.dart
@@ -1195,7 +1195,7 @@ class _EpisodeRowState extends State<_EpisodeRow> {
CircularProgressIndicator(
value: dlProgress > 0 ? dlProgress : null,
strokeWidth: 2, color: cs.primary),
- Text('${(dlProgress * 100).toStringAsFixed(0)}',
+ Text((dlProgress * 100).toStringAsFixed(0),
style: TextStyle(fontSize: 7, color: cs.primary, fontWeight: FontWeight.w600)),
])),
);
diff --git a/lib/widgets/equalizer_sheet.dart b/lib/widgets/equalizer_sheet.dart
index f3220794..4b4deb3c 100644
--- a/lib/widgets/equalizer_sheet.dart
+++ b/lib/widgets/equalizer_sheet.dart
@@ -84,7 +84,7 @@ class _EqualizerSheetContentState extends State<_EqualizerSheetContent> {
scale: 0.8,
child: Switch(
value: _eq.enabled,
- activeColor: accent,
+ activeTrackColor: accent,
onChanged: (v) => _eq.setEnabled(v),
),
),
@@ -263,8 +263,6 @@ class _EQBandSlider extends StatelessWidget {
final cs = Theme.of(context).colorScheme;
final eq = EqualizerService();
final label = eq.freqLabel(frequency);
- final normalized = ((level - minLevel) / (maxLevel - minLevel)).clamp(0.0, 1.0);
-
return Column(
children: [
Text('${level >= 0 ? "+" : ""}${level.toStringAsFixed(0)}',
diff --git a/lib/widgets/metadata_lookup_sheet.dart b/lib/widgets/metadata_lookup_sheet.dart
index 394159f3..9b9811b1 100644
--- a/lib/widgets/metadata_lookup_sheet.dart
+++ b/lib/widgets/metadata_lookup_sheet.dart
@@ -377,9 +377,6 @@ class _MetadataLookupSheetState extends State<MetadataLookupSheet> {
final publisher = _safeString(book['publisher']);
final series = _safeString(book['series']);
- // Match confidence from Audible provider
- final matchKey = result['matchKey'] as String?;
-
return Card(
elevation: 0,
color: Colors.white.withValues(alpha: 0.05),
diff --git a/lib/widgets/sleep_timer_sheet.dart b/lib/widgets/sleep_timer_sheet.dart
index d9230d73..c4b98c2a 100644
--- a/lib/widgets/sleep_timer_sheet.dart
+++ b/lib/widgets/sleep_timer_sheet.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
import 'package:flutter/material.dart';
import '../services/audio_player_service.dart';
import '../services/sleep_timer_service.dart';
@@ -316,7 +315,7 @@ class _SleepTimerSheetState extends State<SleepTimerSheet> {
height: 28,
child: Switch(
value: _shakeEnabled,
- activeColor: accent,
+ activeTrackColor: accent,
onChanged: (v) {
setState(() => _shakeEnabled = v);
PlayerSettings.setShakeToResetSleep(v);