Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 02:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Less obnoxious error handling

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-12-16 09:35:10 +01:00
parent a9c8053474
commit 4330856c5e
10 changed files with 97 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Shared/Trending/TrendingView.swift
View File

@@ -21,6 +21,8 @@ struct TrendingView: View {
ContentItem.array(of: store.collection)
}
@State private var error: RequestError?
init(_ videos: [Video] = [Video]()) {
self.videos = videos
}
@@ -52,6 +54,9 @@ struct TrendingView: View {
}
.toolbar {
ToolbarItem {
RequestErrorButton(error: error)
}
#if os(macOS)
ToolbarItemGroup {
if let favoriteItem {
@@ -68,15 +73,14 @@ struct TrendingView: View {
}
.onChange(of: resource) { _ in
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
updateFavoriteItem()
}
.onAppear {
if videos.isEmpty {
resource.addObserver(store)
resource.loadIfNeeded()
} else {
store.replace(videos)
}
resource.loadIfNeeded()?
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
updateFavoriteItem()
}
@@ -95,6 +99,8 @@ struct TrendingView: View {
.background(
Button("Refresh") {
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
}
.keyboardShortcut("r")
.opacity(0)
@@ -111,6 +117,8 @@ struct TrendingView: View {
.refreshable {
DispatchQueue.main.async {
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
}
}
.navigationBarTitleDisplayMode(.inline)
@@ -128,7 +136,9 @@ struct TrendingView: View {
}
#else
.onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
resource.loadIfNeeded()
resource.loadIfNeeded()?
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
}
#endif
}