A cross platform Audiobookshelf client for Android and iOS
Dart
Add rectangle book covers setting, tap-to-dismiss expanded card
Nathan Poulson73e238c8b1bb
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dartindex c48dbca8..1bbab119 100644--- a/lib/screens/home_screen.dart+++ b/lib/screens/home_screen.dart@@ -28,6 +28,7 @@ class HomeScreen extends StatefulWidget {class _HomeScreenState extends State<HomeScreen> {final _player = AudioPlayerService();bool _hideEbookOnly = false;+ bool _rectangleCovers = false;// Cached filtered sections — invalidated when source data or settings change.List<Map<String, dynamic>>? _cachedSections;@@ -48,6 +49,7 @@ class _HomeScreenState extends State<HomeScreen> {void initState() {super.initState();_player.addListener(_onPlayerChanged);+ PlayerSettings.settingsChanged.addListener(_loadSettings);_loadSettings();Future.microtask(() {final lib = context.read<LibraryProvider>();@@ -57,8 +59,14 @@ class _HomeScreenState extends State<HomeScreen> {}Future<void> _loadSettings() async {- final hide = await PlayerSettings.getHideEbookOnly();- if (mounted) setState(() => _hideEbookOnly = hide);+ final results = await Future.wait([+ PlayerSettings.getHideEbookOnly(),+ PlayerSettings.getRectangleCovers(),+ ]);+ if (mounted) setState(() {+ _hideEbookOnly = results[0];+ _rectangleCovers = results[1];+ });}@override@@ -131,6 +139,7 @@ class _HomeScreenState extends State<HomeScreen> {@overridevoid dispose() {_player.removeListener(_onPlayerChanged);+ PlayerSettings.settingsChanged.removeListener(_loadSettings);super.dispose();}@@ -592,6 +601,7 @@ class _HomeScreenState extends State<HomeScreen> {sectionType: type,sectionId: id,onTitleTap: titleTap,+ coverAspectRatio: _rectangleCovers ? 2 / 3 : 1.0,),),];diff --git a/lib/screens/library_screen.dart b/lib/screens/library_screen.dartindex dde13e49..746c5710 100644--- a/lib/screens/library_screen.dart+++ b/lib/screens/library_screen.dart@@ -95,6 +95,10 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMibool _authorSortAsc = true;final _authorsScrollController = ScrollController();+ // ── Cover aspect ratio ──+ bool _rectangleCovers = false;+ double get _coverAspectRatio => _rectangleCovers ? 2 / 3 : 1.0;+/// Called externally (e.g. from AppShell) to focus the search field.void requestSearchFocus() {_focusNode.requestFocus();@@ -191,6 +195,9 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiPlayerSettings.getCollapseSeries().then((v) {if (mounted) setState(() => _collapseSeries = v);});+ PlayerSettings.getRectangleCovers().then((v) {+ if (mounted) setState(() => _rectangleCovers = v);+ });_restoreSortFilter().then((_) {if (!mounted) return;_lastLibraryId = lib.selectedLibraryId;@@ -273,10 +280,16 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMiFuture.wait([PlayerSettings.getHideEbookOnly(),PlayerSettings.getCollapseSeries(),+ PlayerSettings.getRectangleCovers(),]).then((values) {final newHideEbook = values[0];final newCollapse = values[1];+ final newRectCovers = values[2];if (!mounted) return;+ final coversChanged = newRectCovers != _rectangleCovers;+ if (coversChanged) {+ setState(() => _rectangleCovers = newRectCovers);+ }if (newHideEbook != _hideEbookOnly || newCollapse != _collapseSeries) {_loadGeneration++;setState(() {@@ -1281,9 +1294,9 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMicontroller: _scrollController,physics: const AlwaysScrollableScrollPhysics(),padding: const EdgeInsets.fromLTRB(16, 8, 16, 100),- gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3,- childAspectRatio: 0.68,+ childAspectRatio: _rectangleCovers ? 0.48 : 0.68,crossAxisSpacing: 10,mainAxisSpacing: 10,),@@ -1299,9 +1312,9 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi}final item = _items[index];if (item.containsKey('collapsedSeries')) {- return GridSeriesTile(item: item);+ return GridSeriesTile(item: item, coverAspectRatio: _coverAspectRatio);}- return GridBookTile(item: item);+ return GridBookTile(item: item, coverAspectRatio: _coverAspectRatio);},),);@@ -1345,9 +1358,9 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMicontroller: _seriesScrollController,physics: const AlwaysScrollableScrollPhysics(),padding: const EdgeInsets.fromLTRB(16, 8, 16, 100),- gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3,- childAspectRatio: 0.68,+ childAspectRatio: _rectangleCovers ? 0.48 : 0.68,crossAxisSpacing: 10,mainAxisSpacing: 10,),@@ -1361,7 +1374,7 @@ class LibraryScreenState extends State<LibraryScreen> with TickerProviderStateMi),);}- return GridSeriesTileDirect(series: _seriesItems[index]);+ return GridSeriesTileDirect(series: _seriesItems[index], coverAspectRatio: _coverAspectRatio);},),);diff --git a/lib/widgets/absorbing_card.dart b/lib/widgets/absorbing_card.dartindex a5e68ff5..22a4de87 100644--- a/lib/widgets/absorbing_card.dart+++ b/lib/widgets/absorbing_card.dart@@ -46,6 +46,7 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCliList<String> _buttonOrder = PlayerSettings.defaultButtonOrder;String _buttonLayout = PlayerSettings.defaultButtonLayout;bool _autoRemoveFinished = false;+ bool _rectangleCovers = false;@overridebool get wantKeepAlive => true;@@ -136,6 +137,9 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveCliPlayerSettings.getCardButtonLayout().then((l) {if (mounted && l != _buttonLayout) setState(() => _buttonLayout = l);});+ PlayerSettings.getRectangleCovers().then((v) {+ if (mounted && v != _rectangleCovers) setState(() => _rectangleCovers = v);+ });}void _onDownloadChanged() { if (mounted) setState(() {}); }@@ -496,11 +500,18 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClilistenable: ChromecastService(),builder: (context, _) => LayoutBuilder(builder: (context, constraints) {- final coverWidth = constraints.maxWidth * 0.85;- // Use the smaller of desired width or available height to prevent squishing- final coverSize = coverWidth < constraints.maxHeight- ? coverWidth- : constraints.maxHeight;+ final maxW = constraints.maxWidth * 0.85;+ final maxH = constraints.maxHeight;+ double coverW, coverH;+ if (_rectangleCovers) {+ coverW = maxW;+ coverH = coverW * 1.5;+ if (coverH > maxH) { coverH = maxH; coverW = coverH / 1.5; }+ } else {+ final s = maxW < maxH ? maxW : maxH;+ coverW = s;+ coverH = s;+ }final dlKey = _episodeId != null ? '$_itemId-$_episodeId' : _itemId;final isDownloaded = DownloadService().isDownloaded(dlKey);final castService = ChromecastService();@@ -508,8 +519,8 @@ class AbsorbingCardState extends State<AbsorbingCard> with AutomaticKeepAliveClireturn GestureDetector(onTap: () => _expandCard(context),child: Container(- width: coverSize,- height: coverSize,+ width: coverW,+ height: coverH,decoration: BoxDecoration(borderRadius: BorderRadius.circular(16),boxShadow: [diff --git a/lib/widgets/book_card.dart b/lib/widgets/book_card.dartindex 0720158d..77952013 100644--- a/lib/widgets/book_card.dart+++ b/lib/widgets/book_card.dart@@ -11,12 +11,14 @@ class BookCard extends StatelessWidget {final Map<String, dynamic> item;final bool showProgress;final bool isWide;+ final double coverAspectRatio;const BookCard({super.key,required this.item,this.showProgress = false,this.isWide = false,+ this.coverAspectRatio = 1.0,});@override@@ -188,9 +190,9 @@ class BookCard extends StatelessWidget {crossAxisAlignment: CrossAxisAlignment.start,mainAxisSize: MainAxisSize.min,children: [- // Square cover+ // CoverAspectRatio(- aspectRatio: 1,+ aspectRatio: coverAspectRatio,child: _PressableCard(onTap: () => _navigateToDetail(context),borderRadius: 12,@@ -282,7 +284,7 @@ class BookCard extends StatelessWidget {padding: const EdgeInsets.symmetric(horizontal: 2),child: Text(title,- maxLines: 2,+ maxLines: coverAspectRatio < 1.0 ? 1 : 2,overflow: TextOverflow.ellipsis,style: tt.labelMedium?.copyWith(fontWeight: FontWeight.w500,diff --git a/lib/widgets/expanded_card.dart b/lib/widgets/expanded_card.dartindex f7b156a6..19cb480b 100644--- a/lib/widgets/expanded_card.dart+++ b/lib/widgets/expanded_card.dart@@ -91,6 +91,7 @@ class _ExpandedCardState extends State<ExpandedCard> {List<String> _buttonOrder = PlayerSettings.defaultButtonOrder;String _buttonLayout = PlayerSettings.defaultButtonLayout;bool _autoRemoveFinished = false;+ bool _rectangleCovers = false;// Our own route, captured for popUntil when modals are stacked above usRoute<dynamic>? _ownRoute;@@ -185,6 +186,9 @@ class _ExpandedCardState extends State<ExpandedCard> {PlayerSettings.getCardButtonLayout().then((l) {if (mounted && l != _buttonLayout) setState(() => _buttonLayout = l);});+ PlayerSettings.getRectangleCovers().then((v) {+ if (mounted && v != _rectangleCovers) setState(() => _rectangleCovers = v);+ });}void _loadWhenFinished() {@@ -574,15 +578,25 @@ class _ExpandedCardState extends State<ExpandedCard> {listenable: ChromecastService(),builder: (context, _) => LayoutBuilder(builder: (context, constraints) {- final coverWidth = constraints.maxWidth * 0.90;- final coverSize = coverWidth < constraints.maxHeight ? coverWidth : constraints.maxHeight;+ final maxW = constraints.maxWidth * 0.90;+ final maxH = constraints.maxHeight;+ double coverW, coverH;+ if (_rectangleCovers) {+ coverW = maxW;+ coverH = coverW * 1.5;+ if (coverH > maxH) { coverH = maxH; coverW = coverH / 1.5; }+ } else {+ final s = maxW < maxH ? maxW : maxH;+ coverW = s;+ coverH = s;+ }final dlKey = _episodeId != null ? '$_itemId-$_episodeId' : _itemId;final isDownloaded = DownloadService().isDownloaded(dlKey);final castService = ChromecastService();final isCastingThis = castService.isCasting && castService.castingItemId == _itemId;return Container(- width: coverSize,- height: coverSize,+ width: coverW,+ height: coverH,decoration: BoxDecoration(borderRadius: BorderRadius.circular(16),boxShadow: [diff --git a/lib/widgets/home_section.dart b/lib/widgets/home_section.dartindex 88e1cfe7..3004fabb 100644--- a/lib/widgets/home_section.dart+++ b/lib/widgets/home_section.dart@@ -14,6 +14,7 @@ class HomeSection extends StatelessWidget {final String sectionType;final String sectionId;final VoidCallback? onTitleTap;+ final double coverAspectRatio;const HomeSection({super.key,@@ -23,6 +24,7 @@ class HomeSection extends StatelessWidget {required this.sectionType,required this.sectionId,this.onTitleTap,+ this.coverAspectRatio = 1.0,});@override@@ -42,10 +44,11 @@ class HomeSection extends StatelessWidget {(entities.first as Map<String, dynamic>)['recentEpisode'] != null;final effectiveEpisode = isEpisodeSection || hasEpisodeEntities;+ final bool isRectCover = coverAspectRatio < 1.0;final double cardWidth =isContinueListening ? 300 : (isAuthorSection ? 120 : 140);final double cardHeight =- isContinueListening ? 120 : effectiveEpisode ? 200 : (isAuthorSection ? 170 : 200);+ isContinueListening ? 120 : effectiveEpisode ? 200 : (isAuthorSection ? 170 : (isRectCover ? 260 : 200));return Padding(padding: const EdgeInsets.only(top: 24),@@ -126,7 +129,7 @@ class HomeSection extends StatelessWidget {if (isSeriesSection) {return SizedBox(width: cardWidth,- child: SeriesCard(series: entity),+ child: SeriesCard(series: entity, coverAspectRatio: coverAspectRatio),);}@@ -154,6 +157,7 @@ class HomeSection extends StatelessWidget {item: entity,showProgress: isContinueListening,isWide: isContinueListening,+ coverAspectRatio: isContinueListening ? 1.0 : coverAspectRatio,),);},diff --git a/lib/widgets/library_grid_tiles.dart b/lib/widgets/library_grid_tiles.dartindex a0b27283..5eade36a 100644--- a/lib/widgets/library_grid_tiles.dart+++ b/lib/widgets/library_grid_tiles.dart@@ -15,8 +15,9 @@ import 'author_books_sheet.dart';// ═══════════════════════════════════════════════════════════════class GridBookTile extends StatefulWidget {final Map<String, dynamic> item;+ final double coverAspectRatio;- const GridBookTile({super.key, required this.item});+ const GridBookTile({super.key, required this.item, this.coverAspectRatio = 1.0});@overrideState<GridBookTile> createState() => _GridBookTileState();@@ -70,9 +71,9 @@ class _GridBookTileState extends State<GridBookTile> {child: Column(crossAxisAlignment: CrossAxisAlignment.start,children: [- // Cover — 1:1 square+ // CoverAspectRatio(- aspectRatio: 1,+ aspectRatio: widget.coverAspectRatio,child: ClipRRect(borderRadius: BorderRadius.circular(10),child: Stack(@@ -209,6 +210,7 @@ class _StackedCovers extends StatelessWidget {final ColorScheme cs;final double seriesProgress;final int booksFinished;+ final double coverAspectRatio;const _StackedCovers({required this.coverUrls,@@ -217,6 +219,7 @@ class _StackedCovers extends StatelessWidget {required this.cs,this.seriesProgress = 0,this.booksFinished = 0,+ this.coverAspectRatio = 1.0,});@override@@ -227,7 +230,7 @@ class _StackedCovers extends StatelessWidget {final totalOffset = count > 1 ? inset * (count - 1) : 0.0;return AspectRatio(- aspectRatio: 1,+ aspectRatio: coverAspectRatio,child: Stack(children: [// Back covers (furthest back first so front paints on top)@@ -388,7 +391,8 @@ class _StackedCovers extends StatelessWidget {// ═══════════════════════════════════════════════════════════════class GridSeriesTile extends StatelessWidget {final Map<String, dynamic> item;- const GridSeriesTile({super.key, required this.item});+ final double coverAspectRatio;+ const GridSeriesTile({super.key, required this.item, this.coverAspectRatio = 1.0});@overrideWidget build(BuildContext context) {@@ -451,6 +455,7 @@ class GridSeriesTile extends StatelessWidget {cs: cs,seriesProgress: seriesProgress,booksFinished: finished,+ coverAspectRatio: coverAspectRatio,),const SizedBox(height: 5),Text(@@ -486,7 +491,8 @@ class GridSeriesTile extends StatelessWidget {// ═══════════════════════════════════════════════════════════════class GridSeriesTileDirect extends StatelessWidget {final Map<String, dynamic> series;- const GridSeriesTileDirect({super.key, required this.series});+ final double coverAspectRatio;+ const GridSeriesTileDirect({super.key, required this.series, this.coverAspectRatio = 1.0});@overrideWidget build(BuildContext context) {@@ -557,6 +563,7 @@ class GridSeriesTileDirect extends StatelessWidget {cs: cs,seriesProgress: seriesProgress,booksFinished: finished,+ coverAspectRatio: coverAspectRatio,),const SizedBox(height: 5),Text(diff --git a/lib/widgets/series_card.dart b/lib/widgets/series_card.dartindex 0cc60de3..af4280e5 100644--- a/lib/widgets/series_card.dart+++ b/lib/widgets/series_card.dart@@ -8,8 +8,9 @@ import 'series_books_sheet.dart';class SeriesCard extends StatelessWidget {final Map<String, dynamic> series;+ final double coverAspectRatio;- const SeriesCard({super.key, required this.series});+ const SeriesCard({super.key, required this.series, this.coverAspectRatio = 1.0});@overrideWidget build(BuildContext context) {@@ -67,7 +68,7 @@ class SeriesCard extends StatelessWidget {children: [// Stacked coversAspectRatio(- aspectRatio: 1,+ aspectRatio: coverAspectRatio,child: _StackedCovers(coverUrls: coverUrls,numBooks: bookCount,