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

remove the PrimaryContentViewModel

Browse source
This commit is contained in:
Satindar Dhillon 2022-02-23 09:23:00 -08:00
parent 27b60c9cdf
commit 578dd80be0
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apple/OmnivoreKit/Sources/Binders/RootViewModel.swift
View file

@ -118,8 +118,6 @@ public struct RootView: View {
@ObservedObject private var viewModel: RootViewModel
@ObservedObject private var authenticator: Authenticator
private var primaryViewModel: PrimaryContentViewModel
public init(
pdfViewerProvider: ((URL, PDFViewerViewModel) -> AnyView)?,
intercomProvider: IntercomProvider?
@ -127,7 +125,6 @@ public struct RootView: View {
let rootViewModel = RootViewModel()
self.viewModel = rootViewModel
self.authenticator = rootViewModel.services.authenticator
self.primaryViewModel = PrimaryContentViewModel(services: rootViewModel.services)
#if DEBUG
if CommandLine.arguments.contains("--uitesting") {
@ -148,7 +145,7 @@ public struct RootView: View {
@ViewBuilder private var innerBody: some View {
if authenticator.isLoggedIn {
PrimaryContentView(viewModel: primaryViewModel)
PrimaryContentView(services: viewModel.services)
.onAppear {
viewModel.triggerPushNotificationRequestIfNeeded()
}

16
apple/OmnivoreKit/Sources/Binders/Views/PrimaryContentView.swift
View file

@ -3,7 +3,7 @@ import Services
import SwiftUI
import Views
public final class PrimaryContentViewModel {
public struct PrimaryContentView: View {
let homeFeedViewModel: HomeFeedViewModel
let profileContainerViewModel: ProfileContainerViewModel
@ -11,14 +11,6 @@ public final class PrimaryContentViewModel {
self.homeFeedViewModel = HomeFeedViewModel.make(services: services)
self.profileContainerViewModel = ProfileContainerViewModel.make(services: services)
}
}
public struct PrimaryContentView: View {
private let viewModel: PrimaryContentViewModel
public init(viewModel: PrimaryContentViewModel) {
self.viewModel = viewModel
}
public var body: some View {
#if os(iOS)
@ -34,14 +26,14 @@ public struct PrimaryContentView: View {
// iphone view container
private var compactView: some View {
HomeFeedView(viewModel: viewModel.homeFeedViewModel)
HomeFeedView(viewModel: homeFeedViewModel)
}
// ipad and mac view container
private var regularView: some View {
let categories = [
PrimaryContentCategory.feed(viewModel: viewModel.homeFeedViewModel),
PrimaryContentCategory.profile(viewModel: viewModel.profileContainerViewModel)
PrimaryContentCategory.feed(viewModel: homeFeedViewModel),
PrimaryContentCategory.profile(viewModel: profileContainerViewModel)
]
return NavigationView {