Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move primary content view into binders package

Browse Source
This commit is contained in:
Satindar Dhillon
2022-02-23 09:14:45 -08:00
parent da212e8e46
commit 27b60c9cdf
4 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/Binders/RootViewModel.swift
View File

@ -127,7 +127,7 @@ public struct RootView: View {
let rootViewModel = RootViewModel()
self.viewModel = rootViewModel
self.authenticator = rootViewModel.services.authenticator
self.primaryViewModel = PrimaryContentViewModel.make(services: rootViewModel.services)
self.primaryViewModel = PrimaryContentViewModel(services: rootViewModel.services)
#if DEBUG
if CommandLine.arguments.contains("--uitesting") {

12
apple/OmnivoreKit/Sources/Binders/Scenes/PrimaryContentScene.swift
View File

@ -1,12 +0,0 @@
import Services
import SwiftUI
import Views
extension PrimaryContentViewModel {
static func make(services: Services) -> PrimaryContentViewModel {
PrimaryContentViewModel(
homeFeedViewModel: HomeFeedViewModel.make(services: services),
profileContainerViewModel: ProfileContainerViewModel.make(services: services)
)
}
}

16
apple/OmnivoreKit/Sources/Views/PrimaryContainerViews/PrimaryContentView.swift → apple/OmnivoreKit/Sources/Binders/Views/PrimaryContentView.swift
View File

@ -1,22 +1,20 @@
import Combine
import Models
import Services
import SwiftUI
import Views
public final class PrimaryContentViewModel: ObservableObject {
public final class PrimaryContentViewModel {
let homeFeedViewModel: HomeFeedViewModel
let profileContainerViewModel: ProfileContainerViewModel
public init(
homeFeedViewModel: HomeFeedViewModel,
profileContainerViewModel: ProfileContainerViewModel
) {
self.homeFeedViewModel = homeFeedViewModel
self.profileContainerViewModel = profileContainerViewModel
public init(services: Services) {
self.homeFeedViewModel = HomeFeedViewModel.make(services: services)
self.profileContainerViewModel = ProfileContainerViewModel.make(services: services)
}
}
public struct PrimaryContentView: View {
@ObservedObject private var viewModel: PrimaryContentViewModel
private let viewModel: PrimaryContentViewModel
public init(viewModel: PrimaryContentViewModel) {
self.viewModel = viewModel

12
apple/OmnivoreKit/Sources/Views/PrimaryContainerViews/PrimaryContentCategory.swift
View File

@ -1,14 +1,14 @@
import SwiftUI
enum PrimaryContentCategory: Identifiable, Hashable, Equatable {
public enum PrimaryContentCategory: Identifiable, Hashable, Equatable {
case feed(viewModel: HomeFeedViewModel)
case profile(viewModel: ProfileContainerViewModel)
static func == (lhs: PrimaryContentCategory, rhs: PrimaryContentCategory) -> Bool {
public static func == (lhs: PrimaryContentCategory, rhs: PrimaryContentCategory) -> Bool {
lhs.id == rhs.id
}
var id: String {
public var id: String {
title
}
@ -39,11 +39,11 @@ enum PrimaryContentCategory: Identifiable, Hashable, Equatable {
}
}
var listLabel: some View {
public var listLabel: some View {
Label { Text(title) } icon: { image.renderingMode(.template) }
}
@ViewBuilder var destinationView: some View {
@ViewBuilder public var destinationView: some View {
switch self {
case let .feed(viewModel: viewModel):
HomeFeedView(viewModel: viewModel)
@ -52,7 +52,7 @@ enum PrimaryContentCategory: Identifiable, Hashable, Equatable {
}
}
func hash(into hasher: inout Hasher) {
public func hash(into hasher: inout Hasher) {
hasher.combine(id)
}
}