Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-03-28 23:32:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor artist to use coverArt

Browse Source 
fix cover art image caching
This commit is contained in:
austinried
2025-11-09 17:11:35 +09:00
parent 42ff02f88e
commit aaab1d1278
15 changed files with 116 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
lib/images/images.dart
View File

@@ -1,9 +1,7 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:octo_image/octo_image.dart';
import '../app/state/settings.dart';
import '../app/state/source.dart';
@@ -23,62 +21,14 @@ class CoverArtImage extends HookConsumerWidget {
final source = ref.watch(sourceProvider);
final sourceId = ref.watch(sourceIdProvider);
final imageProviderKeys = [source, sourceId, coverArt, thumbnail];
final buildImageProvider = useCallback(
() => CachedNetworkImageProvider(
coverArt != null
? source.coverArtUri(coverArt!, thumbnail: thumbnail).toString()
: 'https://placehold.net/400x400.png',
cacheKey: '$sourceId$coverArt$thumbnail',
),
imageProviderKeys,
);
final imageProvider = useState(buildImageProvider());
useEffect(
() {
imageProvider.value = buildImageProvider();
return;
},
imageProviderKeys,
);
final imageUrl = coverArt != null
? source.coverArtUri(coverArt!, thumbnail: thumbnail).toString()
: 'https://placehold.net/400x400.png';
return BaseImage(
image: imageProvider.value,
);
}
}
class CachedImage extends HookConsumerWidget {
const CachedImage(
this.uri, {
super.key,
});
final Uri? uri;
@override
Widget build(BuildContext context, WidgetRef ref) {
final imageProviderKeys = [uri];
final buildImageProvider = useCallback(
() {
final imageUrl = uri?.toString() ?? 'https://placehold.net/400x400.png';
return CachedNetworkImageProvider(imageUrl, cacheKey: imageUrl);
},
imageProviderKeys,
);
final imageProvider = useState(buildImageProvider());
useEffect(
() {
imageProvider.value = buildImageProvider();
return;
},
imageProviderKeys,
);
return BaseImage(
image: imageProvider.value,
imageUrl: imageUrl,
// can't use the URL because of token auth, which is a cache-buster
cacheKey: '$sourceId$coverArt$thumbnail',
);
}
}
@@ -86,20 +36,23 @@ class CachedImage extends HookConsumerWidget {
class BaseImage extends HookConsumerWidget {
const BaseImage({
super.key,
required this.image,
required this.imageUrl,
this.cacheKey,
this.fit = BoxFit.cover,
});
final ImageProvider image;
final String imageUrl;
final String? cacheKey;
final BoxFit fit;
@override
Widget build(BuildContext context, WidgetRef ref) {
return OctoImage(
image: image,
placeholderBuilder: (context) => Icon(Symbols.cached_rounded),
errorBuilder: (context, error, trace) => Icon(Icons.error),
fit: fit,
return CachedNetworkImage(
imageUrl: imageUrl,
cacheKey: cacheKey,
placeholder: (context, url) => Icon(Symbols.cached_rounded),
errorWidget: (context, url, error) => Icon(Icons.error),
fit: BoxFit.cover,
fadeOutDuration: Duration(milliseconds: 100),
fadeInDuration: Duration(milliseconds: 200),
);