1
0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-11-08 05:30:05 +01:00

♻️ Rename manager property

This commit is contained in:
2022-06-11 20:19:45 +02:00
parent ceeba611d0
commit 090440abc8

View File

@@ -10,14 +10,14 @@ import Foundation
import SwiftUI import SwiftUI
struct ServicesView: View { struct ServicesView: View {
@ObservedObject var serviceManager: ServicesManager @ObservedObject var manager: ServicesManager
@State var servicesToDisplay: [String] @State var servicesToDisplay: [String]
static func asMenuItem() -> NSMenuItem { static func asMenuItem() -> NSMenuItem {
let item = NSMenuItem() let item = NSMenuItem()
let view = NSHostingView( let view = NSHostingView(
rootView: Self( rootView: Self(
serviceManager: ServicesManager.shared, manager: ServicesManager.shared,
servicesToDisplay: [ servicesToDisplay: [
PhpEnv.phpInstall.formula, PhpEnv.phpInstall.formula,
"nginx", "nginx",
@@ -35,7 +35,8 @@ struct ServicesView: View {
ForEach(servicesToDisplay, id: \.self) { service in ForEach(servicesToDisplay, id: \.self) { service in
VStack(alignment: .center, spacing: 3) { VStack(alignment: .center, spacing: 3) {
MiniHeaderView(text: service.uppercased()) MiniHeaderView(text: service.uppercased())
CheckmarkView(serviceName: service).environmentObject(serviceManager) CheckmarkView(serviceName: service)
.environmentObject(manager)
}.frame(minWidth: 0, maxWidth: .infinity) }.frame(minWidth: 0, maxWidth: .infinity)
} }
}.padding(10) }.padding(10)
@@ -44,14 +45,14 @@ struct ServicesView: View {
struct CheckmarkView: View { struct CheckmarkView: View {
@State var serviceName: String @State var serviceName: String
@EnvironmentObject var serviceManager: ServicesManager @EnvironmentObject var manager: ServicesManager
public func hasAnyServices() -> Bool { public func hasAnyServices() -> Bool {
return !serviceManager.services.isEmpty return !manager.services.isEmpty
} }
public func active() -> Bool { public func active() -> Bool {
guard let service = serviceManager.services[serviceName] else { guard let service = manager.services[serviceName] else {
return false return false
} }
@@ -76,7 +77,7 @@ struct CheckmarkView: View {
struct ServicesView_Previews: PreviewProvider { struct ServicesView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
ServicesView( ServicesView(
serviceManager: ServicesManager() manager: ServicesManager()
.withDummyServices([:]), .withDummyServices([:]),
servicesToDisplay: ["php", "nginx", "dnsmasq"] servicesToDisplay: ["php", "nginx", "dnsmasq"]
) )
@@ -84,7 +85,7 @@ struct ServicesView_Previews: PreviewProvider {
.previewDisplayName("Loading") .previewDisplayName("Loading")
ServicesView( ServicesView(
serviceManager: ServicesManager() manager: ServicesManager()
.withDummyServices([ .withDummyServices([
"php": false, "php": false,
"nginx": true, "nginx": true,
@@ -96,7 +97,7 @@ struct ServicesView_Previews: PreviewProvider {
.previewDisplayName("Light Mode") .previewDisplayName("Light Mode")
ServicesView( ServicesView(
serviceManager: ServicesManager() manager: ServicesManager()
.withDummyServices([ .withDummyServices([
"php": false, "php": false,
"nginx": true, "nginx": true,