kickoff library item

This commit is contained in:
Dr-Blank 2024-05-09 23:23:50 -04:00
parent f8597f7430
commit 6c60d1c6ed
No known key found for this signature in database
GPG key ID: 7452CC63F210A266
13 changed files with 439 additions and 99 deletions

View file

@ -83,19 +83,20 @@ class PersonalizedView extends _$PersonalizedView {
final apiSettings = ref.watch(apiSettingsProvider); final apiSettings = ref.watch(apiSettingsProvider);
final user = apiSettings.activeUser; final user = apiSettings.activeUser;
if (apiSettings.activeLibraryId == null) { if (apiSettings.activeLibraryId == null) {
// set it to default user library by logging in and getting the library id // set it to default user library by logging in and getting the library id
final login = final login =
await api.login(username: user!.username!, password: user.password!); await api.login(username: user!.username!, password: user.password!);
ref.read(apiSettingsProvider.notifier).updateState( ref.read(apiSettingsProvider.notifier).updateState(
apiSettings.copyWith(activeLibraryId: login!.userDefaultLibraryId), apiSettings.copyWith(activeLibraryId: login!.userDefaultLibraryId),
); );
} }
// try to find in cache // try to find in cache
// final cacheKey = 'personalizedView:${apiSettings.activeLibraryId}'; // final cacheKey = 'personalizedView:${apiSettings.activeLibraryId}';
var key = 'personalizedView:${apiSettings.activeLibraryId! + user!.id!}'; var key = 'personalizedView:${apiSettings.activeLibraryId! + user!.id!}';
final cachedRes = await apiResponseCacheManager.getFileFromCache( final cachedRes = await apiResponseCacheManager.getFileFromMemory(
key, key,
); ) ??
await apiResponseCacheManager.getFileFromCache(key);
if (cachedRes != null) { if (cachedRes != null) {
final resJson = jsonDecode(await cachedRes.file.readAsString()) as List; final resJson = jsonDecode(await cachedRes.file.readAsString()) as List;
final res = [ final res = [
@ -107,8 +108,8 @@ class PersonalizedView extends _$PersonalizedView {
} }
// ! exagerated delay // ! exagerated delay
await Future.delayed(const Duration(seconds: 2)); // await Future.delayed(const Duration(seconds: 2));
final res = await api.libraries final res = await api.libraries
.getPersonalized(libraryId: apiSettings.activeLibraryId!); .getPersonalized(libraryId: apiSettings.activeLibraryId!);
// debugPrint('personalizedView: ${res!.map((e) => e).toSet()}'); // debugPrint('personalizedView: ${res!.map((e) => e).toSet()}');
// save to cache // save to cache

View file

@ -348,7 +348,7 @@ final fetchContinueListeningProvider =
typedef FetchContinueListeningRef typedef FetchContinueListeningRef
= AutoDisposeFutureProviderRef<GetUserSessionsResponse>; = AutoDisposeFutureProviderRef<GetUserSessionsResponse>;
String _$personalizedViewHash() => r'52a89c46ce668238ca11b5394fd1d14c910947f5'; String _$personalizedViewHash() => r'2e70fe2bfc766a963f7a8e94211ad50d959fbaa2';
/// fetch the personalized view /// fetch the personalized view
/// ///

View file

@ -24,7 +24,8 @@ class CoverImage extends _$CoverImage {
// await Future.delayed(const Duration(seconds: 2)); // await Future.delayed(const Duration(seconds: 2));
// try to get the image from the cache // try to get the image from the cache
final file = await imageCacheManager.getFileFromCache(libraryItem.id); final file = await imageCacheManager.getFileFromMemory(libraryItem.id) ??
await imageCacheManager.getFileFromCache(libraryItem.id);
if (file != null) { if (file != null) {
// if the image is in the cache, yield it // if the image is in the cache, yield it
@ -34,6 +35,9 @@ class CoverImage extends _$CoverImage {
yield await file.file.readAsBytes(); yield await file.file.readAsBytes();
// return if no need to fetch from the server // return if no need to fetch from the server
if (libraryItem.updatedAt.isBefore(await file.file.lastModified())) { if (libraryItem.updatedAt.isBefore(await file.file.lastModified())) {
debugPrint(
'cover image is up to date for ${libraryItem.id}, no need to fetch from the server',
);
return; return;
} else { } else {
debugPrint( debugPrint(
@ -45,17 +49,20 @@ class CoverImage extends _$CoverImage {
// check if the image is in the cache // check if the image is in the cache
final coverImage = await api.items.getCover( final coverImage = await api.items.getCover(
libraryItemId: libraryItem.id, libraryItemId: libraryItem.id,
parameters: const GetImageReqParams(width: 1000), parameters: const GetImageReqParams(width: 1200),
); );
// save the image to the cache // save the image to the cache
final newFile = await imageCacheManager.putFile( if (coverImage != null) {
libraryItem.id, final newFile = await imageCacheManager.putFile(
coverImage ?? Uint8List(0), libraryItem.id,
key: libraryItem.id, coverImage,
); key: libraryItem.id,
debugPrint( );
'cover image fetched for for ${libraryItem.id}, file time: ${await newFile.lastModified()}', debugPrint(
); 'cover image fetched for for ${libraryItem.id}, file time: ${await newFile.lastModified()}',
);
}
yield coverImage ?? Uint8List(0); yield coverImage ?? Uint8List(0);
} }
} }

View file

@ -6,7 +6,7 @@ part of 'image_provider.dart';
// RiverpodGenerator // RiverpodGenerator
// ************************************************************************** // **************************************************************************
String _$coverImageHash() => r'57a164772b0350cd451535ed9d6347ff74671d2e'; String _$coverImageHash() => r'010200735fbe7567ffdaad68bc5a98a475dfda42';
/// Copied from Dart SDK /// Copied from Dart SDK
class _SystemHash { class _SystemHash {

View file

@ -0,0 +1,49 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk;
import 'package:whispering_pages/api/api_provider.dart';
import 'package:whispering_pages/db/cache/cache_key.dart';
import 'package:whispering_pages/db/cache_manager.dart';
part 'library_item_provider.g.dart';
/// provides the library item for the given id
@riverpod
class LibraryItem extends _$LibraryItem {
@override
Stream<shelfsdk.LibraryItem> build(String id) async* {
final api = ref.watch(authenticatedApiProvider);
debugPrint('fetching library item: $id');
// ! this is a mock delay
// await Future.delayed(const Duration(seconds: 10));
// look for the item in the cache
final key = CacheKey.libraryItem(id);
final cachedFile = await apiResponseCacheManager.getFileFromMemory(key) ??
await apiResponseCacheManager.getFileFromCache(key);
if (cachedFile != null) {
debugPrint('reading from cache for $id from ${cachedFile.file}');
// read file as json
final cachedItem = shelfsdk.LibraryItem.fromJson(
jsonDecode(await cachedFile.file.readAsString()),
);
yield cachedItem;
}
final item = await api.items.get(libraryItemId: id);
if (item != null) {
// save to cache
final newFile = await apiResponseCacheManager.putFile(
key,
utf8.encode(jsonEncode(item)),
fileExtension: 'json',
key: key,
);
debugPrint('writing to cache: $newFile');
yield item;
}
}
}

View file

@ -0,0 +1,187 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'library_item_provider.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$libraryItemHash() => r'c7919065062e066a0d086508ca6c44187b0bc257';
/// Copied from Dart SDK
class _SystemHash {
_SystemHash._();
static int combine(int hash, int value) {
// ignore: parameter_assignments
hash = 0x1fffffff & (hash + value);
// ignore: parameter_assignments
hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
return hash ^ (hash >> 6);
}
static int finish(int hash) {
// ignore: parameter_assignments
hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
// ignore: parameter_assignments
hash = hash ^ (hash >> 11);
return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
}
}
abstract class _$LibraryItem
extends BuildlessAutoDisposeStreamNotifier<shelfsdk.LibraryItem> {
late final String id;
Stream<shelfsdk.LibraryItem> build(
String id,
);
}
/// provides the library item for the given id
///
/// Copied from [LibraryItem].
@ProviderFor(LibraryItem)
const libraryItemProvider = LibraryItemFamily();
/// provides the library item for the given id
///
/// Copied from [LibraryItem].
class LibraryItemFamily extends Family<AsyncValue<shelfsdk.LibraryItem>> {
/// provides the library item for the given id
///
/// Copied from [LibraryItem].
const LibraryItemFamily();
/// provides the library item for the given id
///
/// Copied from [LibraryItem].
LibraryItemProvider call(
String id,
) {
return LibraryItemProvider(
id,
);
}
@override
LibraryItemProvider getProviderOverride(
covariant LibraryItemProvider provider,
) {
return call(
provider.id,
);
}
static const Iterable<ProviderOrFamily>? _dependencies = null;
@override
Iterable<ProviderOrFamily>? get dependencies => _dependencies;
static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
@override
Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
_allTransitiveDependencies;
@override
String? get name => r'libraryItemProvider';
}
/// provides the library item for the given id
///
/// Copied from [LibraryItem].
class LibraryItemProvider extends AutoDisposeStreamNotifierProviderImpl<
LibraryItem, shelfsdk.LibraryItem> {
/// provides the library item for the given id
///
/// Copied from [LibraryItem].
LibraryItemProvider(
String id,
) : this._internal(
() => LibraryItem()..id = id,
from: libraryItemProvider,
name: r'libraryItemProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$libraryItemHash,
dependencies: LibraryItemFamily._dependencies,
allTransitiveDependencies:
LibraryItemFamily._allTransitiveDependencies,
id: id,
);
LibraryItemProvider._internal(
super._createNotifier, {
required super.name,
required super.dependencies,
required super.allTransitiveDependencies,
required super.debugGetCreateSourceHash,
required super.from,
required this.id,
}) : super.internal();
final String id;
@override
Stream<shelfsdk.LibraryItem> runNotifierBuild(
covariant LibraryItem notifier,
) {
return notifier.build(
id,
);
}
@override
Override overrideWith(LibraryItem Function() create) {
return ProviderOverride(
origin: this,
override: LibraryItemProvider._internal(
() => create()..id = id,
from: from,
name: null,
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
id: id,
),
);
}
@override
AutoDisposeStreamNotifierProviderElement<LibraryItem, shelfsdk.LibraryItem>
createElement() {
return _LibraryItemProviderElement(this);
}
@override
bool operator ==(Object other) {
return other is LibraryItemProvider && other.id == id;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, id.hashCode);
return _SystemHash.finish(hash);
}
}
mixin LibraryItemRef
on AutoDisposeStreamNotifierProviderRef<shelfsdk.LibraryItem> {
/// The parameter `id` of this provider.
String get id;
}
class _LibraryItemProviderElement
extends AutoDisposeStreamNotifierProviderElement<LibraryItem,
shelfsdk.LibraryItem> with LibraryItemRef {
_LibraryItemProviderElement(super.provider);
@override
String get id => (origin as LibraryItemProvider).id;
}
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

5
lib/db/cache/cache_key.dart vendored Normal file
View file

@ -0,0 +1,5 @@
class CacheKey {
static libraryItem(String id) {
return 'library_item_$id';
}
}

View file

@ -12,25 +12,34 @@ void main() async {
// initialize the storage // initialize the storage
await initStorage(); await initStorage();
runApp(const ProviderScope(
child: MyApp(), runApp(
const ProviderScope(
child: MyApp(),
), ),
); );
} }
// final _router = MyAppRouter(needOnboarding: _needAuth());
// bool _needAuth() {
// final apiSettings = ApiSettings().readFromBoxOrCreate();
// final servers = AudiobookShelfServer().readFromBoxOrCreate();
// return apiSettings.activeUser == null || servers.isEmpty;
// }
class MyApp extends ConsumerWidget { class MyApp extends ConsumerWidget {
const MyApp({super.key}); const MyApp({super.key});
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final servers = ref.watch(audiobookShelfServerProvider); final servers = ref.watch(audiobookShelfServerProvider);
final appSettings = ref.watch(appSettingsProvider);
final apiSettings = ref.watch(apiSettingsProvider); final apiSettings = ref.watch(apiSettingsProvider);
bool needOnboarding() { bool needOnboarding() {
return apiSettings.activeUser == null || servers.isEmpty; return apiSettings.activeUser == null || servers.isEmpty;
} }
return MaterialApp.router( return MaterialApp.router(
theme: lightTheme, theme: lightTheme,
darkTheme: darkTheme, darkTheme: darkTheme,
@ -38,6 +47,8 @@ class MyApp extends ConsumerWidget {
? ThemeMode.dark ? ThemeMode.dark
: ThemeMode.light, : ThemeMode.light,
routerConfig: MyAppRouter(needOnboarding: needOnboarding()).config, routerConfig: MyAppRouter(needOnboarding: needOnboarding()).config,
// routerConfig: _router.config,
); );
} }
} }

View file

@ -1,8 +1,12 @@
import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:whispering_pages/api/api_provider.dart'; import 'package:whispering_pages/api/image_provider.dart';
import 'package:whispering_pages/api/library_item_provider.dart';
import 'package:whispering_pages/extensions/hero_tag_conventions.dart'; import 'package:whispering_pages/extensions/hero_tag_conventions.dart';
import 'package:whispering_pages/router/models/library_item_extras.dart'; import 'package:whispering_pages/router/models/library_item_extras.dart';
import 'package:whispering_pages/widgets/shelves/book_shelf.dart';
class LibraryItemPage extends HookConsumerWidget { class LibraryItemPage extends HookConsumerWidget {
const LibraryItemPage({ const LibraryItemPage({
@ -15,24 +19,119 @@ class LibraryItemPage extends HookConsumerWidget {
final Object? extra; final Object? extra;
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final views = ref.watch(personalizedViewProvider);
final extraMap = final extraMap =
extra is LibraryItemExtras ? extra as LibraryItemExtras : null; extra is LibraryItemExtras ? extra as LibraryItemExtras : null;
final item = ref.watch(libraryItemProvider(itemId));
final providedCacheImage = extraMap?.coverImage != null
? Image.memory(extraMap!.coverImage!)
: null;
return Scaffold( return Scaffold(
appBar: AppBar(), appBar: AppBar(),
body: Center( body: Center(
child: Hero( child: Column(
tag: HeroTagPrefixes.bookCover + children: [
itemId + // cover image
(extraMap?.heroTagSuffix ?? ''), Hero(
child: Container( tag: HeroTagPrefixes.bookCover +
color: Colors.amber, itemId +
height: 200, (extraMap?.heroTagSuffix ?? ''),
width: 200, child: LayoutBuilder(
), builder: (context, constraints) {
final width =
calculateWidth(context, constraints, heightRatio: 0.35);
return SizedBox(
height: width,
width: width,
child: providedCacheImage ??
item.when(
data: (libraryItem) {
final coverImage =
ref.watch(coverImageProvider(libraryItem));
return Stack(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(10),
child: coverImage.when(
data: (image) {
// return const BookCoverSkeleton();
if (image.isEmpty) {
return const Icon(Icons.error);
}
// cover 80% of parent height
return Image.memory(
image,
fit: BoxFit.cover,
// cacheWidth: (height *
// MediaQuery.of(context).devicePixelRatio)
// .round(),
);
},
loading: () {
return const Center(
child: BookCoverSkeleton(),
);
},
error: (error, stack) {
return const Icon(Icons.error);
},
),
),
],
);
},
error: (error, stack) =>
const CircularProgressIndicator(),
loading: () =>
const Center(child: BookCoverSkeleton()),
),
);
},
),
),
// author
// title
// description
const Text('Description'),
],
), ),
), ),
); );
} }
} }
// child: Hero(
// tag: HeroTagPrefixes.bookCover +
// itemId +
// (extraMap?.heroTagSuffix ?? ''),
// child: Container(
// color: Colors.amber,
// height: 200,
// width: 200,
// ),
// ),
double calculateWidth(
BuildContext context,
BoxConstraints constraints, {
double heightRatio = 0.25,
double widthRatio = 0.9,
}) {
final availHeight =
min(constraints.maxHeight, MediaQuery.of(context).size.height);
final availWidth =
min(constraints.maxWidth, MediaQuery.of(context).size.width);
// make the width 90% of the available width
var width = availWidth * widthRatio;
// but never exceed more than 25% of height
if (width > availHeight * heightRatio) {
width = availHeight * heightRatio;
}
return width;
}

View file

@ -1,10 +1,11 @@
// a freezed class to store the settings of the app // a freezed class to store the settings of the app
import 'dart:typed_data';
import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:shelfsdk/audiobookshelf_api.dart'; import 'package:shelfsdk/audiobookshelf_api.dart';
part 'library_item_extras.freezed.dart'; part 'library_item_extras.freezed.dart';
part 'library_item_extras.g.dart';
/// any extras when navigating to a library item /// any extras when navigating to a library item
/// ///
@ -15,9 +16,8 @@ part 'library_item_extras.g.dart';
class LibraryItemExtras with _$LibraryItemExtras { class LibraryItemExtras with _$LibraryItemExtras {
const factory LibraryItemExtras({ const factory LibraryItemExtras({
BookMinified? book, BookMinified? book,
String? heroTagSuffix, @Default('') String heroTagSuffix,
Uint8List? coverImage,
}) = _LibraryItemExtras; }) = _LibraryItemExtras;
factory LibraryItemExtras.fromJson(Map<String, dynamic> json) =>
_$LibraryItemExtrasFromJson(json);
} }

View file

@ -14,16 +14,12 @@ T _$identity<T>(T value) => value;
final _privateConstructorUsedError = UnsupportedError( final _privateConstructorUsedError = UnsupportedError(
'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models'); 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
LibraryItemExtras _$LibraryItemExtrasFromJson(Map<String, dynamic> json) {
return _LibraryItemExtras.fromJson(json);
}
/// @nodoc /// @nodoc
mixin _$LibraryItemExtras { mixin _$LibraryItemExtras {
BookMinified? get book => throw _privateConstructorUsedError; BookMinified? get book => throw _privateConstructorUsedError;
String? get heroTagSuffix => throw _privateConstructorUsedError; String get heroTagSuffix => throw _privateConstructorUsedError;
Uint8List? get coverImage => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true) @JsonKey(ignore: true)
$LibraryItemExtrasCopyWith<LibraryItemExtras> get copyWith => $LibraryItemExtrasCopyWith<LibraryItemExtras> get copyWith =>
throw _privateConstructorUsedError; throw _privateConstructorUsedError;
@ -35,7 +31,7 @@ abstract class $LibraryItemExtrasCopyWith<$Res> {
LibraryItemExtras value, $Res Function(LibraryItemExtras) then) = LibraryItemExtras value, $Res Function(LibraryItemExtras) then) =
_$LibraryItemExtrasCopyWithImpl<$Res, LibraryItemExtras>; _$LibraryItemExtrasCopyWithImpl<$Res, LibraryItemExtras>;
@useResult @useResult
$Res call({BookMinified? book, String? heroTagSuffix}); $Res call({BookMinified? book, String heroTagSuffix, Uint8List? coverImage});
} }
/// @nodoc /// @nodoc
@ -52,17 +48,22 @@ class _$LibraryItemExtrasCopyWithImpl<$Res, $Val extends LibraryItemExtras>
@override @override
$Res call({ $Res call({
Object? book = freezed, Object? book = freezed,
Object? heroTagSuffix = freezed, Object? heroTagSuffix = null,
Object? coverImage = freezed,
}) { }) {
return _then(_value.copyWith( return _then(_value.copyWith(
book: freezed == book book: freezed == book
? _value.book ? _value.book
: book // ignore: cast_nullable_to_non_nullable : book // ignore: cast_nullable_to_non_nullable
as BookMinified?, as BookMinified?,
heroTagSuffix: freezed == heroTagSuffix heroTagSuffix: null == heroTagSuffix
? _value.heroTagSuffix ? _value.heroTagSuffix
: heroTagSuffix // ignore: cast_nullable_to_non_nullable : heroTagSuffix // ignore: cast_nullable_to_non_nullable
as String?, as String,
coverImage: freezed == coverImage
? _value.coverImage
: coverImage // ignore: cast_nullable_to_non_nullable
as Uint8List?,
) as $Val); ) as $Val);
} }
} }
@ -75,7 +76,7 @@ abstract class _$$LibraryItemExtrasImplCopyWith<$Res>
__$$LibraryItemExtrasImplCopyWithImpl<$Res>; __$$LibraryItemExtrasImplCopyWithImpl<$Res>;
@override @override
@useResult @useResult
$Res call({BookMinified? book, String? heroTagSuffix}); $Res call({BookMinified? book, String heroTagSuffix, Uint8List? coverImage});
} }
/// @nodoc /// @nodoc
@ -90,37 +91,43 @@ class __$$LibraryItemExtrasImplCopyWithImpl<$Res>
@override @override
$Res call({ $Res call({
Object? book = freezed, Object? book = freezed,
Object? heroTagSuffix = freezed, Object? heroTagSuffix = null,
Object? coverImage = freezed,
}) { }) {
return _then(_$LibraryItemExtrasImpl( return _then(_$LibraryItemExtrasImpl(
book: freezed == book book: freezed == book
? _value.book ? _value.book
: book // ignore: cast_nullable_to_non_nullable : book // ignore: cast_nullable_to_non_nullable
as BookMinified?, as BookMinified?,
heroTagSuffix: freezed == heroTagSuffix heroTagSuffix: null == heroTagSuffix
? _value.heroTagSuffix ? _value.heroTagSuffix
: heroTagSuffix // ignore: cast_nullable_to_non_nullable : heroTagSuffix // ignore: cast_nullable_to_non_nullable
as String?, as String,
coverImage: freezed == coverImage
? _value.coverImage
: coverImage // ignore: cast_nullable_to_non_nullable
as Uint8List?,
)); ));
} }
} }
/// @nodoc /// @nodoc
@JsonSerializable()
class _$LibraryItemExtrasImpl implements _LibraryItemExtras {
const _$LibraryItemExtrasImpl({this.book, this.heroTagSuffix});
factory _$LibraryItemExtrasImpl.fromJson(Map<String, dynamic> json) => class _$LibraryItemExtrasImpl implements _LibraryItemExtras {
_$$LibraryItemExtrasImplFromJson(json); const _$LibraryItemExtrasImpl(
{this.book, this.heroTagSuffix = '', this.coverImage});
@override @override
final BookMinified? book; final BookMinified? book;
@override @override
final String? heroTagSuffix; @JsonKey()
final String heroTagSuffix;
@override
final Uint8List? coverImage;
@override @override
String toString() { String toString() {
return 'LibraryItemExtras(book: $book, heroTagSuffix: $heroTagSuffix)'; return 'LibraryItemExtras(book: $book, heroTagSuffix: $heroTagSuffix, coverImage: $coverImage)';
} }
@override @override
@ -130,12 +137,14 @@ class _$LibraryItemExtrasImpl implements _LibraryItemExtras {
other is _$LibraryItemExtrasImpl && other is _$LibraryItemExtrasImpl &&
(identical(other.book, book) || other.book == book) && (identical(other.book, book) || other.book == book) &&
(identical(other.heroTagSuffix, heroTagSuffix) || (identical(other.heroTagSuffix, heroTagSuffix) ||
other.heroTagSuffix == heroTagSuffix)); other.heroTagSuffix == heroTagSuffix) &&
const DeepCollectionEquality()
.equals(other.coverImage, coverImage));
} }
@JsonKey(ignore: true)
@override @override
int get hashCode => Object.hash(runtimeType, book, heroTagSuffix); int get hashCode => Object.hash(runtimeType, book, heroTagSuffix,
const DeepCollectionEquality().hash(coverImage));
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@ -143,27 +152,20 @@ class _$LibraryItemExtrasImpl implements _LibraryItemExtras {
_$$LibraryItemExtrasImplCopyWith<_$LibraryItemExtrasImpl> get copyWith => _$$LibraryItemExtrasImplCopyWith<_$LibraryItemExtrasImpl> get copyWith =>
__$$LibraryItemExtrasImplCopyWithImpl<_$LibraryItemExtrasImpl>( __$$LibraryItemExtrasImplCopyWithImpl<_$LibraryItemExtrasImpl>(
this, _$identity); this, _$identity);
@override
Map<String, dynamic> toJson() {
return _$$LibraryItemExtrasImplToJson(
this,
);
}
} }
abstract class _LibraryItemExtras implements LibraryItemExtras { abstract class _LibraryItemExtras implements LibraryItemExtras {
const factory _LibraryItemExtras( const factory _LibraryItemExtras(
{final BookMinified? book, {final BookMinified? book,
final String? heroTagSuffix}) = _$LibraryItemExtrasImpl; final String heroTagSuffix,
final Uint8List? coverImage}) = _$LibraryItemExtrasImpl;
factory _LibraryItemExtras.fromJson(Map<String, dynamic> json) =
_$LibraryItemExtrasImpl.fromJson;
@override @override
BookMinified? get book; BookMinified? get book;
@override @override
String? get heroTagSuffix; String get heroTagSuffix;
@override
Uint8List? get coverImage;
@override @override
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$LibraryItemExtrasImplCopyWith<_$LibraryItemExtrasImpl> get copyWith => _$$LibraryItemExtrasImplCopyWith<_$LibraryItemExtrasImpl> get copyWith =>

View file

@ -1,23 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'library_item_extras.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
_$LibraryItemExtrasImpl _$$LibraryItemExtrasImplFromJson(
Map<String, dynamic> json) =>
_$LibraryItemExtrasImpl(
book: json['book'] == null
? null
: BookMinified.fromJson(json['book'] as Map<String, dynamic>),
heroTagSuffix: json['heroTagSuffix'] as String?,
);
Map<String, dynamic> _$$LibraryItemExtrasImplToJson(
_$LibraryItemExtrasImpl instance) =>
<String, dynamic>{
'book': instance.book,
'heroTagSuffix': instance.heroTagSuffix,
};

View file

@ -83,6 +83,7 @@ class BookOnShelf extends HookConsumerWidget {
extra: LibraryItemExtras( extra: LibraryItemExtras(
book: book, book: book,
heroTagSuffix: heroTagSuffix, heroTagSuffix: heroTagSuffix,
coverImage: coverImage.valueOrNull,
), ),
); );
}, },
@ -103,6 +104,7 @@ class BookOnShelf extends HookConsumerWidget {
image, image,
fit: BoxFit.cover, fit: BoxFit.cover,
cacheWidth: (height * cacheWidth: (height *
1.2 *
MediaQuery.of(context).devicePixelRatio) MediaQuery.of(context).devicePixelRatio)
.round(), .round(),
), ),