Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix the grey Settings page, black covers and rail search on the web and stop checking server tasks every few seconds

Barnabasb249724dfc2b
diff --git a/lib/screens/admin_missing_items_screen.dart b/lib/screens/admin_missing_items_screen.dart
index 2b5365c1..122f827c 100644
--- a/lib/screens/admin_missing_items_screen.dart
+++ b/lib/screens/admin_missing_items_screen.dart
@@ -2,6 +2,8 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../providers/auth_provider.dart';
import '../services/socket_service.dart';
@@ -301,7 +303,7 @@ class _AdminMissingItemsScreenState extends State<AdminMissingItemsScreen> {
height: 40,
child: api == null
? _coverPlaceholder(cs)
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: api.getCoverUrl(id, width: 120),
httpHeaders: api.mediaHeaders,
fit: BoxFit.cover,
diff --git a/lib/screens/admin_screen.dart b/lib/screens/admin_screen.dart
index 0cb3e615..767169af 100644
--- a/lib/screens/admin_screen.dart
+++ b/lib/screens/admin_screen.dart
@@ -152,8 +152,16 @@ class _AdminScreenState extends State<AdminScreen> with WidgetsBindingObserver {
void _startTaskRefreshTimer() {
_taskRefreshTimer?.cancel();
+ DateTime? last;
_taskRefreshTimer = Timer.periodic(const Duration(seconds: 3), (_) {
- unawaited(_refreshServerTasks());
+ // Socket events carry task changes; poll fast only while one runs or
+ // the socket is down, otherwise catch up once a minute.
+ final due = last == null ||
+ DateTime.now().difference(last!) >= const Duration(minutes: 1);
+ if (_taskTracker.runningCount > 0 || !SocketService().isConnected || due) {
+ last = DateTime.now();
+ unawaited(_refreshServerTasks());
+ }
});
}
diff --git a/lib/screens/admin_users_screen.dart b/lib/screens/admin_users_screen.dart
index b11dba9f..13ab8731 100644
--- a/lib/screens/admin_users_screen.dart
+++ b/lib/screens/admin_users_screen.dart
@@ -1,6 +1,8 @@
import 'dart:convert';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -1339,7 +1341,7 @@ class _AdminSessionDetailsSheet extends StatelessWidget {
height: 88,
color: cs.onSurface.withValues(alpha: 0.06),
child: coverUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
errorWidget: (_, __, ___) => Icon(
diff --git a/lib/screens/app_shell.dart b/lib/screens/app_shell.dart
index 8fab8947..e1d08992 100644
--- a/lib/screens/app_shell.dart
+++ b/lib/screens/app_shell.dart
@@ -13,10 +13,13 @@ import '../services/volume_key_service.dart';
import '../services/chromecast_service.dart';
import '../services/home_widget_service.dart';
import '../services/server_task_tracker.dart';
+import '../services/socket_service.dart';
import '../services/sleep_timer_service.dart';
import '../services/audiobookshelf_update_service.dart';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:palette_generator/palette_generator.dart';
import '../utils/cover_accent.dart';
import '../main.dart'
@@ -56,7 +59,6 @@ import '../widgets/desktop_collapsible_sidebar.dart';
import '../widgets/desktop_now_playing_bar.dart';
import '../widgets/admin_task_indicator.dart';
import 'absorbing_screen.dart';
-import 'admin_screen.dart';
import 'home_screen.dart';
import 'library_screen.dart';
import 'stats_screen.dart';
@@ -266,10 +268,23 @@ class _AppShellState extends State<AppShell>
}
unawaited(_refreshServerTasks());
_serverTaskRefreshTimer = Timer.periodic(const Duration(seconds: 3), (_) {
- unawaited(_refreshServerTasks());
+ // The socket already delivers task start, progress and finish. Polling
+ // every 3s regardless cost each open admin tab ~1200 requests an hour;
+ // only poll fast while something runs or the socket is down, and
+ // otherwise catch up once a minute.
+ final tracker = _serverTaskTracker;
+ final busy = tracker != null && tracker.runningCount > 0;
+ final last = _lastServerTaskRefresh;
+ final due = last == null ||
+ DateTime.now().difference(last) >= const Duration(minutes: 1);
+ if (busy || !SocketService().isConnected || due) {
+ unawaited(_refreshServerTasks());
+ }
});
}
+ DateTime? _lastServerTaskRefresh;
+
void _syncServerTaskPolling({
required bool isAdmin,
required Object? api,
@@ -301,6 +316,7 @@ class _AppShellState extends State<AppShell>
final api = context.read<AuthProvider>().apiService;
if (tracker == null || api == null) return;
_refreshingServerTasks = true;
+ _lastServerTaskRefresh = DateTime.now();
try {
await tracker.refresh(api);
} finally {
@@ -323,8 +339,10 @@ class _AppShellState extends State<AppShell>
final podcastsShown = _podcastsShown(lib);
if (podcastsShown) _syncTabLibrary(1, true);
_navigateToPrepared(1);
- // Library tab may need a frame to mount its state before we can focus
- // the search field. Retry up to a few frames to cover fade transitions.
+ // The Library tab can take a few hundred ms to mount after the switch.
+ // Retry on a timer, not on post-frame callbacks: those don't schedule a
+ // frame, so once the page went idle the chain stopped and Search never
+ // focused the box on a fresh load.
int attempts = 0;
void tryFocus() {
if (!mounted) return;
@@ -333,8 +351,8 @@ class _AppShellState extends State<AppShell>
state.focusSearch();
return;
}
- if (++attempts < 10) {
- WidgetsBinding.instance.addPostFrameCallback((_) => tryFocus());
+ if (++attempts < 60) {
+ Future.delayed(const Duration(milliseconds: 50), tryFocus);
}
}
@@ -718,7 +736,7 @@ class _AppShellState extends State<AppShell>
if (coverUrl.startsWith('/')) {
provider = FileImage(File(coverUrl));
} else {
- provider = CachedNetworkImageProvider(
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
coverUrl,
headers: lib.mediaHeaders,
);
@@ -1380,9 +1398,14 @@ class _AppShellState extends State<AppShell>
onPressed: openAdmin,
icon: const Icon(Icons.admin_panel_settings_outlined),
label: Text(l.serverAdmin),
+ // Same height as the collapsed IconButton. The rail
+ // expands on hover, and the footer is bottom-anchored,
+ // so any height change here moved the rows away from
+ // the icon the pointer was already on - a click on
+ // the shield landed on empty space.
style: TextButton.styleFrom(
alignment: Alignment.centerLeft,
- minimumSize: const Size.fromHeight(42),
+ minimumSize: const Size.fromHeight(48),
),
)
: Tooltip(
@@ -1396,10 +1419,17 @@ class _AppShellState extends State<AppShell>
),
),
if (serverVersion != null && serverVersion.isNotEmpty)
- _buildDesktopServerVersion(
- context,
- version: serverVersion,
- extended: extended,
+ // One slot for both layouts (two-line collapsed, one-row
+ // expanded) so the rows above stay put when the rail expands.
+ SizedBox(
+ height: 58,
+ child: Center(
+ child: _buildDesktopServerVersion(
+ context,
+ version: serverVersion,
+ extended: extended,
+ ),
+ ),
),
Divider(
height: 1,
diff --git a/lib/screens/backup_sync_screen.dart b/lib/screens/backup_sync_screen.dart
index d1419102..fc7f5b8c 100644
--- a/lib/screens/backup_sync_screen.dart
+++ b/lib/screens/backup_sync_screen.dart
@@ -1,3 +1,4 @@
+import '../utils/app_platform.dart';
import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
@@ -216,7 +217,7 @@ class _BackupSyncScreenState extends State<BackupSyncScreen> {
if (result != null) {
// Desktop platforms need manual file write; mobile writes via bytes param
- if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
+ if (AppPlatform.isWindows || AppPlatform.isLinux || AppPlatform.isMacOS) {
await File(result).writeAsString(jsonStr);
}
if (mounted) {
diff --git a/lib/screens/bookmarks_screen.dart b/lib/screens/bookmarks_screen.dart
index ee28bdc9..c5209785 100644
--- a/lib/screens/bookmarks_screen.dart
+++ b/lib/screens/bookmarks_screen.dart
@@ -2,6 +2,8 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
@@ -1111,7 +1113,7 @@ class _BookCover extends StatelessWidget {
return _placeholder();
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl!,
fit: BoxFit.cover,
httpHeaders: mediaHeaders,
diff --git a/lib/screens/car_mode_screen.dart b/lib/screens/car_mode_screen.dart
index e336da9e..7deb63d0 100644
--- a/lib/screens/car_mode_screen.dart
+++ b/lib/screens/car_mode_screen.dart
@@ -5,6 +5,8 @@ import 'package:flutter/services.dart';
import 'package:just_audio/just_audio.dart' hide PlaybackEvent;
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../main.dart' show applyOrientationLock;
import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
@@ -357,7 +359,7 @@ class _CarModeScreenState extends State<CarModeScreen>
? (_isLocalCover
? Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholderCover(cs))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
httpHeaders: auth.apiService?.mediaHeaders ?? {},
diff --git a/lib/screens/chapter_editor_screen.dart b/lib/screens/chapter_editor_screen.dart
index d4b7a7f7..422e5ec2 100644
--- a/lib/screens/chapter_editor_screen.dart
+++ b/lib/screens/chapter_editor_screen.dart
@@ -1,5 +1,5 @@
+import '../utils/app_platform.dart';
import 'dart:async';
-import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:just_audio/just_audio.dart';
@@ -1369,7 +1369,7 @@ class _ChapterEditBodyState extends State<ChapterEditBody>
final contentUrl = track['contentUrl'] as String?;
if (contentUrl == null) return;
source = api.buildTrackUrl(contentUrl);
- if (Platform.isIOS) {
+ if (AppPlatform.isIOS) {
remote = RemoteTrack(
url: source,
headers: api.mediaHeaders,
diff --git a/lib/screens/downloads_screen.dart b/lib/screens/downloads_screen.dart
index fe0b8c2f..51735d2b 100644
--- a/lib/screens/downloads_screen.dart
+++ b/lib/screens/downloads_screen.dart
@@ -1,5 +1,7 @@
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/library_provider.dart';
@@ -533,7 +535,7 @@ class _DownloadCard extends StatelessWidget {
}
return _coverPlaceholder();
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: info.coverUrl!,
fit: BoxFit.cover,
httpHeaders: mediaHeaders,
@@ -665,7 +667,7 @@ class _ActiveDownloadCard extends StatelessWidget {
}
return _coverPlaceholder();
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: info.coverUrl!,
fit: BoxFit.cover,
httpHeaders: mediaHeaders,
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 6f2613fe..84cf84be 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -3,6 +3,8 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:palette_generator/palette_generator.dart';
import '../utils/cover_accent.dart';
import '../widgets/absorbing_shared.dart';
@@ -1053,7 +1055,7 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
errorBuilder: (_, __, ___) => fallback,
);
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: fit,
httpHeaders: headers,
@@ -1100,7 +1102,7 @@ class _ContinueListeningCardState extends State<_ContinueListeningCard> {
if (coverUrl.startsWith('/')) {
provider = FileImage(File(coverUrl));
} else {
- provider = CachedNetworkImageProvider(
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
coverUrl,
headers: widget.lib.mediaHeaders,
);
diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dart
index e9b35e85..b2d3f9be 100644
--- a/lib/screens/library_screen.dart
+++ b/lib/screens/library_screen.dart
@@ -5,6 +5,7 @@ import 'dart:math';
import 'dart:ui' as ui;
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
@@ -35,7 +36,7 @@ import 'admin_podcasts_screen.dart';
import 'app_shell.dart';
import 'upcoming_releases_screen.dart';
import '../widgets/audible_series_sheet.dart' show showAudibleRegionPicker;
-import '../widgets/books_sheet_shared.dart' show coverGridCount;
+import '../widgets/books_sheet_shared.dart' show coverGridCount, coverGridTextScale;
import '../widgets/offline_status_icon.dart';
import '../widgets/rmab_config_sheet.dart'
show kRmabBaseUrlKey, kRmabApiTokenKey;
@@ -91,6 +92,58 @@ SliverGridDelegate libraryGridDelegateForWidth(
);
}
+/// Desktop cover grid whose cells are exactly cover plus labels. A fixed
+/// aspect ratio only fits one tile size; the desktop zoom makes tiles as wide
+/// as 200+ px, where the ratio left a tall blank strip under every title.
+class CoverTileGridDelegate extends SliverGridDelegate {
+ const CoverTileGridDelegate({
+ required this.maxCrossAxisExtent,
+ required this.coverAspectRatio,
+ required this.labelHeight,
+ this.spacing = 10,
+ });
+
+ final double maxCrossAxisExtent;
+ final double coverAspectRatio;
+ final double labelHeight;
+ final double spacing;
+
+ @override
+ SliverGridLayout getLayout(SliverConstraints constraints) {
+ final width = constraints.crossAxisExtent;
+ // Same column rule as SliverGridDelegateWithMaxCrossAxisExtent.
+ final count = max(1, (width / (maxCrossAxisExtent + spacing)).ceil());
+ final tileWidth = max(0.0, (width - spacing * (count - 1)) / count);
+ final tileHeight = tileWidth / coverAspectRatio + labelHeight;
+ return SliverGridRegularTileLayout(
+ crossAxisCount: count,
+ mainAxisStride: tileHeight + spacing,
+ crossAxisStride: tileWidth + spacing,
+ childMainAxisExtent: tileHeight,
+ childCrossAxisExtent: tileWidth,
+ reverseCrossAxis: axisDirectionIsReversed(constraints.crossAxisDirection),
+ );
+ }
+
+ @override
+ bool shouldRelayout(CoverTileGridDelegate oldDelegate) =>
+ oldDelegate.maxCrossAxisExtent != maxCrossAxisExtent ||
+ oldDelegate.coverAspectRatio != coverAspectRatio ||
+ oldDelegate.labelHeight != labelHeight ||
+ oldDelegate.spacing != spacing;
+}
+
+/// Height of a book tile's labels under the cover: the gap, a title line and
+/// an author line, plus a subtitle line when shown. Line heights follow
+/// labelSmall's 1.45 at the tile's text scale.
+double coverTileLabelHeight(BuildContext context, {required bool subtitle}) {
+ final scale = coverGridTextScale(context);
+ final scaler = MediaQuery.textScalerOf(context);
+ final title = scaler.scale(11 * scale) * 1.45;
+ final line = scaler.scale(10 * scale) * 1.45;
+ return 5 + title + line + (subtitle ? line : 0) + 4;
+}
+
SliverGridDelegate libraryGridDelegate(
BuildContext context, {
required double childAspectRatio,
@@ -369,7 +422,12 @@ class LibraryScreenState extends State<LibraryScreen>
if (!_focusNode.hasFocus) {
FocusScope.of(context).requestFocus(_focusNode);
}
- SystemChannels.textInput.invokeMethod<void>('TextInput.show');
+ // Only phones need the keyboard nudged up. In a browser this made a
+ // second, unconnected input take the focus: typing after the rail's
+ // Search button went into it and never reached the search box.
+ if (!kIsWeb) {
+ SystemChannels.textInput.invokeMethod<void>('TextInput.show');
+ }
});
}
@@ -3016,12 +3074,16 @@ class LibraryScreenState extends State<LibraryScreen>
// (we already wrap the whole NestedScrollView in
// SafeArea above).
primary: false,
- toolbarHeight: _isInSearchMode
- ? 156
- : ((_filter != LibraryFilter.none ||
- _seriesFilter != SeriesFilter.none)
- ? 204
- : 192),
+ // Desktop puts the title beside the header actions instead of under the
+ // ABSORB wordmark, a row shorter; the phone height left an empty band
+ // above the grid there.
+ toolbarHeight: (_isInSearchMode
+ ? 156
+ : ((_filter != LibraryFilter.none ||
+ _seriesFilter != SeriesFilter.none)
+ ? 204
+ : 192)) -
+ (desktop ? 40 : 0),
backgroundColor: scaffoldBg,
surfaceTintColor: Colors.transparent,
elevation: 0,
@@ -3188,7 +3250,11 @@ class LibraryScreenState extends State<LibraryScreen>
padding: const EdgeInsets.fromLTRB(16, 8, 16, 0),
child: Row(
children: [
+ // Flex against the Spacer below: at an even split
+ // the box only got half the room and cut off its
+ // own placeholder.
Flexible(
+ flex: 4,
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 560),
child: searchBar,
diff --git a/lib/screens/podcast_edit_screen.dart b/lib/screens/podcast_edit_screen.dart
index 6960a6e0..8e450467 100644
--- a/lib/screens/podcast_edit_screen.dart
+++ b/lib/screens/podcast_edit_screen.dart
@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:file_picker/file_picker.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
@@ -260,7 +262,7 @@ class _PodcastEditScreenState extends State<PodcastEditScreen> {
border: _coverUrlCtrl.text == url ? Border.all(color: cs.primary, width: 2) : null,
),
clipBehavior: Clip.antiAlias,
- child: CachedNetworkImage(imageUrl: url, fit: BoxFit.cover),
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: url, fit: BoxFit.cover),
),
),
],
@@ -315,10 +317,10 @@ class _PodcastEditScreenState extends State<PodcastEditScreen> {
final url = _coverUrlCtrl.text.trim();
final headers = context.read<AuthProvider>().apiService?.mediaHeaders;
if (url.isNotEmpty) {
- return CachedNetworkImage(imageUrl: url, fit: BoxFit.cover,
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: url, fit: BoxFit.cover,
placeholder: (_, __) => _coverPlaceholder(cs), errorWidget: (_, __, ___) => _coverPlaceholder(cs));
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: '$serverCover?v=$_coverVersion',
httpHeaders: headers,
fit: BoxFit.cover,
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 9fcd298d..41b95c17 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1,5 +1,4 @@
import 'dart:async';
-import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
@@ -22,6 +21,7 @@ import '../screens/app_shell.dart';
import '../build_info.dart';
import '../services/update_checker_service.dart';
import '../services/audiobookshelf_update_service.dart';
+import '../widgets/adaptive_modal.dart';
import '../widgets/update_dialog.dart';
import '../widgets/nav_hold_options.dart';
import '../screens/admin_screen.dart';
@@ -34,6 +34,7 @@ import '../screens/auth_sessions_screen.dart';
import '../screens/transcription_settings_screen.dart';
import '../main.dart' show applyThemeMode, applyTrustAllCerts, applyFlatBackground, applyColorSource, applyManualSeed, applyGradientIntensity, applyUseColorEverywhere, applyEinkModeTheme, applyOrientationLock, localeNotifier, flatNotifier, gradientIntensityNotifier, snappyTransitionsNotifier;
import '../services/wording.dart';
+import '../utils/app_platform.dart';
import '../utils/share_origin.dart';
import '../widgets/settings_search.dart';
import 'settings_search_index.dart';
@@ -194,12 +195,14 @@ class SettingsScreenState extends State<SettingsScreen> {
static const _isDevBuild = bool.fromEnvironment('DEV_BUILD');
// Distribution label shown next to the version. The F-Droid build passes
// no define, so it falls through here.
- static String get _flavorLabel => _isDevBuild
- ? 'Dev'
- : _isGithubBuild ? 'GitHub' : _isPlayStoreBuild ? 'Play Store' : 'F-Droid';
+ static String get _flavorLabel => AppPlatform.isWeb
+ ? 'Web'
+ : _isDevBuild
+ ? 'Dev'
+ : _isGithubBuild ? 'GitHub' : _isPlayStoreBuild ? 'Play Store' : 'F-Droid';
String _versionLine(AppLocalizations l) {
- final base = Platform.isIOS
+ final base = AppPlatform.isIOS
? l.appVersionFormat(_appVersion)
: '$_flavorLabel - $_appVersion';
final beta = betaNumberFor(_appVersion);
@@ -2269,7 +2272,7 @@ class SettingsScreenState extends State<SettingsScreen> {
),
// iPadOS ignores orientation preferences for multitasking
// apps, so the lock can't work there - hide it on iPad.
- if (!(Platform.isIOS && MediaQuery.sizeOf(context).shortestSide >= 600)) ...[
+ if (!(AppPlatform.isIOS && MediaQuery.sizeOf(context).shortestSide >= 600)) ...[
const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
title: const Text('Lock rotation'),
@@ -2885,7 +2888,7 @@ class SettingsScreenState extends State<SettingsScreen> {
PlayerSettings.setForwardSkip(v.round());
} : null,
),
- if (Platform.isIOS)
+ if (AppPlatform.isIOS)
Padding(
padding: const EdgeInsets.fromLTRB(16, 4, 16, 8),
child: Text(
@@ -3137,12 +3140,12 @@ class SettingsScreenState extends State<SettingsScreen> {
onExpansionChanged: (v) => _onSectionExpanded('Media Controls', v),
children: [
SwitchListTile(
- title: Text(Platform.isIOS
+ title: Text(AppPlatform.isIOS
? l.chapterProgressInNotificationIos
: l.chapterProgressInNotification),
subtitle: Text(
_notifChapterProgress
- ? (Platform.isIOS
+ ? (AppPlatform.isIOS
? l.chapterProgressOnSubtitleIos
: l.chapterProgressOnSubtitle)
: l.chapterProgressOffSubtitle,
@@ -3169,7 +3172,7 @@ class SettingsScreenState extends State<SettingsScreen> {
),
const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
- title: Text(Platform.isIOS
+ title: Text(AppPlatform.isIOS
? l.carConnectAutoplayIos
: l.carConnectAutoplay),
subtitle: Text(
@@ -3185,7 +3188,7 @@ class SettingsScreenState extends State<SettingsScreen> {
),
// Android only: chooses which pair fills the phone media
// player's two extra slots. iOS uses CarPlay's own buttons.
- if (Platform.isAndroid) ...[
+ if (AppPlatform.isAndroid) ...[
const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
title: const Text('Duck brief interruptions'),
@@ -3228,6 +3231,8 @@ class SettingsScreenState extends State<SettingsScreen> {
isExpanded: _expandedSection == 'Sleep Timer',
onExpansionChanged: (v) => _onSectionExpanded('Sleep Timer', v),
children: [
+ // A browser has no motion sensor to shake.
+ if (!AppPlatform.isWeb) ...[
Padding(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 4),
child: Text(l.shakeDuringSleepTimer, style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant)),
@@ -3278,6 +3283,7 @@ class SettingsScreenState extends State<SettingsScreen> {
const SizedBox(height: 4),
],
const Divider(height: 1, indent: 16, endIndent: 16),
+ ],
Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
child: Text(l.buttonDuringSleepTimer, style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant)),
@@ -3309,7 +3315,7 @@ class SettingsScreenState extends State<SettingsScreen> {
),
// Shared by shake and button add-time modes, so it shows
// whenever either trigger needs it
- if (_shakeMode == 'addTime' || _sleepButtonMode == 'addTime') ...[
+ if ((!AppPlatform.isWeb && _shakeMode == 'addTime') || _sleepButtonMode == 'addTime') ...[
const Divider(height: 1, indent: 16, endIndent: 16),
Padding(
padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
@@ -3721,7 +3727,7 @@ class SettingsScreenState extends State<SettingsScreen> {
} : null,
),
const Divider(height: 1, indent: 16, endIndent: 16),
- if (!Platform.isIOS && _canPickDownloadLocation)
+ if (!AppPlatform.isIOS && _canPickDownloadLocation)
ListTile(
leading: Icon(Icons.folder_outlined, color: cs.primary),
title: Text(l.downloadLocation),
@@ -4052,7 +4058,7 @@ class SettingsScreenState extends State<SettingsScreen> {
}
},
),
- if (Platform.isAndroid) ...[
+ if (AppPlatform.isAndroid) ...[
const Divider(height: 1, indent: 16, endIndent: 16),
ListTile(
leading: const Icon(Icons.notifications_active_outlined),
@@ -4241,6 +4247,9 @@ class SettingsScreenState extends State<SettingsScreen> {
trailing: const Icon(Icons.chevron_right_rounded),
onTap: _showNavHoldDialog,
),
+ // The page origin is the server and the browser owns TLS, so
+ // neither a LAN switch nor a certificate override applies.
+ if (!AppPlatform.isWeb) ...[
const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
title: Row(children: [
@@ -4313,7 +4322,8 @@ class SettingsScreenState extends State<SettingsScreen> {
applyTrustAllCerts(v);
} : null,
),
- if (Platform.isAndroid) ...[
+ ],
+ if (AppPlatform.isAndroid) ...[
const Divider(height: 1, indent: 16, endIndent: 16),
SwitchListTile(
title: Row(children: [
@@ -4363,6 +4373,8 @@ class SettingsScreenState extends State<SettingsScreen> {
trailing: Icon(Icons.chevron_right_rounded, color: cs.onSurfaceVariant.withValues(alpha: 0.5)),
onTap: _openRmabSheetFromSettings,
),
+ // Transcription runs on-device; the web build only has a stub.
+ if (!AppPlatform.isWeb) ...[
const Divider(height: 1, indent: 16, endIndent: 16),
ListTile(
leading: Icon(Icons.record_voice_over_rounded, color: cs.primary),
@@ -4373,6 +4385,7 @@ class SettingsScreenState extends State<SettingsScreen> {
onTap: () => Navigator.push(context, MaterialPageRoute(
builder: (_) => const TranscriptionSettingsScreen())),
),
+ ],
],
),
const SizedBox(height: 16),
@@ -4897,7 +4910,8 @@ class SettingsScreenState extends State<SettingsScreen> {
final userType = auth.isRoot ? l.rootAdmin : auth.isAdmin ? l.admin : l.userFallback;
final libraryCount = lib.libraries.length;
- showModalBottomSheet(
+ showAdaptiveActionMenu(
+ desktopScrollWrap: false,
context: context,
isScrollControlled: true,
useSafeArea: true,
@@ -4908,7 +4922,7 @@ class SettingsScreenState extends State<SettingsScreen> {
builder: (ctx) => SafeArea(
child: SingleChildScrollView(
child: Column(mainAxisSize: MainAxisSize.min, children: [
- Center(child: Container(margin: const EdgeInsets.only(top: 12), width: 36, height: 4,
+ if (!ModalSurface.isDesktopOf(ctx)) Center(child: Container(margin: const EdgeInsets.only(top: 12), width: 36, height: 4,
decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.12), borderRadius: BorderRadius.circular(2)))),
const SizedBox(height: 16),
// Current user info
diff --git a/lib/screens/settings_search_index.dart b/lib/screens/settings_search_index.dart
index 6ae9e513..a13ec661 100644
--- a/lib/screens/settings_search_index.dart
+++ b/lib/screens/settings_search_index.dart
@@ -1,4 +1,4 @@
-import 'dart:io' show Platform;
+import '../utils/app_platform.dart';
import 'package:flutter/widgets.dart';
import '../l10n/app_localizations.dart';
import '../services/wording.dart';
@@ -30,7 +30,7 @@ List<SettingSearchEntry> settingsSearchEntries(BuildContext context) {
SettingSearchEntry('Appearance', l.sectionAppearance, l.rectangleBookCovers, [l.rectangleBookCoversOnSubtitle, l.rectangleBookCoversOffSubtitle]),
SettingSearchEntry('Appearance', l.sectionAppearance, l.coverSize, [l.coverSizeSubtitle, l.coverSizeSmall, l.coverSizeMedium, l.coverSizeLarge]),
SettingSearchEntry('Appearance', l.sectionAppearance, 'Classic wording', const ['Using "Play", "Now Playing", "Finished"', 'Using "Absorb", "Absorbing", "Fully Absorbed"']),
- if (!(Platform.isIOS && MediaQuery.sizeOf(context).shortestSide >= 600))
+ if (!(AppPlatform.isIOS && MediaQuery.sizeOf(context).shortestSide >= 600))
SettingSearchEntry('Appearance', l.sectionAppearance, 'Lock rotation', const ['Screen stays in portrait', 'Screen can rotate with the device']),
// ── Customize Stats ──
@@ -72,9 +72,9 @@ List<SettingSearchEntry> settingsSearchEntries(BuildContext context) {
SettingSearchEntry(
'Media Controls',
l.sectionMediaControls,
- Platform.isIOS ? l.carConnectAutoplayIos : l.carConnectAutoplay,
+ AppPlatform.isIOS ? l.carConnectAutoplayIos : l.carConnectAutoplay,
[l.carConnectAutoplayOnSubtitle, l.carConnectAutoplayOffSubtitle]),
- if (Platform.isAndroid) ...[
+ if (AppPlatform.isAndroid) ...[
SettingSearchEntry('Media Controls', l.sectionMediaControls, 'Duck brief interruptions', const ['Notifications and prompts lower the volume instead of pausing', 'Notifications and prompts pause playback']),
SettingSearchEntry('Media Controls', l.sectionMediaControls, l.speedBookmarkInControls, [l.speedBookmarkOnSubtitle, l.speedBookmarkOffSubtitle]),
],
@@ -103,7 +103,7 @@ List<SettingSearchEntry> settingsSearchEntries(BuildContext context) {
SettingSearchEntry('Downloads & Storage', l.sectionDownloadsAndStorage, l.autoDownload, [l.autoDownloadSubtitle]),
SettingSearchEntry('Downloads & Storage', l.sectionDownloadsAndStorage, l.keepNext, const []),
SettingSearchEntry('Downloads & Storage', l.sectionDownloadsAndStorage, w.deleteAbsorbedDownloads, [l.deleteAbsorbedOnSubtitle, l.deleteAbsorbedOffSubtitle]),
- if (!Platform.isIOS)
+ if (!AppPlatform.isIOS)
SettingSearchEntry('Downloads & Storage', l.sectionDownloadsAndStorage, l.downloadLocation, const []),
SettingSearchEntry('Downloads & Storage', l.sectionDownloadsAndStorage, l.manageDownloads, const []),
SettingSearchEntry('Downloads & Storage', l.sectionDownloadsAndStorage, l.streamingCache, [l.streamingCacheOffSubtitle, l.streamingCacheOff, l.clearCache]),
@@ -122,7 +122,7 @@ List<SettingSearchEntry> settingsSearchEntries(BuildContext context) {
// ── Permissions ──
SettingSearchEntry('Permissions', l.sectionPermissions, l.notifications, [l.notificationsSubtitle]),
- if (Platform.isAndroid) ...[
+ if (AppPlatform.isAndroid) ...[
SettingSearchEntry('Permissions', l.sectionPermissions, l.settingsEpisodeNotifs, [l.settingsEpisodeNotifsDesc]),
SettingSearchEntry('Permissions', l.sectionPermissions, l.unrestrictedBattery, [l.unrestrictedBatterySubtitle]),
],
@@ -140,7 +140,7 @@ List<SettingSearchEntry> settingsSearchEntries(BuildContext context) {
SettingSearchEntry('Advanced', l.sectionAdvanced, l.navHoldSettingTitle, [l.navHoldSettingSubtitle]),
SettingSearchEntry('Advanced', l.sectionAdvanced, l.localServer, [l.localServerOnConnectedSubtitle, l.localServerOnRemoteSubtitle, l.localServerOffSubtitle, l.localServerUrlLabel]),
SettingSearchEntry('Advanced', l.sectionAdvanced, l.trustAllCertificates, [l.trustAllCertificatesOnSubtitle, l.trustAllCertificatesOffSubtitle]),
- if (Platform.isAndroid)
+ if (AppPlatform.isAndroid)
SettingSearchEntry('Advanced', l.sectionAdvanced, l.mp3IndexSeeking, [l.mp3IndexSeekingOnSubtitle, l.mp3IndexSeekingOffSubtitle]),
if (const bool.fromEnvironment('GITHUB_BUILD'))
SettingSearchEntry('Advanced', l.sectionAdvanced, l.includePreReleases, [l.includePreReleasesOnSubtitle, l.includePreReleasesOffSubtitle]),
diff --git a/lib/screens/stats_screen.dart b/lib/screens/stats_screen.dart
index d5ce9036..b16179f0 100644
--- a/lib/screens/stats_screen.dart
+++ b/lib/screens/stats_screen.dart
@@ -1,6 +1,8 @@
import 'dart:convert';
import 'dart:math';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -921,7 +923,7 @@ class _StatsScreenState extends State<StatsScreen>
separatorBuilder: (_, __) => const SizedBox(width: 8),
itemBuilder: (_, i) => ClipRRect(
borderRadius: BorderRadius.circular(6),
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: api.getCoverUrl(coverIds[i], width: 120),
width: 64,
height: 64,
@@ -2425,7 +2427,7 @@ class SessionDetailsSheetState extends State<SessionDetailsSheet> {
height: 88,
color: cs.onSurface.withValues(alpha: 0.06),
child: coverUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
errorWidget: (_, __, ___) => Icon(
diff --git a/lib/screens/upcoming_releases_screen.dart b/lib/screens/upcoming_releases_screen.dart
index ef6c9648..fda48fa2 100644
--- a/lib/screens/upcoming_releases_screen.dart
+++ b/lib/screens/upcoming_releases_screen.dart
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
@@ -1249,7 +1251,7 @@ class _UpcomingReleasesScreenState extends State<UpcomingReleasesScreen> {
child: Stack(children: [
Positioned.fill(
child: coverUrl.isNotEmpty
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
placeholder: (_, __) => _placeholder(cs),
errorWidget: (_, __, ___) => _placeholder(cs))
@@ -1464,7 +1466,7 @@ class _UpcomingReleasesScreenState extends State<UpcomingReleasesScreen> {
child: Stack(children: [
Positioned.fill(
child: coverUrl.isNotEmpty
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
placeholder: (_, __) => _placeholder(cs),
errorWidget: (_, __, ___) => _placeholder(cs))
@@ -1688,7 +1690,7 @@ class _RemovedBooksSheetState extends State<_RemovedBooksSheet> {
width: 44,
height: 44,
child: coverUrl.isNotEmpty
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
errorWidget: (_, __, ___) => Container(color: cs.surfaceContainerHighest))
: Container(color: cs.surfaceContainerHighest),
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index c817dada..5bf5212b 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -2933,6 +2933,8 @@ class ApiService {
}
static Future<Map<String, dynamic>?> _audibleCatalogRating(String asin) async {
+ // Audible's API sends no CORS headers, so a browser always blocks it.
+ if (kIsWeb) return null;
try {
final response = await http.get(
Uri.parse(
@@ -3093,6 +3095,7 @@ class ApiService {
/// Get all book ASINs in an Audible series using the catalog relationships endpoint.
/// Returns a list of { asin, sequence, sort } maps.
static Future<List<Map<String, dynamic>>> getAudibleSeriesBooks(String seriesAsin, {String? region}) async {
+ if (kIsWeb) return [];
try {
final tld = region != null ? _audibleTldFor(region) : _audibleTld;
final url = 'https://api.audible$tld/1.0/catalog/products/$seriesAsin'
@@ -3129,6 +3132,7 @@ class ApiService {
/// Fetch details for a single book from the Audible catalog API.
/// Returns title, authors, narrators, release_date, runtime, rating, cover, etc.
static Future<Map<String, dynamic>?> getAudibleBookDetails(String asin, {String? region}) async {
+ if (kIsWeb) return null;
try {
final tld = region != null ? _audibleTldFor(region) : _audibleTld;
final url = 'https://api.audible$tld/1.0/catalog/products/$asin'
diff --git a/lib/services/download_service.dart b/lib/services/download_service.dart
index 07fbe66e..5bc259d9 100644
--- a/lib/services/download_service.dart
+++ b/lib/services/download_service.dart
@@ -429,6 +429,10 @@ class DownloadService extends ChangeNotifier {
/// Calculate total size of all downloaded files.
Future<int> get totalDownloadSize async {
+ // No downloads in a browser, and no app directory to look in: asking for
+ // one threw, which failed the Settings load and left every control there
+ // disabled on the web.
+ if (AppPlatform.isWeb) return 0;
await hydrateEbookCacheDir();
int total = 0;
for (final info in _downloads.values) {
diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dart
index 00ff6e60..41889311 100644
--- a/lib/widgets/absorbing_card.dart
+++ b/lib/widgets/absorbing_card.dart
@@ -4,6 +4,8 @@ import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../utils/cover_accent.dart';
import '../providers/auth_provider.dart';
@@ -609,7 +611,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCli
if (coverUrl.startsWith('/')) {
provider = FileImage(File(coverUrl));
} else {
- provider = CachedNetworkImageProvider(
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
coverUrl,
headers: headers,
cacheKey: coverIdentity,
diff --git a/lib/widgets/add_books_search_sheet.dart b/lib/widgets/add_books_search_sheet.dart
index edf7e7fb..84d3246b 100644
--- a/lib/widgets/add_books_search_sheet.dart
+++ b/lib/widgets/add_books_search_sheet.dart
@@ -2,6 +2,8 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
import '../providers/auth_provider.dart';
@@ -296,7 +298,7 @@ class _AddBooksSearchSheetState extends State<AddBooksSearchSheet> {
width: 44,
height: 44,
child: coverUrl != null && !coverUrl.startsWith('/')
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
diff --git a/lib/widgets/audible_series_sheet.dart b/lib/widgets/audible_series_sheet.dart
index afcac2f6..a3a3b9fb 100644
--- a/lib/widgets/audible_series_sheet.dart
+++ b/lib/widgets/audible_series_sheet.dart
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:url_launcher/url_launcher.dart';
import '../l10n/app_localizations.dart';
import '../services/api_service.dart';
@@ -444,7 +446,7 @@ class _AudibleSeriesSheetState extends State<AudibleSeriesSheet> {
child: Stack(children: [
Positioned.fill(
child: coverUrl.isNotEmpty
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
placeholder: (_, __) => _placeholder(cs),
errorWidget: (_, __, ___) => _placeholder(cs))
diff --git a/lib/widgets/author_books_sheet.dart b/lib/widgets/author_books_sheet.dart
index f2d3b228..64b635eb 100644
--- a/lib/widgets/author_books_sheet.dart
+++ b/lib/widgets/author_books_sheet.dart
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'overlay_toast.dart';
import 'swipe_action.dart';
import 'package:provider/provider.dart';
@@ -485,7 +487,7 @@ class _AuthorBooksSheetState extends State<AuthorBooksSheet> {
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: coverUrls[i] != null
- ? CachedNetworkImage(imageUrl: coverUrls[i]!, fit: BoxFit.cover, httpHeaders: headers, width: 40, height: 40,
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: coverUrls[i]!, fit: BoxFit.cover, httpHeaders: headers, width: 40, height: 40,
errorWidget: (_, __, ___) => Container(color: cs.surfaceContainerHighest,
child: Icon(Icons.auto_stories_rounded, size: 18, color: cs.onSurfaceVariant)))
: Container(color: cs.surfaceContainerHighest,
@@ -593,7 +595,7 @@ class _AuthorBooksSheetState extends State<AuthorBooksSheet> {
),
clipBehavior: Clip.antiAlias,
child: _imageUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: _imageUrl!,
fit: BoxFit.cover,
httpHeaders: headers,
diff --git a/lib/widgets/author_card.dart b/lib/widgets/author_card.dart
index 6590d95a..592bbaef 100644
--- a/lib/widgets/author_card.dart
+++ b/lib/widgets/author_card.dart
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
@@ -50,7 +52,7 @@ class AuthorCard extends StatelessWidget {
),
clipBehavior: Clip.antiAlias,
child: imageUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: imageUrl,
fit: BoxFit.cover,
httpHeaders: headers,
diff --git a/lib/widgets/book_card.dart b/lib/widgets/book_card.dart
index bf9b92bd..d5e99b2e 100644
--- a/lib/widgets/book_card.dart
+++ b/lib/widgets/book_card.dart
@@ -2,6 +2,8 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
import '../providers/auth_provider.dart';
@@ -557,13 +559,13 @@ class _CoverImage extends StatelessWidget {
return EinkCoverTone(child: BlurPaddedCover(
enabled: isSquare,
- blurChild: CachedNetworkImage(
+ blurChild: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl!,
fit: BoxFit.cover,
httpHeaders: httpHeaders,
errorWidget: (_, __, ___) => const SizedBox.shrink(),
),
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl!,
fit: effectiveFit,
httpHeaders: httpHeaders,
diff --git a/lib/widgets/book_detail_sheet.dart b/lib/widgets/book_detail_sheet.dart
index 646cebd4..1c29c374 100644
--- a/lib/widgets/book_detail_sheet.dart
+++ b/lib/widgets/book_detail_sheet.dart
@@ -9,6 +9,8 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'overlay_toast.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:palette_generator/palette_generator.dart';
import '../utils/cover_accent.dart';
import '../utils/app_platform.dart';
@@ -594,7 +596,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
provider = FileImage(File(url));
} else {
final lib = context.read<LibraryProvider>();
- provider = CachedNetworkImageProvider(url, headers: lib.mediaHeaders);
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url, headers: lib.mediaHeaders);
}
final t0 = DateTime.now();
debugPrint('[BookDetail] _deriveCoverScheme start url=$url');
@@ -645,9 +647,17 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
final cs = Theme.of(context).colorScheme;
final tt = Theme.of(context).textTheme;
final l = AppLocalizations.of(context)!;
+ // In a desktop dialog the dialog already rounds and frames it; a sheet's
+ // rounded top inside that read as a phone sheet stuck in a box.
+ final inDialog = ModalSurface.isDesktopOf(context);
return Container(
clipBehavior: Clip.antiAlias,
- decoration: BoxDecoration(color: Theme.of(context).scaffoldBackgroundColor, borderRadius: const BorderRadius.vertical(top: Radius.circular(24))),
+ decoration: BoxDecoration(
+ color: Theme.of(context).scaffoldBackgroundColor,
+ borderRadius: inDialog
+ ? BorderRadius.zero
+ : const BorderRadius.vertical(top: Radius.circular(24)),
+ ),
child: Stack(children: [
// Cover-derived color gradient background - lighter than blurred image.
Positioned.fill(child: DecoratedBox(decoration: BoxDecoration(gradient: LinearGradient(
@@ -742,7 +752,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
}
return ListView(controller: widget.scrollController, padding: EdgeInsets.fromLTRB(20, 8, 20, 32 + MediaQuery.of(context).viewPadding.bottom), children: [
- Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
+ if (!ModalSurface.isDesktopOf(context)) Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.24), borderRadius: BorderRadius.circular(2)))),
if (_coverUrl != null) ...[
Center(child: GestureDetector(
@@ -764,19 +774,19 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
errorBuilder: (_, __, ___) => const SizedBox()),
)
: BlurPaddedCover(
- blurChild: CachedNetworkImage(
+ blurChild: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: _coverUrl!, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
errorWidget: (_, __, ___) => const SizedBox.shrink(),
),
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: _coverUrl!, fit: BoxFit.contain,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => const SizedBox(),
errorWidget: (_, __, ___) => const SizedBox(),
),
))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: _coverUrl!, fit: BoxFit.contain,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => const SizedBox(),
@@ -1412,7 +1422,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
controller: widget.scrollController,
padding: EdgeInsets.fromLTRB(20, 8, 20, 24 + MediaQuery.of(context).viewPadding.bottom),
children: [
- Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
+ if (!ModalSurface.isDesktopOf(context)) Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.24), borderRadius: BorderRadius.circular(2)))),
// Header: cover thumb + title/author
Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
@@ -1597,7 +1607,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
img = Image.file(File(url), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => Container(color: cs.surfaceContainerHighest));
} else {
- img = CachedNetworkImage(imageUrl: url, fit: BoxFit.cover, httpHeaders: headers,
+ img = CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: url, fit: BoxFit.cover, httpHeaders: headers,
placeholder: (_, __) => Container(color: cs.surfaceContainerHighest),
errorWidget: (_, __, ___) => Container(color: cs.surfaceContainerHighest));
}
@@ -1752,7 +1762,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
child: Padding(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
child: Column(mainAxisSize: MainAxisSize.min, children: [
- Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
+ if (!ModalSurface.isDesktopOf(ctx)) Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.24), borderRadius: BorderRadius.circular(2)))),
Flexible(
child: SingleChildScrollView(
@@ -2519,7 +2529,7 @@ class _BookDetailSheetContentState extends State<_BookDetailSheetContent> {
child: Padding(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
child: Column(mainAxisSize: MainAxisSize.min, children: [
- Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
+ if (!ModalSurface.isDesktopOf(ctx)) Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.24), borderRadius: BorderRadius.circular(2)))),
Padding(
padding: const EdgeInsets.only(bottom: 8),
@@ -3116,7 +3126,7 @@ class _FullCoverViewerState extends State<_FullCoverViewer> {
}
},
child: Center(
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: widget.url,
httpHeaders: widget.headers,
fit: BoxFit.contain,
diff --git a/lib/widgets/collection_detail_sheet.dart b/lib/widgets/collection_detail_sheet.dart
index 35cae49b..d544c7c2 100644
--- a/lib/widgets/collection_detail_sheet.dart
+++ b/lib/widgets/collection_detail_sheet.dart
@@ -5,6 +5,8 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'overlay_toast.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
import '../services/wording.dart';
@@ -482,7 +484,7 @@ class _CollectionDetailSheetState extends State<CollectionDetailSheet> {
? (coverUrl.startsWith('/')
? Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => _placeholder(cs),
@@ -621,7 +623,7 @@ class _CollectionDetailSheetState extends State<CollectionDetailSheet> {
? (coverUrl.startsWith('/')
? Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => _placeholder(cs),
diff --git a/lib/widgets/desktop_account_button.dart b/lib/widgets/desktop_account_button.dart
index 7334c5d3..eb6acfb0 100644
--- a/lib/widgets/desktop_account_button.dart
+++ b/lib/widgets/desktop_account_button.dart
@@ -44,7 +44,8 @@ class DesktopAccountButton extends StatelessWidget {
borderRadius: BorderRadius.circular(12),
child: Padding(
padding: const EdgeInsets.all(8),
- child: extended
+ // Fixed so the row is the same height in both rail states.
+ child: SizedBox(height: 40, child: extended
? Row(
children: [
avatar,
@@ -79,7 +80,7 @@ class DesktopAccountButton extends StatelessWidget {
),
],
)
- : Center(child: avatar),
+ : Center(child: avatar)),
),
),
),
diff --git a/lib/widgets/desktop_now_playing_bar.dart b/lib/widgets/desktop_now_playing_bar.dart
index fb930659..3551e209 100644
--- a/lib/widgets/desktop_now_playing_bar.dart
+++ b/lib/widgets/desktop_now_playing_bar.dart
@@ -1,6 +1,8 @@
import 'dart:async';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import '../l10n/app_localizations.dart';
@@ -609,7 +611,7 @@ class _NowPlayingIdentity extends StatelessWidget {
dimension: 54,
child: coverUrl == null
? placeholder
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl!,
httpHeaders: mediaHeaders,
fit: BoxFit.cover,
diff --git a/lib/widgets/ebook_reader_view.dart b/lib/widgets/ebook_reader_view.dart
index 00ec30a3..bd6fb3db 100644
--- a/lib/widgets/ebook_reader_view.dart
+++ b/lib/widgets/ebook_reader_view.dart
@@ -1,3 +1,4 @@
+import '../utils/app_platform.dart';
import 'dart:async';
import 'dart:convert';
import 'dart:io';
@@ -5246,7 +5247,7 @@ class EbookReaderViewState extends State<EbookReaderView> with WidgetsBindingObs
),
// Cast is Android only; iPhones get the AirPlay route picker instead,
// same split as the card.
- if (Platform.isIOS)
+ if (AppPlatform.isIOS)
MoreMenuItem(
icon: Icons.airplay_rounded,
label: 'AirPlay',
diff --git a/lib/widgets/edit_author_sheet.dart b/lib/widgets/edit_author_sheet.dart
index 6e2cfdf1..cecd05bd 100644
--- a/lib/widgets/edit_author_sheet.dart
+++ b/lib/widgets/edit_author_sheet.dart
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
@@ -407,7 +409,7 @@ class _EditAuthorContentState extends State<_EditAuthorContent>
ClipOval(
child: SizedBox(
width: 60, height: 60,
- child: CachedNetworkImage(imageUrl: imageUrl, fit: BoxFit.cover,
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: imageUrl, fit: BoxFit.cover,
httpHeaders: headers,
placeholder: (_, __) => Container(color: cs.surfaceContainerHighest),
errorWidget: (_, __, ___) => Container(color: cs.surfaceContainerHighest,
diff --git a/lib/widgets/edit_metadata_sheet.dart b/lib/widgets/edit_metadata_sheet.dart
index c4c52207..f5d5347e 100644
--- a/lib/widgets/edit_metadata_sheet.dart
+++ b/lib/widgets/edit_metadata_sheet.dart
@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:file_picker/file_picker.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../providers/auth_provider.dart';
import '../providers/library_provider.dart';
@@ -1306,7 +1308,7 @@ class _MetadataEditViewState extends State<MetadataEditView>
child: SizedBox(
width: 60, height: 60,
child: cover.isNotEmpty
- ? CachedNetworkImage(imageUrl: cover, fit: BoxFit.cover,
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: cover, fit: BoxFit.cover,
placeholder: (_, __) => _placeholder(cs),
errorWidget: (_, __, ___) => _placeholder(cs))
: _placeholder(cs),
@@ -1585,7 +1587,7 @@ class _MetadataEditViewState extends State<MetadataEditView>
borderRadius: BorderRadius.circular(12),
child: SizedBox(
height: 200,
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
httpHeaders: context.read<AuthProvider>().apiService?.mediaHeaders,
fit: BoxFit.contain,
@@ -1722,7 +1724,7 @@ class _MetadataEditViewState extends State<MetadataEditView>
borderRadius: BorderRadius.circular(8),
),
clipBehavior: Clip.antiAlias,
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: url,
fit: BoxFit.contain,
placeholder: (_, __) => _placeholder(cs),
@@ -1816,7 +1818,7 @@ class _MetadataEditViewState extends State<MetadataEditView>
Future<void> _showCoverPreview(String url) async {
Size? size;
try {
- final provider = CachedNetworkImageProvider(url);
+ final provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url);
final completer = Completer<Size>();
final stream = provider.resolve(ImageConfiguration.empty);
late final ImageStreamListener listener;
@@ -1848,7 +1850,7 @@ class _MetadataEditViewState extends State<MetadataEditView>
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: InteractiveViewer(
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: url,
fit: BoxFit.contain,
placeholder: (_, __) => const SizedBox(
diff --git a/lib/widgets/episode_detail_sheet.dart b/lib/widgets/episode_detail_sheet.dart
index 9cb487f0..1802778b 100644
--- a/lib/widgets/episode_detail_sheet.dart
+++ b/lib/widgets/episode_detail_sheet.dart
@@ -3,6 +3,8 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../services/wording.dart';
import '../providers/library_provider.dart';
@@ -519,7 +521,7 @@ class _EpisodeDetailSheetState extends State<EpisodeDetailSheet> {
if (coverUrl != null)
Positioned.fill(
child: RepaintBoundary(
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
imageBuilder: (_, p) => ImageFiltered(
diff --git a/lib/widgets/episode_list_sheet.dart b/lib/widgets/episode_list_sheet.dart
index 25278382..09cf7385 100644
--- a/lib/widgets/episode_list_sheet.dart
+++ b/lib/widgets/episode_list_sheet.dart
@@ -7,6 +7,8 @@ import 'swipe_action.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../services/wording.dart';
import '../providers/library_provider.dart';
@@ -830,7 +832,7 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {
if (coverUrl != null)
Positioned.fill(
child: RepaintBoundary(
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
imageBuilder: (_, p) => ImageFiltered(
diff --git a/lib/widgets/equalizer_sheet.dart b/lib/widgets/equalizer_sheet.dart
index 757f82f7..96ca4adb 100644
--- a/lib/widgets/equalizer_sheet.dart
+++ b/lib/widgets/equalizer_sheet.dart
@@ -1,4 +1,4 @@
-import 'dart:io' show Platform;
+import '../utils/app_platform.dart';
import 'package:flutter/material.dart';
import '../l10n/app_localizations.dart';
import '../services/equalizer_service.dart';
@@ -480,7 +480,7 @@ class _EqualizerSheetContentState extends State<_EqualizerSheetContent> {
const SizedBox(height: 8),
// Virtualizer (Android only - no iOS equivalent)
- if (Platform.isAndroid) ...[
+ if (AppPlatform.isAndroid) ...[
_EffectRow(
icon: Icons.surround_sound_rounded,
label: l.surround,
@@ -534,7 +534,7 @@ class _EqualizerSheetContentState extends State<_EqualizerSheetContent> {
// Skip silence (Android only - just_audio's setSkipSilenceEnabled
// is a no-op on iOS).
- if (Platform.isAndroid) ...[
+ if (AppPlatform.isAndroid) ...[
const SizedBox(height: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dart
index 208529de..8efd17ec 100644
--- a/lib/widgets/expanded_card.dart
+++ b/lib/widgets/expanded_card.dart
@@ -5,6 +5,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../utils/cover_accent.dart';
import '../providers/auth_provider.dart';
@@ -528,7 +530,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
if (!AppPlatform.isWeb && url.startsWith('/')) {
provider = FileImage(File(url));
} else {
- provider = CachedNetworkImageProvider(url, headers: context.read<LibraryProvider>().mediaHeaders);
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url, headers: context.read<LibraryProvider>().mediaHeaders);
}
_onCoverLoaded(provider);
}
@@ -561,7 +563,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
provider = FileImage(File(url));
} else {
final lib = context.read<LibraryProvider>();
- provider = CachedNetworkImageProvider(url, headers: lib.mediaHeaders);
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url, headers: lib.mediaHeaders);
}
final completer = Completer<ui.Image>();
@@ -842,10 +844,10 @@ class _ExpandedCardState extends State<ExpandedCard> {
errorBuilder: (_, __, ___) => const SizedBox.shrink()),
enabled: !_rectangleCovers, child: Image.file(File(_coverUrl!), fit: _rectangleCovers ? BoxFit.cover : BoxFit.contain,
errorBuilder: (_, __, ___) => CoverPlaceholder(title: _title, author: _author)))
- : BlurPaddedCover(blurChild: CachedNetworkImage(imageUrl: _coverUrl!, fit: BoxFit.cover,
+ : BlurPaddedCover(blurChild: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: _coverUrl!, fit: BoxFit.cover,
httpHeaders: mediaHeaders,
errorWidget: (_, __, ___) => const SizedBox.shrink()),
- enabled: !_rectangleCovers, child: CachedNetworkImage(imageUrl: _coverUrl!, fit: _rectangleCovers ? BoxFit.cover : BoxFit.contain,
+ enabled: !_rectangleCovers, child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: _coverUrl!, fit: _rectangleCovers ? BoxFit.cover : BoxFit.contain,
httpHeaders: mediaHeaders,
placeholder: (_, __) => CoverPlaceholder(title: _title, author: _author),
errorWidget: (_, __, ___) => CoverPlaceholder(title: _title, author: _author)))
@@ -1138,7 +1140,7 @@ class _ExpandedCardState extends State<ExpandedCard> {
errorBuilder: (_, __, ___) => Container(color: isDark ? Colors.black : Colors.white)),
);
})
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: _coverUrl!,
fit: BoxFit.cover,
httpHeaders: mediaHeaders,
diff --git a/lib/widgets/finished_books_this_year_sheet.dart b/lib/widgets/finished_books_this_year_sheet.dart
index 5222335b..c61b95f3 100644
--- a/lib/widgets/finished_books_this_year_sheet.dart
+++ b/lib/widgets/finished_books_this_year_sheet.dart
@@ -1,5 +1,7 @@
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
@@ -377,7 +379,7 @@ class _FinishedBooksThisYearSheetState
fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs));
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
diff --git a/lib/widgets/library_books_tab.dart b/lib/widgets/library_books_tab.dart
index 88a29ef5..8bf93ea9 100644
--- a/lib/widgets/library_books_tab.dart
+++ b/lib/widgets/library_books_tab.dart
@@ -231,19 +231,28 @@ class LibraryBooksTab extends StatelessWidget {
libraryGridBottomPadding(context),
),
sliver: SliverGrid(
- gridDelegate: libraryGridDelegate(
- context,
- childAspectRatio: rectangleCovers ? 0.48 : 0.68,
- desktopMaxCrossAxisExtent: desktopMaxCrossAxisExtent,
- crossAxisCount: cols,
- // Subtitles add a line under every title, and how much room
- // that needs depends on the cover size, so size the cell from
- // the tile itself rather than from a second fixed ratio.
- mainAxisExtent: showSubtitles
- ? coverGridTileWidth(context) / (rectangleCovers ? 0.48 : 0.68)
- + coverGridSubtitleHeight(context)
- : null,
- ),
+ gridDelegate: isDesktopWorkspace(context)
+ ? CoverTileGridDelegate(
+ maxCrossAxisExtent: desktopMaxCrossAxisExtent,
+ coverAspectRatio: coverAspectRatio,
+ labelHeight:
+ coverTileLabelHeight(context, subtitle: showSubtitles),
+ )
+ : libraryGridDelegate(
+ context,
+ childAspectRatio: rectangleCovers ? 0.48 : 0.68,
+ desktopMaxCrossAxisExtent: desktopMaxCrossAxisExtent,
+ crossAxisCount: cols,
+ // Subtitles add a line under every title, and how much
+ // room that needs depends on the cover size, so size
+ // the cell from the tile itself rather than from a
+ // second fixed ratio.
+ mainAxisExtent: showSubtitles
+ ? coverGridTileWidth(context) /
+ (rectangleCovers ? 0.48 : 0.68) +
+ coverGridSubtitleHeight(context)
+ : null,
+ ),
delegate: SliverChildBuilderDelegate(
(context, index) {
maybeLoadAhead(index);
diff --git a/lib/widgets/library_grid_tiles.dart b/lib/widgets/library_grid_tiles.dart
index 45683059..ca642305 100644
--- a/lib/widgets/library_grid_tiles.dart
+++ b/lib/widgets/library_grid_tiles.dart
@@ -1,6 +1,8 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
@@ -94,13 +96,16 @@ class _GridBookTileState extends State<GridBookTile> {
!lib.isOffline &&
isDesktopWorkspace(context) &&
(context.watch<AuthProvider?>()?.canUpdateMetadata ?? false);
- // Desktop hover actions only; selection is drawn by the tile itself.
+ // Desktop hover actions. Once select mode is on the tile draws its own
+ // check, so the hover circle is only the way in: clicking it starts
+ // select mode with this book picked, like the home rows.
return HoverCoverActions(
onMenu: (!widget.selectionMode && itemId.isNotEmpty && !lib.isPodcastLibrary)
? () => showQuickActionsSheet(context, itemId, initialItem: widget.item)
: null,
editItemId: canEdit && !widget.selectionMode ? itemId : null,
selectionMode: widget.selectionMode,
+ onSelectionToggle: widget.selectionMode ? null : widget.onSelectionToggle,
child: GestureDetector(
// opaque so taps on the blank space below the title (the tile's tall
// aspect ratio leaves a gap when the Column children stop short)
@@ -338,7 +343,7 @@ class _GridBookTileState extends State<GridBookTile> {
cacheWidth: decodeWidth,
errorBuilder: (_, __, ___) => placeholder);
}
- return CachedNetworkImage(imageUrl: coverUrl, fit: BoxFit.cover,
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: headers, memCacheWidth: decodeWidth,
placeholder: (_, __) => placeholder,
errorWidget: (_, __, ___) => placeholder);
@@ -358,11 +363,11 @@ class _GridBookTileState extends State<GridBookTile> {
]);
}
return Stack(fit: StackFit.expand, children: [
- CachedNetworkImage(imageUrl: coverUrl, fit: BoxFit.cover,
+ CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: headers, memCacheWidth: 32,
errorWidget: (_, __, ___) => const SizedBox.shrink()),
Container(color: Colors.black.withValues(alpha: 0.15)),
- CachedNetworkImage(imageUrl: coverUrl, fit: BoxFit.contain,
+ CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: coverUrl, fit: BoxFit.contain,
httpHeaders: headers, memCacheWidth: decodeWidth,
placeholder: (_, __) => placeholder,
errorWidget: (_, __, ___) => placeholder),
@@ -510,7 +515,7 @@ class _StackedCovers extends StatelessWidget {
cacheWidth: decodeWidth,
errorBuilder: (_, __, ___) => _placeholder());
}
- return CachedNetworkImage(imageUrl: url, fit: BoxFit.cover,
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: url, fit: BoxFit.cover,
httpHeaders: mediaHeaders, memCacheWidth: decodeWidth,
placeholder: (_, __) => _placeholder(),
errorWidget: (_, __, ___) => _placeholder());
@@ -941,7 +946,7 @@ class GridAuthorTile extends StatelessWidget {
clipBehavior: Clip.antiAlias,
child: imageUrl != null
? ClipOval(
- child: CachedNetworkImage(
+ child: CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: imageUrl,
fit: BoxFit.cover,
httpHeaders: headers,
diff --git a/lib/widgets/library_search_results.dart b/lib/widgets/library_search_results.dart
index 95c0046e..4459766e 100644
--- a/lib/widgets/library_search_results.dart
+++ b/lib/widgets/library_search_results.dart
@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
@@ -83,7 +85,7 @@ class BookResultTile extends StatelessWidget {
fit: StackFit.expand,
children: [
coverUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
@@ -321,7 +323,7 @@ class EpisodeResultTile extends StatelessWidget {
width: 56,
height: 56,
child: coverUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl,
fit: BoxFit.cover,
httpHeaders: context.read<LibraryProvider>().mediaHeaders,
@@ -430,7 +432,7 @@ class AuthorResultTile extends StatelessWidget {
),
clipBehavior: Clip.antiAlias,
child: imageUrl != null
- ? CachedNetworkImage(
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: imageUrl,
fit: BoxFit.cover,
httpHeaders: context.read<LibraryProvider>().mediaHeaders,
diff --git a/lib/widgets/library_series_tab.dart b/lib/widgets/library_series_tab.dart
index 821d15db..300b6730 100644
--- a/lib/widgets/library_series_tab.dart
+++ b/lib/widgets/library_series_tab.dart
@@ -93,11 +93,18 @@ class LibrarySeriesTab extends StatelessWidget {
libraryGridBottomPadding(context),
),
sliver: SliverGrid(
- gridDelegate: libraryGridDelegate(
- context,
- childAspectRatio: rectangleCovers ? 0.48 : 0.68,
- desktopMaxCrossAxisExtent: desktopMaxCrossAxisExtent,
- ),
+ gridDelegate: isDesktopWorkspace(context)
+ ? CoverTileGridDelegate(
+ maxCrossAxisExtent: desktopMaxCrossAxisExtent,
+ coverAspectRatio: coverAspectRatio,
+ labelHeight:
+ coverTileLabelHeight(context, subtitle: false),
+ )
+ : libraryGridDelegate(
+ context,
+ childAspectRatio: rectangleCovers ? 0.48 : 0.68,
+ desktopMaxCrossAxisExtent: desktopMaxCrossAxisExtent,
+ ),
delegate: SliverChildBuilderDelegate((context, index) {
if (index >= seriesItems.length) {
return const Center(
diff --git a/lib/widgets/metadata_lookup_sheet.dart b/lib/widgets/metadata_lookup_sheet.dart
index 6887f9ae..95b99eab 100644
--- a/lib/widgets/metadata_lookup_sheet.dart
+++ b/lib/widgets/metadata_lookup_sheet.dart
@@ -1,6 +1,8 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import '../services/api_service.dart';
import '../services/metadata_override_service.dart';
@@ -646,7 +648,7 @@ class _MetadataLookupSheetState extends State<MetadataLookupSheet>
child: SizedBox(
width: 60, height: 60,
child: cover.isNotEmpty
- ? CachedNetworkImage(imageUrl: cover, fit: BoxFit.cover,
+ ? CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: cover, fit: BoxFit.cover,
placeholder: (_, __) => _placeholder(cs),
errorWidget: (_, __, ___) => _placeholder(cs))
: _placeholder(cs),
diff --git a/lib/widgets/playlist_detail_sheet.dart b/lib/widgets/playlist_detail_sheet.dart
index 1b7ea44a..fb029571 100644
--- a/lib/widgets/playlist_detail_sheet.dart
+++ b/lib/widgets/playlist_detail_sheet.dart
@@ -5,6 +5,8 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'overlay_toast.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
import '../services/wording.dart';
@@ -650,7 +652,7 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {
? (coverUrl.startsWith('/')
? Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => _placeholder(cs),
@@ -753,7 +755,7 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {
? (coverUrl.startsWith('/')
? Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => _placeholder(cs),
diff --git a/lib/widgets/podcast_episode_feed.dart b/lib/widgets/podcast_episode_feed.dart
index 40877903..90e1e183 100644
--- a/lib/widgets/podcast_episode_feed.dart
+++ b/lib/widgets/podcast_episode_feed.dart
@@ -2,6 +2,8 @@ import 'dart:async';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
@@ -434,7 +436,7 @@ class _PodcastEpisodeFeedState extends State<PodcastEpisodeFeed> {
fit: BoxFit.cover,
errorBuilder: (_, __, ___) => placeholder,
)
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: url,
httpHeaders: lib.mediaHeaders,
width: 48,
diff --git a/lib/widgets/quote_share_sheet.dart b/lib/widgets/quote_share_sheet.dart
index 41ee3a94..3f689a51 100644
--- a/lib/widgets/quote_share_sheet.dart
+++ b/lib/widgets/quote_share_sheet.dart
@@ -3,6 +3,8 @@ import 'dart:math' show min;
import 'dart:ui' as ui;
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
@@ -138,7 +140,7 @@ class _QuoteShareSheetState extends State<_QuoteShareSheet> {
final file = File(url);
if (file.existsSync()) provider = FileImage(file);
} else {
- provider = CachedNetworkImageProvider(url, headers: widget.mediaHeaders);
+ provider = CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url, headers: widget.mediaHeaders);
}
if (provider == null) {
setState(() => _coverSettled = true);
diff --git a/lib/widgets/rmab_book_detail_sheet.dart b/lib/widgets/rmab_book_detail_sheet.dart
index dc452afb..e673b299 100644
--- a/lib/widgets/rmab_book_detail_sheet.dart
+++ b/lib/widgets/rmab_book_detail_sheet.dart
@@ -1,4 +1,6 @@
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import '../l10n/app_localizations.dart';
@@ -263,7 +265,7 @@ class _Cover extends StatelessWidget {
child: Icon(Icons.menu_book_rounded,
color: cs.onSurfaceVariant, size: 36),
)
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: url!,
fit: BoxFit.cover,
placeholder: (_, __) => Container(color: cs.surfaceContainerHighest),
diff --git a/lib/widgets/rmab_config_sheet.dart b/lib/widgets/rmab_config_sheet.dart
index ae01bc07..d08b5c35 100644
--- a/lib/widgets/rmab_config_sheet.dart
+++ b/lib/widgets/rmab_config_sheet.dart
@@ -1,6 +1,8 @@
import 'dart:convert';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -1056,7 +1058,7 @@ class _RequestRow extends StatelessWidget {
child: Icon(Icons.menu_book_rounded,
color: cs.onSurfaceVariant, size: 20),
)
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: book.coverArtUrl!,
fit: BoxFit.cover,
placeholder: (_, __) => Container(
@@ -1164,7 +1166,7 @@ class _RequestDetailSheet extends StatelessWidget {
child: Icon(Icons.menu_book_rounded,
color: cs.onSurfaceVariant, size: 28),
)
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: book.coverArtUrl!,
fit: BoxFit.cover,
placeholder: (_, __) => Container(
diff --git a/lib/widgets/rmab_search_results_sheet.dart b/lib/widgets/rmab_search_results_sheet.dart
index 1369431e..6bb37465 100644
--- a/lib/widgets/rmab_search_results_sheet.dart
+++ b/lib/widgets/rmab_search_results_sheet.dart
@@ -1,6 +1,8 @@
import 'dart:async';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:flutter/material.dart';
import '../l10n/app_localizations.dart';
@@ -359,7 +361,7 @@ class _RmabResultRow extends StatelessWidget {
child: Icon(Icons.menu_book_rounded,
color: cs.onSurfaceVariant, size: 22),
)
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: book.coverArtUrl!,
fit: BoxFit.cover,
placeholder: (_, __) => Container(
diff --git a/lib/widgets/scroll_reveal.dart b/lib/widgets/scroll_reveal.dart
index 88ce0016..9bc0d7d1 100644
--- a/lib/widgets/scroll_reveal.dart
+++ b/lib/widgets/scroll_reveal.dart
@@ -59,7 +59,10 @@ class ScrollRevealDriver {
void resetToShown() {
_snapController.stop();
notifier.value = 1.0;
- _lastOffset = _attached?.offset ?? 0.0;
+ // Desktop disables the driver during the first build, before the list has
+ // attached to the controller; reading offset then threw.
+ final c = _attached;
+ _lastOffset = c != null && c.hasClients ? c.offset : 0.0;
_lastDir = 0;
}
diff --git a/lib/widgets/section_detail_sheet.dart b/lib/widgets/section_detail_sheet.dart
index 62da9ff9..3269cb3a 100644
--- a/lib/widgets/section_detail_sheet.dart
+++ b/lib/widgets/section_detail_sheet.dart
@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
import '../services/wording.dart';
@@ -332,7 +334,7 @@ class _SectionDetailSheetState extends State<SectionDetailSheet> {
return Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs));
}
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => _placeholder(cs),
diff --git a/lib/widgets/series_books_sheet.dart b/lib/widgets/series_books_sheet.dart
index 1181956a..f548227c 100644
--- a/lib/widgets/series_books_sheet.dart
+++ b/lib/widgets/series_books_sheet.dart
@@ -2,6 +2,8 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import 'package:palette_generator/palette_generator.dart';
import '../utils/cover_accent.dart';
import 'overlay_toast.dart';
@@ -125,7 +127,7 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
final brightness = Theme.of(context).brightness;
final ImageProvider provider = url.startsWith('/')
? FileImage(File(url))
- : CachedNetworkImageProvider(url, headers: context.read<LibraryProvider>().mediaHeaders);
+ : CachedNetworkImageProvider(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url, headers: context.read<LibraryProvider>().mediaHeaders);
PaletteGenerator.fromImageProvider(provider, maximumColorCount: 16).then((palette) {
final seed = accentFromCoverPalette(palette);
if (seed == null || !mounted) return;
@@ -1039,7 +1041,7 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
final url = lib.getCoverUrl(bookId);
if (url == null || url.isEmpty) return const ColoredBox(color: Colors.black26);
if (url.startsWith('/')) return Image.file(File(url), fit: BoxFit.cover);
- return CachedNetworkImage(
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: url,
httpHeaders: lib.mediaHeaders,
fit: BoxFit.cover,
@@ -1397,17 +1399,20 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
padding: const EdgeInsets.fromLTRB(16, 0, 16, 6),
child: Column(children: [
const SizedBox(height: 12),
- Center(
- child: Container(
- width: 32,
- height: 4,
- decoration: BoxDecoration(
- color: cs.onSurfaceVariant.withValues(alpha: 0.4),
- borderRadius: BorderRadius.circular(2),
+ // A desktop dialog has nothing to drag.
+ if (!ModalSurface.isDesktopOf(context)) ...[
+ Center(
+ child: Container(
+ width: 32,
+ height: 4,
+ decoration: BoxDecoration(
+ color: cs.onSurfaceVariant.withValues(alpha: 0.4),
+ borderRadius: BorderRadius.circular(2),
+ ),
),
),
- ),
- const SizedBox(height: 12),
+ const SizedBox(height: 12),
+ ],
if (_books.isNotEmpty) _coverStrip(lib, accent, nextUp),
const SizedBox(height: 10),
Text(widget.seriesName,
@@ -1446,7 +1451,9 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
clipBehavior: Clip.antiAlias,
decoration: BoxDecoration(
color: bg,
- borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
+ borderRadius: ModalSurface.isDesktopOf(context)
+ ? BorderRadius.zero
+ : const BorderRadius.vertical(top: Radius.circular(28)),
),
child: ListenableBuilder(
listenable: DownloadService(),
@@ -1615,7 +1622,7 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
? (!AppPlatform.isWeb && coverUrl.startsWith('/')
? Image.file(File(coverUrl), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder(cs))
- : CachedNetworkImage(
+ : CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
imageUrl: coverUrl, fit: BoxFit.cover,
httpHeaders: lib.mediaHeaders,
placeholder: (_, __) => _placeholder(cs),
diff --git a/lib/widgets/series_card.dart b/lib/widgets/series_card.dart
index e3d93cba..1991df62 100644
--- a/lib/widgets/series_card.dart
+++ b/lib/widgets/series_card.dart
@@ -2,6 +2,8 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart'
+ show ImageRenderMethodForWeb;
import '../l10n/app_localizations.dart';
import 'cover_badges.dart';
import '../providers/auth_provider.dart';
@@ -238,7 +240,7 @@ class _StackedCovers extends StatelessWidget {
return Image.file(File(url), fit: BoxFit.cover,
errorBuilder: (_, __, ___) => _placeholder());
}
- return CachedNetworkImage(imageUrl: url, fit: BoxFit.cover,
+ return CachedNetworkImage(imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, imageUrl: url, fit: BoxFit.cover,
httpHeaders: mediaHeaders, placeholder: (_, __) => _placeholder(),
errorWidget: (_, __, ___) => _placeholder());
}
diff --git a/pubspec.lock b/pubspec.lock
index 504b4268..f961e224 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -136,7 +136,7 @@ packages:
source: hosted
version: "3.4.1"
cached_network_image_platform_interface:
- dependency: transitive
+ dependency: "direct main"
description:
name: cached_network_image_platform_interface
sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5206aafb..36c79381 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,6 +25,9 @@ dependencies:
# Image caching
cached_network_image: ^3.3.0
+ # For ImageRenderMethodForWeb: web covers decode through Flutter instead of
+ # borrowing <img> elements the browser can empty (they drew black).
+ cached_network_image_platform_interface: ^4.1.1
# Audio playback
just_audio: