mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated colors

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-01 16:24:25 -05:00
parent 0ace568f7d
commit 70071778a1
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VDS/Components/Toggle/VDSToggle.swift
View File

@ -37,13 +37,13 @@ import Combine
private func getToggleColor(for disabled: Bool, surface: Surface) -> (on: UIColor, off: UIColor) {
if disabled {
if surface == .light {
return (on: VDSColor.interactiveDisabledOnlight, off: VDSColor.interactiveDisabledOnlight)
return (on: VDSColor.elementsDisabledOnlight, off: VDSColor.elementsDisabledOnlight)
} else {
return (on: VDSColor.interactiveDisabledOndark, off: VDSColor.interactiveDisabledOndark)
return (on: VDSColor.elementsDisabledOnDark, off: VDSColor.elementsDisabledOnDark)
}
} else {
if surface == .light {
return (on: VDSColor.paletteGreen26, off: VDSColor.elementsSecondaryOndark)
return (on: VDSColor.paletteGreen26, off: VDSColor.elementsSecondaryOnlight)
} else {
return (on: VDSColor.paletteGreen34, off: VDSColor.paletteGray44)
}

25
VDS/Extensions/UIColor.swift
View File

@ -7,6 +7,12 @@
import Foundation
import UIKit
import VDSColorTokens
extension VDSColor {
public static let elementsDisabledOnlight: UIColor = .init(hexString: "#D8DADA")
public static let elementsDisabledOnDark: UIColor = .init(hexString: "#333333")
}
extension UIColor {
//--------------------------------------------------
@ -143,5 +149,22 @@ extension UIColor {
return nil
}
public 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:
(a, r, g, b) = (255, 0, 0, 0)
}
self.init(red: CGFloat(r) / 255, green: CGFloat(g) / 255, blue: CGFloat(b) / 255, alpha: CGFloat(a) / 255)
}
}