Merge pull request #47 from igorkulman/feature/argb-support

ARGB support
igorkulman · Feb 7, 2021 · 8fc4d53 · 8fc4d53
2 parents 67f3cb0 + cac20a0
commit 8fc4d53
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,6 @@
 import ArgumentParser
 import Foundation
 import Cocoa
-import SwiftHEXColors
 
 final class SolidColor: Command, ParsableCommand {
     static let configuration = CommandConfiguration(

diff --git a/Sources/ChangeMenuBarColor/Extensions/NSColor+HEX.swift 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)
+    }
+}