From a25acb1219d506351717edef8ad728abcdaf50f9 Mon Sep 17 00:00:00 2001 From: Shav Kinderlehrer Date: Sat, 23 Dec 2023 11:14:53 -0500 Subject: Use asyncImage for libraryIcons --- Jel/Views/Library/LibraryIconView.swift | 42 +++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 12 deletions(-) (limited to 'Jel/Views/Library/LibraryIconView.swift') diff --git a/Jel/Views/Library/LibraryIconView.swift b/Jel/Views/Library/LibraryIconView.swift index e5f42b0..6a7d5ae 100644 --- a/Jel/Views/Library/LibraryIconView.swift +++ b/Jel/Views/Library/LibraryIconView.swift @@ -18,20 +18,38 @@ struct LibraryIconView: View { var width: CGFloat? var height: CGFloat? - @State var loadedImageBinaryData: Data? - + @State var blurHashImage: UIImage = UIImage() + @State var imageUrl: URL? var body: some View { - VStack { - AsyncImageView(imageId: library.id ?? "", - blurhash: library.imageBlurHashes?.primary?[library.imageTags?[imageType] ?? ""] ?? "", - imageType: imageType) - .aspectRatio(contentMode: .fill) - .frame(width: width, height: height) - .clipShape(RoundedRectangle(cornerRadius: 5)) - + AsyncImage(url: imageUrl) {image in + VStack { + image + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: width, height: height) + .clipShape(RoundedRectangle(cornerRadius: 3)) + Text(library.name ?? "Unknown") + .font(.subheadline) + } + } placeholder: { + VStack { + Image(uiImage: blurHashImage) + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: width, height: height) + .clipShape(RoundedRectangle(cornerRadius: 3)) + Text(library.name ?? "Unknown") + .font(.subheadline) + } + } + + .onAppear { + let blurhash = library.imageBlurHashes?.primary?[library.imageTags?[imageType] ?? ""] ?? "" + blurHashImage = UIImage(blurHash: blurhash, size: CGSize(width: 32, height: 32)) ?? UIImage() - Text(library.name ?? "Unknown") - .font(.subheadline) + let imageId = library.id ?? "" + let request = Paths.getItemImage(itemID: imageId, imageType: imageType) + imageUrl = jellyfinClient.getUrl()?.appending(path: request.url?.absoluteString ?? "") } } } -- cgit v1.2.3