dnrops
/
DynamicColor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56 from regexident/fix-to-rgba-components 

Fix `final func toRGBAComponents()` on macOS for non-RGB colors
This commit is contained in:
Yannick Loriot 2020-01-22 17:36:32 +01:00 committed by GitHub
parent d56122538a 4fcc489c3b
commit ea8c4b22ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/DynamicColor+RGBA.swift
View File

@ -62,14 +62,11 @@ public extension DynamicColor {
return (r, g, b, a)
#elseif os(OSX)
if isEqual(DynamicColor.black) {
return (0, 0, 0, 0)
}
else if isEqual(DynamicColor.white) {
return (1, 1, 1, 1)
guard let rgbaColor = self.usingColorSpace(.deviceRGB) else {
fatalError("Could not convert color to RGBA.")
}
getRed(&r, green: &g, blue: &b, alpha: &a)
rgbaColor.getRed(&r, green: &g, blue: &b, alpha: &a)
return (r, g, b, a)
#endif

18
Tests/DynamicColor+RGBATests.swift
View File

@ -36,13 +36,19 @@ class DynamicColorRGBATests: XCTestCase {
}
func testToRGBAComponents() {
let customColor = DynamicColor(red: 0.23, green: 0.46, blue: 0.32, alpha: 1)
let rgbaColor = DynamicColor(red: 0.23, green: 0.46, blue: 0.32, alpha: 1)
let rgba1 = rgbaColor.toRGBAComponents()
XCTAssertEqual(rgba1.r, 0.23)
XCTAssertEqual(rgba1.g, 0.46)
XCTAssertEqual(rgba1.b, 0.32)
XCTAssertEqual(rgba1.a, 1.00)
let rgba = customColor.toRGBAComponents()
XCTAssert(rgba.r == 0.23, "Color red component should be equal to 0.23")
XCTAssert(rgba.g == 0.46, "Color green component should be equal to 0.46")
XCTAssert(rgba.b == 0.32, "Color blue component should be equal to 0.32")
XCTAssert(rgba.a == 1, "Color alpha component should be equal to 1")
let grayscaleColor = DynamicColor(white: 0.42, alpha: 1)
let rgba2 = grayscaleColor.toRGBAComponents()
XCTAssertEqual(rgba2.r, 0.42, accuracy: 0.001)
XCTAssertEqual(rgba2.g, 0.42, accuracy: 0.001)
XCTAssertEqual(rgba2.b, 0.42, accuracy: 0.001)
XCTAssertEqual(rgba2.a, 1.00, accuracy: 0.001)
}
func testRedComponent() {