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

84
Kit/types.swift
View File

@@ -163,60 +163,60 @@ internal let Alignments: [KeyValue_t] = [
KeyValue_t(key: "right", value: "Right alignment", additional: NSTextAlignment.right)
]
public struct Color: KeyValue_p, Equatable {
public struct SColor: KeyValue_p, Equatable {
public let key: String
public let value: String
public var additional: Any?
public static func == (lhs: Color, rhs: Color) -> Bool {
public static func == (lhs: SColor, rhs: SColor) -> Bool {
return lhs.key == rhs.key
}
}
extension Color: CaseIterable {
public static var utilization: Color { return Color(key: "utilization", value: "Based on utilization", additional: NSColor.black) }
public static var pressure: Color { return Color(key: "pressure", value: "Based on pressure", additional: NSColor.black) }
public static var cluster: Color { return Color(key: "cluster", value: "Based on cluster", additional: NSColor.controlAccentColor) }
extension SColor: CaseIterable {
public static var utilization: SColor { return SColor(key: "utilization", value: "Based on utilization", additional: NSColor.black) }
public static var pressure: SColor { return SColor(key: "pressure", value: "Based on pressure", additional: NSColor.black) }
public static var cluster: SColor { return SColor(key: "cluster", value: "Based on cluster", additional: NSColor.controlAccentColor) }
public static var separator1: Color { return Color(key: "separator_1", value: "separator_1", additional: NSColor.black) }
public static var separator1: SColor { return SColor(key: "separator_1", value: "separator_1", additional: NSColor.black) }
public static var systemAccent: Color { return Color(key: "system", value: "System accent", additional: NSColor.controlAccentColor) }
public static var monochrome: Color { return Color(key: "monochrome", value: "Monochrome accent", additional: NSColor.textColor) }
public static var systemAccent: SColor { return SColor(key: "system", value: "System accent", additional: NSColor.controlAccentColor) }
public static var monochrome: SColor { return SColor(key: "monochrome", value: "Monochrome accent", additional: NSColor.textColor) }
public static var separator2: Color { return Color(key: "separator_2", value: "separator_2", additional: NSColor.black) }
public static var separator2: SColor { return SColor(key: "separator_2", value: "separator_2", additional: NSColor.black) }
public static var clear: Color { return Color(key: "clear", value: "Clear", additional: NSColor.clear) }
public static var white: Color { return Color(key: "white", value: "White", additional: NSColor.white) }
public static var black: Color { return Color(key: "black", value: "Black", additional: NSColor.black) }
public static var gray: Color { return Color(key: "gray", value: "Gray", additional: NSColor.gray) }
public static var secondGray: Color { return Color(key: "secondGray", value: "Second gray", additional: NSColor.systemGray) }
public static var darkGray: Color { return Color(key: "darkGray", value: "Dark gray", additional: NSColor.darkGray) }
public static var lightGray: Color { return Color(key: "lightGray", value: "Light gray", additional: NSColor.lightGray) }
public static var red: Color { return Color(key: "red", value: "Red", additional: NSColor.red) }
public static var secondRed: Color { return Color(key: "secondRed", value: "Second red", additional: NSColor.systemRed) }
public static var green: Color { return Color(key: "green", value: "Green", additional: NSColor.green) }
public static var secondGreen: Color { return Color(key: "secondGreen", value: "Second green", additional: NSColor.systemGreen) }
public static var blue: Color { return Color(key: "blue", value: "Blue", additional: NSColor.blue) }
public static var secondBlue: Color { return Color(key: "secondBlue", value: "Second blue", additional: NSColor.systemBlue) }
public static var yellow: Color { return Color(key: "yellow", value: "Yellow", additional: NSColor.yellow) }
public static var secondYellow: Color { return Color(key: "secondYellow", value: "Second yellow", additional: NSColor.systemYellow) }
public static var orange: Color { return Color(key: "orange", value: "Orange", additional: NSColor.orange) }
public static var secondOrange: Color { return Color(key: "secondOrange", value: "Second orange", additional: NSColor.systemOrange) }
public static var purple: Color { return Color(key: "purple", value: "Purple", additional: NSColor.purple) }
public static var secondPurple: Color { return Color(key: "secondPurple", value: "Second purple", additional: NSColor.systemPurple) }
public static var brown: Color { return Color(key: "brown", value: "Brown", additional: NSColor.brown) }
public static var secondBrown: Color { return Color(key: "secondBrown", value: "Second brown", additional: NSColor.systemBrown) }
public static var cyan: Color { return Color(key: "cyan", value: "Cyan", additional: NSColor.cyan) }
public static var magenta: Color { return Color(key: "magenta", value: "Magenta", additional: NSColor.magenta) }
public static var pink: Color { return Color(key: "pink", value: "Pink", additional: NSColor.systemPink) }
public static var teal: Color { return Color(key: "teal", value: "Teal", additional: NSColor.systemTeal) }
public static var indigo: Color { if #available(OSX 10.15, *) {
return Color(key: "indigo", value: "Indigo", additional: NSColor.systemIndigo)
public static var clear: SColor { return SColor(key: "clear", value: "Clear", additional: NSColor.clear) }
public static var white: SColor { return SColor(key: "white", value: "White", additional: NSColor.white) }
public static var black: SColor { return SColor(key: "black", value: "Black", additional: NSColor.black) }
public static var gray: SColor { return SColor(key: "gray", value: "Gray", additional: NSColor.gray) }
public static var secondGray: SColor { return SColor(key: "secondGray", value: "Second gray", additional: NSColor.systemGray) }
public static var darkGray: SColor { return SColor(key: "darkGray", value: "Dark gray", additional: NSColor.darkGray) }
public static var lightGray: SColor { return SColor(key: "lightGray", value: "Light gray", additional: NSColor.lightGray) }
public static var red: SColor { return SColor(key: "red", value: "Red", additional: NSColor.red) }
public static var secondRed: SColor { return SColor(key: "secondRed", value: "Second red", additional: NSColor.systemRed) }
public static var green: SColor { return SColor(key: "green", value: "Green", additional: NSColor.green) }
public static var secondGreen: SColor { return SColor(key: "secondGreen", value: "Second green", additional: NSColor.systemGreen) }
public static var blue: SColor { return SColor(key: "blue", value: "Blue", additional: NSColor.blue) }
public static var secondBlue: SColor { return SColor(key: "secondBlue", value: "Second blue", additional: NSColor.systemBlue) }
public static var yellow: SColor { return SColor(key: "yellow", value: "Yellow", additional: NSColor.yellow) }
public static var secondYellow: SColor { return SColor(key: "secondYellow", value: "Second yellow", additional: NSColor.systemYellow) }
public static var orange: SColor { return SColor(key: "orange", value: "Orange", additional: NSColor.orange) }
public static var secondOrange: SColor { return SColor(key: "secondOrange", value: "Second orange", additional: NSColor.systemOrange) }
public static var purple: SColor { return SColor(key: "purple", value: "Purple", additional: NSColor.purple) }
public static var secondPurple: SColor { return SColor(key: "secondPurple", value: "Second purple", additional: NSColor.systemPurple) }
public static var brown: SColor { return SColor(key: "brown", value: "Brown", additional: NSColor.brown) }
public static var secondBrown: SColor { return SColor(key: "secondBrown", value: "Second brown", additional: NSColor.systemBrown) }
public static var cyan: SColor { return SColor(key: "cyan", value: "Cyan", additional: NSColor.cyan) }
public static var magenta: SColor { return SColor(key: "magenta", value: "Magenta", additional: NSColor.magenta) }
public static var pink: SColor { return SColor(key: "pink", value: "Pink", additional: NSColor.systemPink) }
public static var teal: SColor { return SColor(key: "teal", value: "Teal", additional: NSColor.systemTeal) }
public static var indigo: SColor { if #available(OSX 10.15, *) {
return SColor(key: "indigo", value: "Indigo", additional: NSColor.systemIndigo)
} else {
return Color(key: "indigo", value: "Indigo", additional: NSColor(red: 75, green: 0, blue: 130, alpha: 1))
return SColor(key: "indigo", value: "Indigo", additional: NSColor(red: 75, green: 0, blue: 130, alpha: 1))
} }
public static var allCases: [Color] {
public static var allCases: [SColor] {
return [.utilization, .pressure, .cluster, separator1,
.systemAccent, .monochrome, separator2,
.clear, .white, .black, .gray, .secondGray, .darkGray, .lightGray,
@@ -226,7 +226,7 @@ extension Color: CaseIterable {
]
}
public static var allColors: [Color] {
public static var allColors: [SColor] {
return [.systemAccent, .monochrome, .separator2, .clear, .white, .black, .gray, .secondGray, .darkGray, .lightGray,
.red, .secondRed, .green, .secondGreen, .blue, .secondBlue, .yellow, .secondYellow,
.orange, .secondOrange, .purple, .secondPurple, .brown, .secondBrown,
@@ -234,8 +234,8 @@ extension Color: CaseIterable {
]
}
public static func fromString(_ key: String, defaultValue: Color = .systemAccent) -> Color {
return Color.allCases.first{ $0.key == key } ?? defaultValue
public static func fromString(_ key: String, defaultValue: SColor = .systemAccent) -> SColor {
return SColor.allCases.first{ $0.key == key } ?? defaultValue
}
}