✨ Catalina support

igorkulman · Jan 24, 2021 · e87ae71 · e87ae71
1 parent 8cc106c
commit e87ae71
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "ChangeMenuBarColor",
     platforms: [
-        .macOS(.v11)
+        .macOS(.v10_15)
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "0.3.1"),

diff --git a/Sources/ChangeMenuBarColor/Commands/Gradient.swift b/Sources/ChangeMenuBarColor/Commands/Gradient.swift
@@ -52,7 +52,7 @@ final class Gradient: Command, ParsableCommand {
             return nil
         }
 
-        Log.debug("Generating gradient image from \(AXNameFromColor(startColor.cgColor)) to \(AXNameFromColor(endColor.cgColor))")
+        Log.debug("Generating gradient image from \(colorName(startColor)) to \(colorName(endColor))")
         guard let topImage = createGradientImage(startColor: startColor, endColor: endColor, width: screen.size.width, height: screen.menuBarHeight) else {
             return nil
         }

diff --git a/Sources/ChangeMenuBarColor/Commands/SolidColor.swift b/Sources/ChangeMenuBarColor/Commands/SolidColor.swift
@@ -5,7 +5,6 @@
 //  Created by Igor Kulman on 19.11.2020.
 //
 
-import Accessibility
 import ArgumentParser
 import Foundation
 import Cocoa
@@ -45,7 +44,7 @@ final class SolidColor: Command, ParsableCommand {
             return nil
         }
 
-        Log.debug("Generating \(AXNameFromColor(color.cgColor)) solid color image")
+        Log.debug("Generating \(colorName(color)) solid color image")
         guard let topImage = createSolidImage(color: color, width: screen.size.width, height: screen.menuBarHeight) else {
             return nil
         }

diff --git a/Sources/ChangeMenuBarColor/Extensions/ImageFunctions.swift b/Sources/ChangeMenuBarColor/Extensions/ImageFunctions.swift
@@ -5,6 +5,9 @@
 //  Created by Igor Kulman on 19.11.2020.
 //
 
+#if canImport(Accessibility)
+    import Accessibility
+#endif
 import Foundation
 import Cocoa
 
@@ -66,3 +69,11 @@ func combineImages(baseImage: NSImage, addedImage: NSImage) -> NSImage? {
 func createContext(width: CGFloat, height: CGFloat) -> CGContext? {
     return CGContext(data: nil, width: Int(width), height: Int(height), bitsPerComponent: 8, bytesPerRow: 0, space: CGColorSpaceCreateDeviceRGB(), bitmapInfo: CGImageAlphaInfo.premultipliedFirst.rawValue)
 }
+
+func colorName(_ color: NSColor) -> String {
+    if #available(OSX 11.0, *) {
+        return AXNameFromColor(color.cgColor)
+    } else {
+        return color.description
+    }
+}