Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Make cover sizes match across the library, home and sheets, and fix tiny covers in sheets in landscape

Barnabas544ec22a9047
diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dart
index 0fee3e22..386599e3 100644
--- a/lib/screens/library_screen.dart
+++ b/lib/screens/library_screen.dart
@@ -33,7 +33,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, CoverGridScope;
import '../widgets/offline_status_icon.dart';
import '../widgets/rmab_config_sheet.dart'
show kRmabBaseUrlKey, kRmabApiTokenKey;
@@ -3451,15 +3451,18 @@ class LibraryScreenState extends State<LibraryScreen>
final effectiveTab = _currentTab;
Widget headerFor(int i) =>
_buildHeaderSliver(context, useSharedFocus: i == effectiveTab);
- return IndexedStack(
- index: effectiveTab,
- children: [
- _buildGrid(headerFor(0)),
- _buildSeriesGrid(headerFor(1)),
- _buildAuthorsGrid(headerFor(2)),
- _buildNarratorsGrid(headerFor(3)),
- _buildListsGrid(headerFor(4)),
- ],
+ // Beside a navigation rail the grid gets less than the screen's width.
+ return CoverGridScope(
+ child: IndexedStack(
+ index: effectiveTab,
+ children: [
+ _buildGrid(headerFor(0)),
+ _buildSeriesGrid(headerFor(1)),
+ _buildAuthorsGrid(headerFor(2)),
+ _buildNarratorsGrid(headerFor(3)),
+ _buildListsGrid(headerFor(4)),
+ ],
+ ),
);
}
diff --git a/lib/widgets/books_sheet_shared.dart b/lib/widgets/books_sheet_shared.dart
index 27ec0dc9..2f887cc1 100644
--- a/lib/widgets/books_sheet_shared.dart
+++ b/lib/widgets/books_sheet_shared.dart
@@ -21,11 +21,58 @@ void registerBookCovers(LibraryProvider lib, Iterable<Map<String, dynamic>> book
}
}
+/// Hands cover grids the width they actually get. Sheets are capped narrower
+/// than the screen (640 in landscape), and sizing their grids from the screen
+/// packed a landscape phone's worth of columns into a sheet - tiny covers
+/// whatever the cover size setting said. Wrap anything holding a cover grid
+/// that isn't full screen width.
+class CoverGridScope extends StatelessWidget {
+ final Widget child;
+ const CoverGridScope({super.key, required this.child});
+
+ @override
+ Widget build(BuildContext context) => LayoutBuilder(
+ builder: (context, constraints) => _CoverGridWidth(
+ width: constraints.maxWidth.isFinite
+ ? constraints.maxWidth
+ : MediaQuery.sizeOf(context).width,
+ child: child,
+ ),
+ );
+}
+
+class _CoverGridWidth extends InheritedWidget {
+ final double width;
+ const _CoverGridWidth({required this.width, required super.child});
+
+ @override
+ bool updateShouldNotify(_CoverGridWidth oldWidget) =>
+ oldWidget.width != width;
+}
+
+double _coverGridWidth(BuildContext context) =>
+ context.dependOnInheritedWidgetOfExactType<_CoverGridWidth>()?.width ??
+ MediaQuery.sizeOf(context).width;
+
+/// How much the cover size setting scales fixed-width covers, like the home
+/// shelves, so they match the grid tiles: on a phone the grid lands near
+/// 90/120/170 wide for small/medium/large.
+double coverSizeScale() {
+ switch (PlayerSettings.coverSize) {
+ case 'small':
+ return 0.75;
+ case 'large':
+ return 1.4;
+ default:
+ return 1.0;
+ }
+}
+
/// Column count for cover grids. Small/large scale the width-based medium
/// count by a third, so phones land on exactly 4/3/2 columns no matter their
/// display scale while tablets move proportionally (e.g. 8/6/4).
int coverGridCount(BuildContext context) {
- final width = MediaQuery.of(context).size.width;
+ final width = _coverGridWidth(context);
final base = (width / 130).floor().clamp(3, 10);
switch (PlayerSettings.coverSize) {
case 'small':
@@ -40,7 +87,7 @@ int coverGridCount(BuildContext context) {
/// Width of one tile in a cover grid at the current cover size.
double coverGridTileWidth(BuildContext context) {
final columns = coverGridCount(context);
- final width = MediaQuery.of(context).size.width;
+ final width = _coverGridWidth(context);
return (width - 32 - 10 * (columns - 1)) / columns;
}
@@ -59,22 +106,20 @@ double coverGridSubtitleHeight(BuildContext context) =>
/// caching only saves the download - every tile scrolled into view still
/// decodes its bitmap, so decoding at tile size instead of the full server
/// cover is what keeps a long scroll from ballooning memory.
-int coverGridDecodeWidth(BuildContext context) {
- final columns = coverGridCount(context);
- final mq = MediaQuery.of(context);
- final tile = (mq.size.width - 32 - 10 * (columns - 1)) / columns;
- return (tile * mq.devicePixelRatio).round();
-}
+int coverGridDecodeWidth(BuildContext context) =>
+ (coverGridTileWidth(context) * MediaQuery.devicePixelRatioOf(context))
+ .round();
-/// Standard grid delegate for book grids inside sheets.
+/// Standard grid delegate for book grids inside sheets. Same spacing as the
+/// library grid, so a cover size setting lands on the same tiles everywhere.
SliverGridDelegateWithFixedCrossAxisCount sheetBookGridDelegate(
BuildContext context, {
double childAspectRatio = 0.55,
}) {
return SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: coverGridCount(context),
- mainAxisSpacing: 8,
- crossAxisSpacing: 8,
+ mainAxisSpacing: 10,
+ crossAxisSpacing: 10,
childAspectRatio: childAspectRatio,
);
}
diff --git a/lib/widgets/collection_detail_sheet.dart b/lib/widgets/collection_detail_sheet.dart
index 35cae49b..c98b9ab6 100644
--- a/lib/widgets/collection_detail_sheet.dart
+++ b/lib/widgets/collection_detail_sheet.dart
@@ -583,8 +583,8 @@ class _CollectionDetailSheetState extends State<CollectionDetailSheet> {
.copyWith(bottom: 40),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: coverGridCount(context),
- mainAxisSpacing: 12,
- crossAxisSpacing: 12,
+ mainAxisSpacing: 10,
+ crossAxisSpacing: 10,
childAspectRatio: 0.62,
),
itemCount: books.length,
diff --git a/lib/widgets/finished_books_this_year_sheet.dart b/lib/widgets/finished_books_this_year_sheet.dart
index 5222335b..0e824f15 100644
--- a/lib/widgets/finished_books_this_year_sheet.dart
+++ b/lib/widgets/finished_books_this_year_sheet.dart
@@ -310,8 +310,8 @@ class _FinishedBooksThisYearSheetState
padding: EdgeInsets.fromLTRB(16, 4, 16, bottomPad),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: coverGridCount(context),
- mainAxisSpacing: 12,
- crossAxisSpacing: 12,
+ mainAxisSpacing: 10,
+ crossAxisSpacing: 10,
childAspectRatio: 0.55,
),
itemCount: _items.length,
diff --git a/lib/widgets/home_section.dart b/lib/widgets/home_section.dart
index 7b736c72..06cc3cc8 100644
--- a/lib/widgets/home_section.dart
+++ b/lib/widgets/home_section.dart
@@ -9,6 +9,7 @@ import 'book_card.dart';
import 'author_card.dart';
import 'series_card.dart';
import 'episode_list_sheet.dart';
+import 'books_sheet_shared.dart' show coverSizeScale;
class HomeSection extends StatelessWidget {
final String title;
@@ -66,15 +67,31 @@ class HomeSection extends StatelessWidget {
final effectiveEpisode = isEpisodeSection || hasEpisodeEntities;
final bool isRectCover = coverAspectRatio < 1.0;
- final double cardWidth =
- isContinueListening ? 300 : (isAuthorSection ? 120 : 140);
+ // Book and series covers follow the cover size setting like the library
+ // grid does; the wide continue card, authors and episodes keep their size.
+ final bool coverCard =
+ !isContinueListening && !effectiveEpisode && !isAuthorSection;
+ final double cardWidth = isContinueListening
+ ? 300
+ : isAuthorSection
+ ? 120
+ : coverCard
+ ? 140 * coverSizeScale()
+ : 140;
// Book cards grow by a line when subtitles are on; author and episode
// cards have no subtitle to show, so they stay as they are.
final bool subtitleLine =
showSubtitles && !isContinueListening && !effectiveEpisode && !isAuthorSection;
final double cardHeight =
- (isContinueListening ? 120 : effectiveEpisode ? 200 : (isAuthorSection ? 170 : (isRectCover ? 260 : 200)))
- + (subtitleLine ? 18 : 0);
+ (isContinueListening
+ ? 120
+ : effectiveEpisode
+ ? 200
+ : isAuthorSection
+ ? 170
+ : (isRectCover ? 260 : 200) +
+ (cardWidth - 140) / coverAspectRatio) +
+ (subtitleLine ? 18 : 0);
return Padding(
padding: const EdgeInsets.only(top: 24),
diff --git a/lib/widgets/playlist_detail_sheet.dart b/lib/widgets/playlist_detail_sheet.dart
index 1b7ea44a..4fa0ea93 100644
--- a/lib/widgets/playlist_detail_sheet.dart
+++ b/lib/widgets/playlist_detail_sheet.dart
@@ -710,8 +710,8 @@ class _PlaylistDetailSheetState extends State<PlaylistDetailSheet> {
.copyWith(bottom: 40),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: coverGridCount(context),
- mainAxisSpacing: 12,
- crossAxisSpacing: 12,
+ mainAxisSpacing: 10,
+ crossAxisSpacing: 10,
childAspectRatio: 0.62,
),
itemCount: items.length,
diff --git a/lib/widgets/section_detail_sheet.dart b/lib/widgets/section_detail_sheet.dart
index 62da9ff9..0f92f360 100644
--- a/lib/widgets/section_detail_sheet.dart
+++ b/lib/widgets/section_detail_sheet.dart
@@ -254,8 +254,8 @@ class _SectionDetailSheetState extends State<SectionDetailSheet> {
.copyWith(bottom: 40),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: coverGridCount(context),
- mainAxisSpacing: 12,
- crossAxisSpacing: 12,
+ mainAxisSpacing: 10,
+ crossAxisSpacing: 10,
childAspectRatio: childAspectRatio,
),
itemCount: widget.entities.length,
diff --git a/lib/widgets/series_books_sheet.dart b/lib/widgets/series_books_sheet.dart
index 46ef96af..c78ef0a3 100644
--- a/lib/widgets/series_books_sheet.dart
+++ b/lib/widgets/series_books_sheet.dart
@@ -256,7 +256,7 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
const groupHeaderExtent = 68.0;
final columns = coverGridCount(context);
final width = context.size?.width ?? MediaQuery.sizeOf(context).width;
- final gridRowExtent = ((width - 32 - 8 * (columns - 1)) / columns) / 0.65 + 8;
+ final gridRowExtent = ((width - 32 - 10 * (columns - 1)) / columns) / 0.65 + 10;
if (!_collapseSeries) {
final index = _books.indexWhere((b) => b['id'] == bookId);
diff --git a/lib/widgets/stackable_sheet.dart b/lib/widgets/stackable_sheet.dart
index 50cd80ad..2b283721 100644
--- a/lib/widgets/stackable_sheet.dart
+++ b/lib/widgets/stackable_sheet.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'books_sheet_shared.dart';
const int maxSheetDepth = 3;
final List<Route<dynamic>> _activeSheetRoutes = [];
@@ -37,12 +38,16 @@ Future<T?> showStackableSheet<T>({
enableDrag: true,
useSafeArea: useSafeArea,
backgroundColor: backgroundColor ?? (showHandle ? null : Colors.transparent),
- builder: (_) => _StackableSheet(
- initialChildSize: initialChildSize,
- minChildSize: minChildSize,
- maxChildSize: maxChildSize,
- showHandle: showHandle,
- builder: builder,
+ // Sheets are capped narrower than a landscape screen; cover grids inside
+ // size their columns from the sheet, not the screen.
+ builder: (_) => CoverGridScope(
+ child: _StackableSheet(
+ initialChildSize: initialChildSize,
+ minChildSize: minChildSize,
+ maxChildSize: maxChildSize,
+ showHandle: showHandle,
+ builder: builder,
+ ),
),
);
}