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

don't initialize root view model in root view init

Browse source
This commit is contained in:
Satindar Dhillon 2022-02-28 11:54:52 -08:00
parent 2040f8efe2
commit cba037336c
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apple/OmnivoreKit/Sources/App/RootViewModel.swift
View file

@ -22,13 +22,9 @@ public final class RootViewModel: ObservableObject {
public var subscriptions = Set<AnyCancellable>()
public init(pdfViewerProvider: ((URL, PDFViewerViewModel) -> AnyView)?) {
public init() {
registerFonts()
if let pdfViewerProvider = pdfViewerProvider {
configurePDFProvider(pdfViewerProvider: pdfViewerProvider)
}
#if DEBUG
if CommandLine.arguments.contains("--uitesting") {
services.authenticator.logout()
@ -122,13 +118,15 @@ private struct SafariWebLinkPath: Identifiable {
}
public struct RootView: View {
@StateObject private var viewModel: RootViewModel
@StateObject private var viewModel = RootViewModel()
public init(
pdfViewerProvider: ((URL, PDFViewerViewModel) -> AnyView)?,
intercomProvider: IntercomProvider?
) {
self._viewModel = StateObject(wrappedValue: RootViewModel(pdfViewerProvider: pdfViewerProvider))
if let pdfViewerProvider = pdfViewerProvider {
viewModel.configurePDFProvider(pdfViewerProvider: pdfViewerProvider)
}
if let intercomProvider = intercomProvider {
DataService.showIntercomMessenger = intercomProvider.showIntercomMessenger
@ -137,8 +135,21 @@ public struct RootView: View {
}
}
public var body: some View {
InnerRootView(viewModel: viewModel)
.environmentObject(viewModel.services.authenticator)
.environmentObject(viewModel.services.dataService)
}
}
struct InnerRootView: View {
@EnvironmentObject var dataService: DataService
@EnvironmentObject var authenticator: Authenticator
@ObservedObject var viewModel: RootViewModel
@ViewBuilder private var innerBody: some View {
if viewModel.services.authenticator.isLoggedIn {
if authenticator.isLoggedIn {
PrimaryContentView()
.onAppear {
viewModel.triggerPushNotificationRequestIfNeeded()
@ -170,7 +181,7 @@ public struct RootView: View {
}
}
public var body: some View {
var body: some View {
Group {
#if os(iOS)
innerBody
@ -179,8 +190,6 @@ public struct RootView: View {
.frame(minWidth: 400, idealWidth: 1200, minHeight: 400, idealHeight: 1200)
#endif
}
.environmentObject(viewModel.services.authenticator)
.environmentObject(viewModel.services.dataService)
#if os(iOS)
.onOpenURL { url in
withoutAnimation {