Skip to content

Instead of UIColor, Use class Color to test selector #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yangyubo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Instead of UIColor, Use class Color to test selector #63

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66f327f
Instead of UIColor, Use class Color to test selector
yangyubo Sep 26, 2018
245cce0
Allow pass in alpha channel when creating Color from a hex string
yangyubo Nov 29, 2018
1db6174
Create Color from hex integer
yangyubo Dec 4, 2018
fad5428
iOS version of blended color
yangyubo Sep 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions Colours.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,25 @@ public extension Color {
case darkness = 0, lightness, desaturated, saturated, red, green, blue
}


// MARK: - Color from Hex/RGBA/HSBA/CIE_LAB/CMYK
convenience init(hex: String) {
convenience init(hex: String, alpha: CGFloat = 1.0) {
var rgbInt: UInt64 = 0
let newHex = hex.replacingOccurrences(of: "#", with: "")
let scanner = Scanner(string: newHex)
scanner.scanHexInt64(&rgbInt)
let r: CGFloat = CGFloat((rgbInt & 0xFF0000) >> 16)/255.0
let g: CGFloat = CGFloat((rgbInt & 0x00FF00) >> 8)/255.0
let b: CGFloat = CGFloat(rgbInt & 0x0000FF)/255.0
self.init(red: r, green: g, blue: b, alpha: 1.0)
self.init(hex: rgbInt, alpha: alpha)
}

/**
Creates a color from an hex integer (e.g. 0x3498db).
- parameter hex: A hexa-decimal UInt32 that represents a color.
- parameter alpha: The alpha channel.
*/
convenience init(hex: UInt64, alpha: CGFloat = 1.0) {
let r: CGFloat = CGFloat((hex & 0xFF0000) >> 16)/255.0
let g: CGFloat = CGFloat((hex & 0x00FF00) >> 8)/255.0
let b: CGFloat = CGFloat(hex & 0x0000FF)/255.0
self.init(red: r, green: g, blue: b, alpha: alpha)
}

convenience init(rgba: (r: CGFloat, g: CGFloat, b: CGFloat, a: CGFloat)) {
Expand Down Expand Up @@ -126,7 +134,7 @@ public extension Color {
var b: CGFloat = 0
var a: CGFloat = 0

if self.responds(to: #selector(UIColor.getHue(_:saturation:brightness:alpha:))) && self.cgColor.numberOfComponents == 4 {
if self.responds(to: #selector(Color.getHue(_:saturation:brightness:alpha:))) && self.cgColor.numberOfComponents == 4 {
self.getHue(&h, saturation: &s, brightness: &b, alpha: &a)
}

Expand Down Expand Up @@ -866,3 +874,20 @@ public extension Color {
}
}
}

#if os(iOS) || os(tvOS)
extension UIColor {
public func blended(withFraction fraction: CGFloat, of color: UIColor) -> UIColor? {
var r1: CGFloat = 1.0, g1: CGFloat = 1.0, b1: CGFloat = 1.0, a1: CGFloat = 1.0
var r2: CGFloat = 1.0, g2: CGFloat = 1.0, b2: CGFloat = 1.0, a2: CGFloat = 1.0

self.getRed(&r1, green: &g1, blue: &b1, alpha: &a1)
color.getRed(&r2, green: &g2, blue: &b2, alpha: &a2)

return UIColor(red: r1 * (1 - fraction) + r2 * fraction,
green: g1 * (1 - fraction) + g2 * fraction,
blue: b1 * (1 - fraction) + b2 * fraction,
alpha: a1 * (1 - fraction) + a2 * fraction);
}
}
#endif