From ecd25233fe31f044a9117410a35ee0fc5cba12c4 Mon Sep 17 00:00:00 2001
From: Igor Kulman <igor@kulman.sk>
Date: Sun, 7 Feb 2021 16:06:45 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A7=20removing=20hex=20colors=20li?=
 =?UTF-8?q?brary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Package.resolved                                         | 9 ---------
 Package.swift                                            | 2 --
 Sources/ChangeMenuBarColor/ChangeMenuBarColor.swift      | 1 -
 .../ChangeMenuBarColor/Commands/Abstract/Command.swift   | 1 -
 Sources/ChangeMenuBarColor/Commands/SolidColor.swift     | 1 -
 5 files changed, 14 deletions(-)

diff --git a/Package.resolved b/Package.resolved
index f625755..8ce4e98 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -27,15 +27,6 @@
           "revision": "92646c0cdbaca076c8d3d0207891785b3379cbff",
           "version": "0.3.1"
         }
-      },
-      {
-        "package": "SwiftHEXColors",
-        "repositoryURL": "https://github.com/thii/SwiftHEXColors.git",
-        "state": {
-          "branch": null,
-          "revision": "1f886cb20fedda14a5ac75efd09bc99c95b43a18",
-          "version": "1.4.1"
-        }
       }
     ]
   },
diff --git a/Package.swift b/Package.swift
index ddc18f3..90349b8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,7 +10,6 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "0.3.1"),
-        .package(url: "https://github.com/thii/SwiftHEXColors.git", from: "1.3.1"),
         .package(url: "https://github.com/onevcat/Rainbow", from: "3.0.0"),
         .package(url: "https://github.com/JohnSundell/Files", from: "4.0.0")
     ],
@@ -21,7 +20,6 @@ let package = Package(
             name: "ChangeMenuBarColor",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "SwiftHEXColors", package: "SwiftHEXColors"),
                 .product(name: "Rainbow", package: "Rainbow"),
                 .product(name: "Files", package: "Files")
             ]),
diff --git a/Sources/ChangeMenuBarColor/ChangeMenuBarColor.swift b/Sources/ChangeMenuBarColor/ChangeMenuBarColor.swift
index 81068b9..e5b73c8 100644
--- a/Sources/ChangeMenuBarColor/ChangeMenuBarColor.swift
+++ b/Sources/ChangeMenuBarColor/ChangeMenuBarColor.swift
@@ -8,7 +8,6 @@
 import ArgumentParser
 import Foundation
 import Cocoa
-import SwiftHEXColors
 
 struct ChangeMenuBarColor: ParsableCommand {
     static let configuration = CommandConfiguration(
diff --git a/Sources/ChangeMenuBarColor/Commands/Abstract/Command.swift b/Sources/ChangeMenuBarColor/Commands/Abstract/Command.swift
index cafbf80..b66e04b 100644
--- a/Sources/ChangeMenuBarColor/Commands/Abstract/Command.swift
+++ b/Sources/ChangeMenuBarColor/Commands/Abstract/Command.swift
@@ -9,7 +9,6 @@ import ArgumentParser
 import Files
 import Foundation
 import Cocoa
-import SwiftHEXColors
 
 class Command {
     func createWallpaper(screen: NSScreen) -> NSImage? {
diff --git a/Sources/ChangeMenuBarColor/Commands/SolidColor.swift b/Sources/ChangeMenuBarColor/Commands/SolidColor.swift
index ee3957d..d52e11b 100644
--- a/Sources/ChangeMenuBarColor/Commands/SolidColor.swift
+++ b/Sources/ChangeMenuBarColor/Commands/SolidColor.swift
@@ -8,7 +8,6 @@
 import ArgumentParser
 import Foundation
 import Cocoa
-import SwiftHEXColors
 
 final class SolidColor: Command, ParsableCommand {
     static let configuration = CommandConfiguration(

From cac20a01e890877b4bf852185d762a3f2d3895fd Mon Sep 17 00:00:00 2001
From: Igor Kulman <igor@kulman.sk>
Date: Sun, 7 Feb 2021 16:07:10 +0100
Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=A8=20custom=20hex=20color=20parsing?=
 =?UTF-8?q?=20with=20alpha=20support?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/NSColor+HEX.swift              | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Sources/ChangeMenuBarColor/Extensions/NSColor+HEX.swift

diff --git a/Sources/ChangeMenuBarColor/Extensions/NSColor+HEX.swift b/Sources/ChangeMenuBarColor/Extensions/NSColor+HEX.swift
new file mode 100644
index 0000000..d18d949
--- /dev/null
+++ b/Sources/ChangeMenuBarColor/Extensions/NSColor+HEX.swift
@@ -0,0 +1,30 @@
+//
+//  File.swift
+//  
+//
+//  Created by Igor Kulman on 07.02.2021.
+//
+// adapted from https://stackoverflow.com/a/33397427
+
+import Foundation
+import Cocoa
+
+extension NSColor {
+    convenience init?(hexString: String) {
+        let hex = hexString.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
+        var int = UInt64()
+        Scanner(string: hex).scanHexInt64(&int)
+        let a, r, g, b: UInt64
+        switch hex.count {
+        case 3: // RGB (12-bit)
+            (a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17)
+        case 6: // RGB (24-bit)
+            (a, r, g, b) = (255, int >> 16, int >> 8 & 0xFF, int & 0xFF)
+        case 8: // ARGB (32-bit)
+            (a, r, g, b) = (int >> 24, int >> 16 & 0xFF, int >> 8 & 0xFF, int & 0xFF)
+        default:
+            return nil
+        }
+        self.init(red: CGFloat(r) / 255, green: CGFloat(g) / 255, blue: CGFloat(b) / 255, alpha: CGFloat(a) / 255)
+    }
+}