morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: renamed Color and Widget to SColor and SWidget to be compatible with SwiftUI

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-07-04 19:52:52 +02:00
parent e39584241e
commit d85f148cc3
29 changed files with 212 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/CPU/main.swift
View File

@@ -50,34 +50,34 @@ public class CPU: Module {
Store.shared.bool(key: "\(self.config.name)_clustersGroup", defaultValue: false)
}
private var systemColor: NSColor {
let color = Color.secondRed
let color = SColor.secondRed
let key = Store.shared.string(key: "\(self.config.name)_systemColor", defaultValue: color.key)
if let c = Color.fromString(key).additional as? NSColor {
if let c = SColor.fromString(key).additional as? NSColor {
return c
}
return color.additional as! NSColor
}
private var userColor: NSColor {
let color = Color.secondBlue
let color = SColor.secondBlue
let key = Store.shared.string(key: "\(self.config.name)_userColor", defaultValue: color.key)
if let c = Color.fromString(key).additional as? NSColor {
if let c = SColor.fromString(key).additional as? NSColor {
return c
}
return color.additional as! NSColor
}
private var eCoreColor: NSColor {
let color = Color.teal
let color = SColor.teal
let key = Store.shared.string(key: "\(self.config.name)_eCoresColor", defaultValue: color.key)
if let c = Color.fromString(key).additional as? NSColor {
if let c = SColor.fromString(key).additional as? NSColor {
return c
}
return color.additional as! NSColor
}
private var pCoreColor: NSColor {
let color = Color.secondBlue
let color = SColor.secondBlue
let key = Store.shared.string(key: "\(self.config.name)_pCoresColor", defaultValue: color.key)
if let c = Color.fromString(key).additional as? NSColor {
if let c = SColor.fromString(key).additional as? NSColor {
return c
}
return color.additional as! NSColor
@@ -166,7 +166,7 @@ public class CPU: Module {
WidgetCenter.shared.reloadTimelines(ofKind: CPU_entry.kind)
}
self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: Widget) in
self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: SWidget) in
switch w.item {
case let widget as Mini: widget.setValue(value.totalUsage)
case let widget as LineChart: widget.setValue(value.totalUsage)

48
Modules/CPU/popup.swift
View File

@@ -73,17 +73,17 @@ internal class Popup: PopupWrapper {
private var lineChartScale: Scale = .none
private var lineChartFixedScale: Double = 1
private var systemColorState: Color = .secondRed
private var systemColorState: SColor = .secondRed
private var systemColor: NSColor { self.systemColorState.additional as? NSColor ?? NSColor.systemRed }
private var userColorState: Color = .secondBlue
private var userColorState: SColor = .secondBlue
private var userColor: NSColor { self.userColorState.additional as? NSColor ?? NSColor.systemBlue }
private var idleColorState: Color = .lightGray
private var idleColorState: SColor = .lightGray
private var idleColor: NSColor { self.idleColorState.additional as? NSColor ?? NSColor.lightGray }
private var chartColorState: Color = .systemAccent
private var chartColorState: SColor = .systemAccent
private var chartColor: NSColor { self.chartColorState.additional as? NSColor ?? NSColor.systemBlue }
private var eCoresColorState: Color = .teal
private var eCoresColorState: SColor = .teal
private var eCoresColor: NSColor { self.eCoresColorState.additional as? NSColor ?? NSColor.systemTeal }
private var pCoresColorState: Color = .secondBlue
private var pCoresColorState: SColor = .secondBlue
private var pCoresColor: NSColor { self.pCoresColorState.additional as? NSColor ?? NSColor.systemBlue }
private var numberOfProcesses: Int {
@@ -117,12 +117,12 @@ internal class Popup: PopupWrapper {
))
self.setFrameSize(NSSize(width: self.frame.width, height: self.frame.height + self.detailsHeight + self.processesHeight))
self.systemColorState = Color.fromString(Store.shared.string(key: "\(self.title)_systemColor", defaultValue: self.systemColorState.key))
self.userColorState = Color.fromString(Store.shared.string(key: "\(self.title)_userColor", defaultValue: self.userColorState.key))
self.idleColorState = Color.fromString(Store.shared.string(key: "\(self.title)_idleColor", defaultValue: self.idleColorState.key))
self.chartColorState = Color.fromString(Store.shared.string(key: "\(self.title)_chartColor", defaultValue: self.chartColorState.key))
self.eCoresColorState = Color.fromString(Store.shared.string(key: "\(self.title)_eCoresColor", defaultValue: self.eCoresColorState.key))
self.pCoresColorState = Color.fromString(Store.shared.string(key: "\(self.title)_pCoresColor", defaultValue: self.pCoresColorState.key))
self.systemColorState = SColor.fromString(Store.shared.string(key: "\(self.title)_systemColor", defaultValue: self.systemColorState.key))
self.userColorState = SColor.fromString(Store.shared.string(key: "\(self.title)_userColor", defaultValue: self.userColorState.key))
self.idleColorState = SColor.fromString(Store.shared.string(key: "\(self.title)_idleColor", defaultValue: self.idleColorState.key))
self.chartColorState = SColor.fromString(Store.shared.string(key: "\(self.title)_chartColor", defaultValue: self.chartColorState.key))
self.eCoresColorState = SColor.fromString(Store.shared.string(key: "\(self.title)_eCoresColor", defaultValue: self.eCoresColorState.key))
self.pCoresColorState = SColor.fromString(Store.shared.string(key: "\(self.title)_pCoresColor", defaultValue: self.pCoresColorState.key))
self.lineChartHistory = Store.shared.int(key: "\(self.title)_lineChartHistory", defaultValue: self.lineChartHistory)
self.lineChartScale = Scale.fromString(Store.shared.string(key: "\(self.title)_lineChartScale", defaultValue: self.lineChartScale.key))
self.lineChartFixedScale = Double(Store.shared.int(key: "\(self.title)_lineChartFixedScale", defaultValue: 100)) / 100
@@ -476,17 +476,17 @@ internal class Popup: PopupWrapper {
view.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("System color"), component: selectView(
action: #selector(self.toggleSystemColor),
items: Color.allColors,
items: SColor.allColors,
selected: self.systemColorState.key
)),
PreferencesRow(localizedString("User color"), component: selectView(
action: #selector(self.toggleUserColor),
items: Color.allColors,
items: SColor.allColors,
selected: self.userColorState.key
)),
PreferencesRow(localizedString("Idle color"), component: selectView(
action: #selector(self.toggleIdleColor),
items: Color.allColors,
items: SColor.allColors,
selected: self.idleColorState.key
))
]))
@@ -494,12 +494,12 @@ internal class Popup: PopupWrapper {
view.addArrangedSubview(PreferencesSection([
PreferencesRow(localizedString("Efficiency cores color"), component: selectView(
action: #selector(self.toggleECoresColor),
items: Color.allColors,
items: SColor.allColors,
selected: self.eCoresColorState.key
)),
PreferencesRow(localizedString("Performance cores color"), component: selectView(
action: #selector(self.togglePCoresColor),
items: Color.allColors,
items: SColor.allColors,
selected: self.pCoresColorState.key
))
]))
@@ -512,7 +512,7 @@ internal class Popup: PopupWrapper {
self.chartPrefSection = PreferencesSection([
PreferencesRow(localizedString("Chart color"), component: selectView(
action: #selector(self.toggleChartColor),
items: Color.allColors,
items: SColor.allColors,
selected: self.chartColorState.key
)),
PreferencesRow(localizedString("Chart history"), component: selectView(
@@ -534,7 +534,7 @@ internal class Popup: PopupWrapper {
}
@objc private func toggleSystemColor(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String, let newValue = Color.allColors.first(where: { $0.key == key }) else {
guard let key = sender.representedObject as? String, let newValue = SColor.allColors.first(where: { $0.key == key }) else {
return
}
self.systemColorState = newValue
@@ -542,7 +542,7 @@ internal class Popup: PopupWrapper {
self.systemColorView?.layer?.backgroundColor = (newValue.additional as? NSColor)?.cgColor
}
@objc private func toggleUserColor(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String, let newValue = Color.allColors.first(where: { $0.key == key }) else {
guard let key = sender.representedObject as? String, let newValue = SColor.allColors.first(where: { $0.key == key }) else {
return
}
self.userColorState = newValue
@@ -550,7 +550,7 @@ internal class Popup: PopupWrapper {
self.userColorView?.layer?.backgroundColor = (newValue.additional as? NSColor)?.cgColor
}
@objc private func toggleIdleColor(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String, let newValue = Color.allColors.first(where: { $0.key == key }) else {
guard let key = sender.representedObject as? String, let newValue = SColor.allColors.first(where: { $0.key == key }) else {
return
}
self.idleColorState = newValue
@@ -561,7 +561,7 @@ internal class Popup: PopupWrapper {
self.idleColorView?.layer?.backgroundColor = (newValue.additional as? NSColor)?.cgColor
}
@objc private func toggleChartColor(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String, let newValue = Color.allColors.first(where: { $0.key == key }) else {
guard let key = sender.representedObject as? String, let newValue = SColor.allColors.first(where: { $0.key == key }) else {
return
}
self.chartColorState = newValue
@@ -571,7 +571,7 @@ internal class Popup: PopupWrapper {
}
}
@objc private func toggleECoresColor(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String, let newValue = Color.allColors.first(where: { $0.key == key }) else {
guard let key = sender.representedObject as? String, let newValue = SColor.allColors.first(where: { $0.key == key }) else {
return
}
self.eCoresColorState = newValue
@@ -579,7 +579,7 @@ internal class Popup: PopupWrapper {
self.eCoresColorView?.layer?.backgroundColor = (newValue.additional as? NSColor)?.cgColor
}
@objc private func togglePCoresColor(_ sender: NSMenuItem) {
guard let key = sender.representedObject as? String, let newValue = Color.allColors.first(where: { $0.key == key }) else {
guard let key = sender.representedObject as? String, let newValue = SColor.allColors.first(where: { $0.key == key }) else {
return
}
self.pCoresColorState = newValue

20
Modules/CPU/portal.swift
View File

@@ -35,15 +35,15 @@ public class Portal: PortalWrapper {
private var eCoresColorView: NSView? = nil
private var pCoresColorView: NSView? = nil
private var systemColorState: Color = .secondRed
private var systemColorState: SColor = .secondRed
private var systemColor: NSColor { self.systemColorState.additional as? NSColor ?? NSColor.systemRed }
private var userColorState: Color = .secondBlue
private var userColorState: SColor = .secondBlue
private var userColor: NSColor { self.userColorState.additional as? NSColor ?? NSColor.systemBlue }
private var idleColorState: Color = .lightGray
private var idleColorState: SColor = .lightGray
private var idleColor: NSColor { self.idleColorState.additional as? NSColor ?? NSColor.lightGray }
private var eCoresColorState: Color = .teal
private var eCoresColorState: SColor = .teal
private var eCoresColor: NSColor { self.eCoresColorState.additional as? NSColor ?? NSColor.systemTeal }
private var pCoresColorState: Color = .secondBlue
private var pCoresColorState: SColor = .secondBlue
private var pCoresColor: NSColor { self.pCoresColorState.additional as? NSColor ?? NSColor.systemBlue }
public override func load() {
@@ -73,11 +73,11 @@ public class Portal: PortalWrapper {
}
public func loadColors() {
self.systemColorState = Color.fromString(Store.shared.string(key: "\(self.name)_systemColor", defaultValue: self.systemColorState.key))
self.userColorState = Color.fromString(Store.shared.string(key: "\(self.name)_userColor", defaultValue: self.userColorState.key))
self.idleColorState = Color.fromString(Store.shared.string(key: "\(self.name)_idleColor", defaultValue: self.idleColorState.key))
self.eCoresColorState = Color.fromString(Store.shared.string(key: "\(self.name)_eCoresColor", defaultValue: self.eCoresColorState.key))
self.pCoresColorState = Color.fromString(Store.shared.string(key: "\(self.name)_pCoresColor", defaultValue: self.pCoresColorState.key))
self.systemColorState = SColor.fromString(Store.shared.string(key: "\(self.name)_systemColor", defaultValue: self.systemColorState.key))
self.userColorState = SColor.fromString(Store.shared.string(key: "\(self.name)_userColor", defaultValue: self.userColorState.key))
self.idleColorState = SColor.fromString(Store.shared.string(key: "\(self.name)_idleColor", defaultValue: self.idleColorState.key))
self.eCoresColorState = SColor.fromString(Store.shared.string(key: "\(self.name)_eCoresColor", defaultValue: self.eCoresColorState.key))
self.pCoresColorState = SColor.fromString(Store.shared.string(key: "\(self.name)_pCoresColor", defaultValue: self.pCoresColorState.key))
}
private func charts() -> NSView {

15
Modules/CPU/widget.swift
View File

@@ -12,6 +12,7 @@
import SwiftUI
import WidgetKit
import Charts
import Kit
public struct CPU_entry: TimelineEntry {
public static let kind = "CPUWidget"
@@ -61,9 +62,9 @@ public struct CPUWidget: Widget {
if let value = entry.value {
HStack {
Chart {
SectorMark(angle: .value("System load", value.systemLoad), innerRadius: .ratio(0.8)).foregroundStyle(self.systemColor)
SectorMark(angle: .value("User load", value.userLoad), innerRadius: .ratio(0.8)).foregroundStyle(self.userColor)
SectorMark(angle: .value("Idle", value.idleLoad), innerRadius: .ratio(0.8)).foregroundStyle(self.idleColor)
SectorMark(angle: .value(localizedString("System"), value.systemLoad), innerRadius: .ratio(0.8)).foregroundStyle(self.systemColor)
SectorMark(angle: .value(localizedString("User"), value.userLoad), innerRadius: .ratio(0.8)).foregroundStyle(self.userColor)
SectorMark(angle: .value(localizedString("Idle"), value.idleLoad), innerRadius: .ratio(0.8)).foregroundStyle(self.idleColor)
}
.frame(maxWidth: .infinity, maxHeight: 84)
.chartLegend(.hidden)
@@ -81,17 +82,13 @@ public struct CPUWidget: Widget {
VStack(spacing: 3) {
HStack {
Rectangle().fill(self.systemColor).frame(width: 12, height: 12).cornerRadius(2)
Text("System:")
.font(.system(size: 12, weight: .regular))
.foregroundColor(.secondary)
Text(localizedString("System")).font(.system(size: 12, weight: .regular)).foregroundColor(.secondary)
Spacer()
Text("\(Int(value.systemLoad*100))%")
}
HStack {
Rectangle().fill(self.userColor).frame(width: 12, height: 12).cornerRadius(2)
Text("User:")
.font(.system(size: 12, weight: .regular))
.foregroundColor(.secondary)
Text(localizedString("User")).font(.system(size: 12, weight: .regular)).foregroundColor(.secondary)
Spacer()
Text("\(Int(value.userLoad*100))%")
}