From ff6b0ed8650e5a4a03767ff8496e65ede7b71d1d Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Tue, 20 Jun 2023 16:51:19 +0200 Subject: [PATCH] feat: moved from the HEX colors to the RGB --- Kit/extensions.swift | 18 ------------------ Kit/module/settings.swift | 4 ++-- Kit/types.swift | 2 +- Modules/Bluetooth/popup.swift | 2 +- Modules/Clock/popup.swift | 2 +- Modules/Disk/popup.swift | 2 +- Modules/GPU/popup.swift | 2 +- Modules/Sensors/popup.swift | 2 +- 8 files changed, 8 insertions(+), 26 deletions(-) diff --git a/Kit/extensions.swift b/Kit/extensions.swift index 24f372d0..65e074d6 100644 --- a/Kit/extensions.swift +++ b/Kit/extensions.swift @@ -469,24 +469,6 @@ extension URL { } public extension NSColor { - convenience init(hexString: String, alpha: CGFloat = 1.0) { - let hexString: String = hexString.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) - let scanner = Scanner(string: hexString) - if hexString.hasPrefix("#") { - scanner.scanLocation = 1 - } - var color: UInt32 = 0 - scanner.scanHexInt32(&color) - let mask = 0x000000FF - let r = Int(color >> 16) & mask - let g = Int(color >> 8) & mask - let b = Int(color) & mask - let red = CGFloat(r) / 255.0 - let green = CGFloat(g) / 255.0 - let blue = CGFloat(b) / 255.0 - self.init(red: red, green: green, blue: blue, alpha: alpha) - } - func grayscaled() -> NSColor { guard let space = CGColorSpace(name: CGColorSpace.extendedGray), let cg = self.cgColor.converted(to: space, intent: .perceptual, options: nil), diff --git a/Kit/module/settings.swift b/Kit/module/settings.swift index 1e983e5b..cbdfe434 100644 --- a/Kit/module/settings.swift +++ b/Kit/module/settings.swift @@ -277,7 +277,7 @@ class WidgetSelectorView: NSStackView { let separator = NSView() separator.identifier = NSUserInterfaceItemIdentifier(rawValue: "separator") separator.wantsLayer = true - separator.layer?.backgroundColor = NSColor(hexString: "#d5d5d5").cgColor + separator.layer?.backgroundColor = NSColor(red: 213/255, green: 213/255, blue: 213/255, alpha: 1).cgColor self.addArrangedSubview(separator) inactive.forEach { (widget: WidgetPreview) in @@ -414,7 +414,7 @@ internal class WidgetPreview: NSStackView { self.wantsLayer = true self.layer?.cornerRadius = 2 - self.layer?.borderColor = NSColor(hexString: "#dddddd").cgColor + self.layer?.borderColor = NSColor(red: 221/255, green: 221/255, blue: 221/255, alpha: 1).cgColor self.layer?.borderWidth = 1 self.layer?.backgroundColor = NSColor.white.cgColor diff --git a/Kit/types.swift b/Kit/types.swift index b168344c..28a15e39 100644 --- a/Kit/types.swift +++ b/Kit/types.swift @@ -193,7 +193,7 @@ extension Color: CaseIterable { public static var indigo: Color { if #available(OSX 10.15, *) { return Color(key: "indigo", value: "Indigo", additional: NSColor.systemIndigo) } else { - return Color(key: "indigo", value: "Indigo", additional: NSColor(hexString: "#4B0082")) + return Color(key: "indigo", value: "Indigo", additional: NSColor(red: 75, green: 0, blue: 130, alpha: 1)) } } public static var allCases: [Color] { diff --git a/Modules/Bluetooth/popup.swift b/Modules/Bluetooth/popup.swift index 8fdb661f..e966f64f 100644 --- a/Modules/Bluetooth/popup.swift +++ b/Modules/Bluetooth/popup.swift @@ -100,7 +100,7 @@ internal class BLEView: NSStackView { } override func updateLayer() { - self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor + self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor } public func update(_ batteryLevel: [KeyValue_t]) { diff --git a/Modules/Clock/popup.swift b/Modules/Clock/popup.swift index 7dc3de68..f123a2c7 100644 --- a/Modules/Clock/popup.swift +++ b/Modules/Clock/popup.swift @@ -134,7 +134,7 @@ private class ClockView: NSStackView { } override func updateLayer() { - self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor + self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor } private func setTZ() { diff --git a/Modules/Disk/popup.swift b/Modules/Disk/popup.swift index 7105b542..71222182 100644 --- a/Modules/Disk/popup.swift +++ b/Modules/Disk/popup.swift @@ -230,7 +230,7 @@ internal class DiskView: NSStackView { } override func updateLayer() { - self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor + self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor } public func update(free: Int64, smart: smart_t?) { diff --git a/Modules/GPU/popup.swift b/Modules/GPU/popup.swift index eca0c3a3..04dbc182 100644 --- a/Modules/GPU/popup.swift +++ b/Modules/GPU/popup.swift @@ -102,7 +102,7 @@ private class GPUView: NSStackView { } override func updateLayer() { - self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor + self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor } private func title() -> NSView { diff --git a/Modules/Sensors/popup.swift b/Modules/Sensors/popup.swift index b1e152ec..e2145587 100644 --- a/Modules/Sensors/popup.swift +++ b/Modules/Sensors/popup.swift @@ -541,7 +541,7 @@ internal class FanView: NSStackView { } override func updateLayer() { - self.layer?.backgroundColor = isDarkMode ? NSColor(hexString: "#111111", alpha: 0.25).cgColor : NSColor(hexString: "#f5f5f5", alpha: 1).cgColor + self.layer?.backgroundColor = (isDarkMode ? NSColor(red: 17/255, green: 17/255, blue: 17/255, alpha: 0.25) : NSColor(red: 245/255, green: 245/255, blue: 245/255, alpha: 1)).cgColor } private func nameAndSpeed() {