phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00
Code Releases Activity

🏗 More SwiftUI experiments

Browse Source
This commit is contained in:
Nico Verbruggen
2022-12-24 14:50:50 +01:00
parent 44c1ea7de4
commit de2c1aca5d
4 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme
View File

@ -109,7 +109,7 @@
<EnvironmentVariable
key = "PAINT_PHPMON_SWIFTUI_VIEWS"
value = ""
isEnabled = "YES">
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
</LaunchAction>

28
phpmon/Domain/App/Services/FakeServicesManager.swift
View File

@ -9,25 +9,23 @@
import Foundation
class FakeServicesManager: ServicesManager {
override init() {
var fixedFormulae: [String] = []
var fixedStatus: ServiceStatus = .loading
init(
formulae: [String] = ["php", "nginx", "dnsmasq"],
status: ServiceStatus = .loading
) {
Log.warn("A fake services manager is being used, so Homebrew formula resolver is set to act in fake mode.")
Log.warn("If you do not want this behaviour, never instantiate FakeServicesManager!")
Homebrew.fake = true
self.fixedFormulae = formulae
self.fixedStatus = status
}
override var formulae: [HomebrewFormula] {
var formulae = [
Homebrew.Formulae.php,
Homebrew.Formulae.nginx,
Homebrew.Formulae.dnsmasq
]
let additionalFormulae = ["mailhog", "coolio"].map({ name in
return HomebrewFormula(name, elevated: false)
})
formulae.append(contentsOf: additionalFormulae)
return formulae
return fixedFormulae.map { formula in
return HomebrewFormula.init(formula, elevated: false)
}
}
}

1
phpmon/Domain/App/Services/ServiceWrapper.swift
View File

@ -46,6 +46,7 @@ public class ServiceWrapper: ObservableObject, Identifiable, Hashable {
init(formula: HomebrewFormula) {
self.formula = formula
self.isBusy = true
}
public static func == (lhs: ServiceWrapper, rhs: ServiceWrapper) -> Bool {

77
phpmon/Domain/SwiftUI/Menu/ServicesView.swift
View File

@ -10,6 +10,7 @@ import Foundation
import SwiftUI
struct ServicesView: View {
static func asMenuItem(perRow: Int = 4) -> NSMenuItem {
let item = NSMenuItem()
@ -23,8 +24,9 @@ struct ServicesView: View {
let view = NSHostingView(rootView: rootView)
view.autoresizingMask = [.width, .height]
view.setFrameSize(
CGSize(width: view.frame.width, height: rootView.height)
CGSize(width: view.frame.width, height: rootView.height + 30)
)
view.layer?.backgroundColor = CGColor.init(red: 255, green: 0, blue: 0, alpha: 0)
view.focusRingType = .none
item.view = view
@ -44,21 +46,33 @@ struct ServicesView: View {
}
var body: some View {
GeometryReader { geometry in
VStack {
VStack {
VStack(alignment: .leading) {
ForEach(manager.services.chunked(by: perRow), id: \.self) { chunk in
HStack {
ForEach(chunk) { service in
ServiceView(service: service)
.frame(width: abs((geometry.size.width - 15) / CGFloat(perRow)))
ServiceView(service: service).frame(minWidth: 70)
}
}
}
}
.padding(.top, 10)
.frame(height: self.height)
.frame(maxWidth: .infinity, alignment: .center)
// .background(Color.red)
VStack(alignment: .center) {
HStack {
Circle()
.frame(width: 12, height: 12)
.foregroundColor(.yellow)
Text("Determining services status...")
.font(.system(size: 12))
}
}
.frame(height: 25)
.frame(maxWidth: .infinity, alignment: .center)
}
.frame(height: self.height)
.background(Color.debug)
}
}
@ -66,22 +80,34 @@ struct ServiceView: View {
@ObservedObject var service: ServiceWrapper
var body: some View {
VStack(spacing: 0) {
VStack(alignment: .leading, spacing: 0) {
Text(service.name.uppercased())
.font(.system(size: 10))
.frame(minWidth: 0, maxWidth: .infinity)
.padding(.bottom, 4)
.background(Color.debug)
.frame(minWidth: 70, alignment: .center)
.padding(.top, 4)
.padding(.bottom, 2)
if service.status == .loading {
ProgressView()
.scaleEffect(x: 0.5, y: 0.5, anchor: .center)
.frame(width: 16.0, height: 20.0)
.frame(minWidth: 70, alignment: .center)
}
if service.status == .missing {
Button { print("we pressed da button ")} label: {
Button {
Task { @MainActor in
BetterAlert().withInformation(
title: "alert.warnings.service_missing.title".localized,
subtitle: "alert.warnings.service_missing.subtitle".localized,
description: "alert.warnings.service_missing.description".localized
)
.withPrimary(text: "OK")
.show()
}
} label: {
Text("?")
}
.focusable(false)
.buttonStyle(BlueButton())
.frame(minWidth: 70, alignment: .center)
}
if service.status == .active {
Button {
@ -103,18 +129,18 @@ struct ServiceView: View {
.foregroundColor(Color("IconColorRed"))
}
}
}
}.frame(minWidth: 70)
}
}
public struct BlueButton: ButtonStyle {
public func makeBody(configuration: Configuration) -> some View {
configuration.label
.padding(.bottom, 5)
.padding(.top, 5)
.padding(.leading, 10)
.padding(.trailing, 10)
.background(Color(red: 0, green: 0, blue: 0.5))
.frame(width: 30, height: 30)
.background(configuration.isPressed
? Color(red: 0, green: 0, blue: 0.9)
: Color(red: 0, green: 0, blue: 0.5)
)
.foregroundColor(.white)
.clipShape(Capsule())
}
@ -122,17 +148,8 @@ public struct BlueButton: ButtonStyle {
struct ServicesView_Previews: PreviewProvider {
static var previews: some View {
ServicesView(manager: FakeServicesManager(), perRow: 3)
ServicesView(manager: FakeServicesManager(), perRow: 4)
.frame(width: 330.0)
.previewDisplayName("Loading")
ServicesView(manager: FakeServicesManager(), perRow: 3)
.frame(width: 330.0)
.previewDisplayName("Light Mode")
ServicesView(manager: FakeServicesManager(), perRow: 3)
.frame(width: 330.0)
.previewDisplayName("Dark Mode")
.preferredColorScheme(.dark)
}
}