prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass viewbuilder to async image so we can handle errors

Browse source
This commit is contained in:
Satindar Dhillon 2022-03-14 21:42:24 -07:00
parent 330b8e8dda
commit eecbeb7705
4 changed files with 91 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
apple/OmnivoreKit/Sources/Views/AsyncImage.swift
View file

@ -4,114 +4,76 @@ import Models
import SwiftUI
import Utils
struct AsyncImage: View {
let isResizable: Bool
let url: URL?
@State private var isLoaded = false
enum AsyncImageStatus {
case loading
case loaded(image: Image)
case error
}
struct AsyncImage<Content: View>: View {
let viewBuilder: (AsyncImageStatus) -> Content
let url: URL
@StateObject private var imageLoader = ImageLoader()
init(url: URL?, isResizable: Bool = true) {
self.isResizable = isResizable
init(url: URL, @ViewBuilder viewBuilder: @escaping (AsyncImageStatus) -> Content) {
self.url = url
}
func load() {
if let url = url, !isLoaded {
imageLoader.load(fromUrl: url)
isLoaded = true
}
self.viewBuilder = viewBuilder
}
var body: some View {
Group {
#if os(iOS)
if isResizable {
Image(uiImage: imageLoader.image ?? imageLoader.placeholder)
.resizable()
} else {
Image(uiImage: imageLoader.image ?? imageLoader.placeholder)
}
#elseif os(macOS)
if isResizable {
Image(nsImage: imageLoader.image ?? imageLoader.placeholder)
.resizable()
} else {
Image(nsImage: imageLoader.image ?? imageLoader.placeholder)
}
#endif
}
.onAppear {
load()
}
viewBuilder(imageLoader.status)
.onAppear {
imageLoader.load(fromUrl: url)
}
}
}
#if os(iOS)
private final class ImageLoader: ObservableObject {
@Published var image: UIImage?
@Published var hasFailed = false
private final class ImageLoader: ObservableObject {
@Published var status: AsyncImageStatus = .loading
var loadStarted = false
let placeholder = UIImage()
private var subscriptions = Set<AnyCancellable>()
private var subscriptions = Set<AnyCancellable>()
func load(fromUrl url: URL) {
guard !loadStarted else { return }
loadStarted = true
func load(fromUrl url: URL) {
if let cachedImage = ImageCache.shared[url] {
image = cachedImage
return
}
fetch(url: url).sink(
receiveCompletion: { [weak self] completion in
guard case .failure = completion else { return }
self?.hasFailed = true
}, receiveValue: { [weak self] data in
guard let fetchedImage = UIImage(data: data) else {
self?.hasFailed = true
return
}
ImageCache.shared[url] = fetchedImage
self?.image = fetchedImage
}
)
.store(in: &subscriptions)
if let cachedImage = ImageCache.shared[url] {
#if os(iOS)
status = .loaded(image: Image(uiImage: cachedImage))
#else
status = .loaded(image: Image(nsImage: cachedImage))
#endif
return
}
}
#elseif os(macOS)
private final class ImageLoader: ObservableObject {
@Published var image: NSImage?
@Published var hasFailed = false
let placeholder = NSImage(systemSymbolName: "photo", accessibilityDescription: "photo-placeholder")!
private var subscriptions = Set<AnyCancellable>()
func load(fromUrl url: URL) {
if let cachedImage = ImageCache.shared[url] {
image = cachedImage
return
}
fetch(url: url).sink(
receiveCompletion: { [weak self] completion in
guard case .failure = completion else { return }
self?.hasFailed = true
}, receiveValue: { [weak self] data in
guard let fetchedImage = NSImage(data: data) else {
self?.hasFailed = true
return
}
ImageCache.shared[url] = fetchedImage
self?.image = fetchedImage
fetch(url: url).sink(
receiveCompletion: { [weak self] completion in
guard case .failure = completion else { return }
self?.status = .error
}, receiveValue: { [weak self] data in
#if os(iOS)
let fetchedImage = UIImage(data: data)
#else
let fetchedImage = NSImage(data: data)#endif
guard let fetchedImage = fetchedImage else {
self?.status = .error
return
}
)
.store(in: &subscriptions)
}
}
#endif
ImageCache.shared[url] = fetchedImage
func fetch(url: URL) -> AnyPublisher<Data, BasicError> {
#if os(iOS)
self?.status = .loaded(image: Image(uiImage: fetchedImage))
#else
self?.status = .loaded(image: Image(nsImage: fetchedImage))
#endif
}
)
.store(in: &subscriptions)
}
}
private func fetch(url: URL) -> AnyPublisher<Data, BasicError> {
let request = URLRequest(url: url)
return URLSession.DataTaskPublisher(request: request, session: .shared)

19
apple/OmnivoreKit/Sources/Views/FeedItem/GridCard.swift
View file

@ -133,10 +133,21 @@ public struct GridCard: View {
Spacer()
if let imageURL = item.imageURL {
AsyncImage(url: imageURL, isResizable: true)
.aspectRatio(contentMode: .fill)
.frame(width: geo.size.width / 3, height: (geo.size.width * 2) / 9)
.cornerRadius(3)
AsyncImage(url: imageURL) { imageStatus in
if case let AsyncImageStatus.loaded(image) = imageStatus {
image
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: geo.size.width / 3, height: (geo.size.width * 2) / 9)
.cornerRadius(3)
} else if case AsyncImageStatus.loading = imageStatus {
Color.appButtonBackground
.frame(width: geo.size.width / 3, height: (geo.size.width * 2) / 9)
.cornerRadius(3)
} else {
EmptyView()
}
}
}
}
.padding(.horizontal)

19
apple/OmnivoreKit/Sources/Views/FeedItem/HomeFeedCardView.swift
View file

@ -39,10 +39,21 @@ public struct FeedCard: View {
Group {
if let imageURL = item.imageURL {
AsyncImage(url: imageURL, isResizable: true)
.aspectRatio(1, contentMode: .fill)
.frame(width: 80, height: 80)
.cornerRadius(6)
AsyncImage(url: imageURL) { imageStatus in
if case let AsyncImageStatus.loaded(image) = imageStatus {
image
.resizable()
.aspectRatio(1, contentMode: .fill)
.frame(width: 80, height: 80)
.cornerRadius(6)
} else if case AsyncImageStatus.loading = imageStatus {
Color.appButtonBackground
.frame(width: 80, height: 80)
.cornerRadius(6)
} else {
EmptyView()
}
}
}
}
}

9
apple/OmnivoreKit/Sources/Views/ProfileCard.swift
View file

@ -23,13 +23,18 @@ public struct ProfileCard: View {
HStack(alignment: .center) {
Group {
if let url = data.imageURL {
AsyncImage(url: url, isResizable: true)
AsyncImage(url: url) { imageStatus in
if case let AsyncImageStatus.loaded(image) = imageStatus {
image.resizable()
} else {
Image(systemName: "person.crop.circle").resizable()
}
}
} else {
Image(systemName: "person.crop.circle")
.resizable()
}
}
.aspectRatio(contentMode: .fill)
.frame(width: 70, height: 70, alignment: .center)
.clipShape(Circle())