From b6b1174ca335233c69144c4f0f1b3d8e0946015b Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 18 Jan 2023 19:56:54 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20More=20compact=20`ServicesView`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets.xcassets/AppColor.colorset/Contents.json | 2 +- phpmon/Domain/SwiftUI/Menu/ServicesView.swift | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/phpmon/Assets.xcassets/AppColor.colorset/Contents.json b/phpmon/Assets.xcassets/AppColor.colorset/Contents.json index 4759aba..4fc8e42 100644 --- a/phpmon/Assets.xcassets/AppColor.colorset/Contents.json +++ b/phpmon/Assets.xcassets/AppColor.colorset/Contents.json @@ -7,7 +7,7 @@ "alpha" : "1.000", "blue" : "0.988", "green" : "0.580", - "red" : "0.277" + "red" : "0.278" } }, "idiom" : "universal" diff --git a/phpmon/Domain/SwiftUI/Menu/ServicesView.swift b/phpmon/Domain/SwiftUI/Menu/ServicesView.swift index b08fc6c..8f71fc6 100644 --- a/phpmon/Domain/SwiftUI/Menu/ServicesView.swift +++ b/phpmon/Domain/SwiftUI/Menu/ServicesView.swift @@ -35,8 +35,8 @@ struct ServicesView: View { var perRow: Int var rowCount: Int var rowSpacing: Int = 0 - var rowHeight: Int = 50 - var statusHeight: Int = 30 + var rowHeight: Int = 48 + var statusHeight: Int = 20 var allRowHeight: CGFloat var height: CGFloat @@ -66,15 +66,14 @@ struct ServicesView: View { } .frame(height: CGFloat(self.height - CGFloat(self.statusHeight))) .frame(maxWidth: .infinity, alignment: .center) - // .background(Color.red) VStack(alignment: .center) { HStack { Circle() - .frame(width: 12, height: 12) + .frame(width: 10, height: 10) .foregroundColor(self.manager.statusColor) Text(self.manager.statusMessage) - .font(.system(size: 12)) + .font(.system(size: 11)) if self.manager.statusColor == .red { HelpButton { let type = manager.hasError @@ -108,8 +107,6 @@ struct ServiceView: View { Text(service.name.uppercased()) .font(.system(size: 10)) .frame(minWidth: 70, alignment: .center) - .padding(.top, 4) - .padding(.bottom, 2) if isBusy { ProgressView() .scaleEffect(x: 0.4, y: 0.4, anchor: .center) @@ -163,7 +160,7 @@ struct ServiceView: View { .frame(width: 12.0, height: 12.0) .foregroundColor( service.status == .active - ? Color("StatusColorGreen") + ? Color.primary : Color("StatusColorRed") ) }