diff options
Diffstat (limited to 'Jel/Views')
| -rw-r--r-- | Jel/Views/Dashboard/DashboardLibraryView.swift | 12 | ||||
| -rw-r--r-- | Jel/Views/Library/LibraryDetailView.swift | 24 | ||||
| -rw-r--r-- | Jel/Views/Library/LibraryIconView.swift | 42 | ||||
| -rw-r--r-- | Jel/Views/Utility/AsyncImageView.swift | 53 |
4 files changed, 57 insertions, 74 deletions
diff --git a/Jel/Views/Dashboard/DashboardLibraryView.swift b/Jel/Views/Dashboard/DashboardLibraryView.swift index 98c92c0..00f0e68 100644 --- a/Jel/Views/Dashboard/DashboardLibraryView.swift +++ b/Jel/Views/Dashboard/DashboardLibraryView.swift @@ -14,7 +14,12 @@ struct DashboardLibraryView: View { @StateObject var authState: AuthStateController = AuthStateController.shared @State var libraries: [BaseItemDto] = [] + @State var loading: Bool = true var body: some View { + if loading { + ProgressView() + .progressViewStyle(.circular) + } ScrollView(.horizontal, showsIndicators: false) { HStack { ForEach(libraries) {library in @@ -22,9 +27,10 @@ struct DashboardLibraryView: View { NavigationLink { LibraryDetailView(library: library) } label: { - LibraryIconView(library: library, height: 200) + LibraryIconView(library: library, height: 150) .padding() } + .buttonStyle(PlainButtonStyle()) } } } @@ -36,11 +42,11 @@ struct DashboardLibraryView: View { if let results = try await jellyfinClient.send(request).value.items { libraries = results } + loading = false } catch { } } - } - } + }} } //#Preview { diff --git a/Jel/Views/Library/LibraryDetailView.swift b/Jel/Views/Library/LibraryDetailView.swift index 3d5a04b..37ab613 100644 --- a/Jel/Views/Library/LibraryDetailView.swift +++ b/Jel/Views/Library/LibraryDetailView.swift @@ -15,11 +15,22 @@ struct LibraryDetailView: View { @State var library: BaseItemDto @State var items: [BaseItemDto]? = [] + @State var loading: Bool = true + + let columns = [ + GridItem(.adaptive(minimum: 150)) + ] var body: some View { + if loading { + ProgressView() + .progressViewStyle(.circular) + } ScrollView { - ForEach(items ?? []) {item in - LibraryIconView(library: item, imageType: "Primary", width: 120) - .padding() + LazyVGrid(columns: columns) { + ForEach(items ?? []) {item in + LibraryIconView(library: item, imageType: "Primary", height: 150) + .padding() + } } } .navigationTitle(library.name ?? "Unknown") @@ -31,6 +42,7 @@ struct LibraryDetailView: View { do { let res = try await jellyfinClient.send(request) items = res.value.items + loading = false } catch { } } @@ -38,6 +50,6 @@ struct LibraryDetailView: View { } } -#Preview { - LibraryDetailView(library: BaseItemDto()) -} +//#Preview { +// LibraryDetailView(library: BaseItemDto()) +//} 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 ?? "") } } } diff --git a/Jel/Views/Utility/AsyncImageView.swift b/Jel/Views/Utility/AsyncImageView.swift deleted file mode 100644 index 5b9f99c..0000000 --- a/Jel/Views/Utility/AsyncImageView.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// AsyncImageView.swift -// Jel -// -// Created by zerocool on 12/19/23. -// - -import SwiftUI -import JellyfinKit - -struct AsyncImageView: View { - @EnvironmentObject var jellyfinClient: JellyfinClientController - - @State var imageId: String - @State var blurhash: String - @State var imageType: String - - @State var loading = true - @State var uiImage: UIImage = UIImage() - - var body: some View { - VStack { - if loading { - Image(uiImage: uiImage) - .resizable() - } else { - Image(uiImage: uiImage) - .resizable() - } - } - .onAppear { - uiImage = UIImage(blurHash: blurhash, size: CGSize(width: 16, height: 16)) ?? UIImage() - - Task { - let request = Paths.getItemImage(itemID: imageId, imageType: imageType) - do { - let res = try await jellyfinClient.send(request) - if let image = UIImage(data: res.value) { - uiImage = image - loading = false - } else { - - } - } - } - - } - } -} - -//#Preview { -// AsyncImageView(imageId: "", blurhash: "", imageType: "") -//} |