Abstract out fetching from view model so we can better handle multiple fetch folders
Rename LinkedItem to LibraryItem More on following Add new fetcher Tab bar
This commit is contained in:
@ -6,7 +6,7 @@ import Utils
|
||||
import Views
|
||||
|
||||
@MainActor final class WebReaderLoadingContainerViewModel: ObservableObject {
|
||||
@Published var item: LinkedItem?
|
||||
@Published var item: Models.LibraryItem?
|
||||
@Published var errorMessage: String?
|
||||
|
||||
func loadItem(dataService: DataService, username: String, requestID: String) async {
|
||||
@ -15,7 +15,7 @@ import Views
|
||||
else {
|
||||
return
|
||||
}
|
||||
item = dataService.viewContext.object(with: objectID) as? LinkedItem
|
||||
item = dataService.viewContext.object(with: objectID) as? Models.LibraryItem
|
||||
}
|
||||
|
||||
func trackReadEvent() {
|
||||
@ -38,7 +38,6 @@ public struct WebReaderLoadingContainer: View {
|
||||
@EnvironmentObject var dataService: DataService
|
||||
@EnvironmentObject var audioController: AudioController
|
||||
|
||||
@State var lazyPopIsEnabled = true
|
||||
@StateObject var viewModel = WebReaderLoadingContainerViewModel()
|
||||
|
||||
public var body: some View {
|
||||
@ -59,8 +58,6 @@ public struct WebReaderLoadingContainer: View {
|
||||
WebReaderContainerView(item: item, pop: { dismiss() })
|
||||
#if os(iOS)
|
||||
.navigationViewStyle(.stack)
|
||||
.navigationBarHidden(true)
|
||||
.lazyPop(pop: { dismiss() }, isEnabled: $lazyPopIsEnabled)
|
||||
#endif
|
||||
.accentColor(.appGrayTextContrast)
|
||||
.task { viewModel.trackReadEvent() }
|
||||
|
||||
Reference in New Issue
Block a user