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

Removing func as the static dictionary can carry the weight.

Browse Source
This commit is contained in:
Kevin G Christiano 2020-02-03 09:00:03 -05:00
parent c81f68d66d
commit be2e9473b3
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MVMCoreUI/Categories/UIColor+Extension.swift
View File

@ -6,11 +6,11 @@
// Copyright © 2019 Verizon Wireless. All rights reserved. // Copyright © 2019 Verizon Wireless. All rights reserved.
// //
import UIKit import UIKit
public typealias ColorHexTuple = (uiColor: UIColor, hex: String) public typealias ColorHexTuple = (uiColor: UIColor, hex: String)
extension UIColor { extension UIColor {
/// Dictionary to access brand approved colors by name. /// Dictionary to access brand approved colors by name.
@ -200,9 +200,4 @@ extension UIColor {
return nil return nil
} }
public class func getColorAndHexFromName(_ name: String) -> ColorHexTuple? {
return names[name]
}
} }

4
MVMCoreUI/CustomPrimitives/Color.swift
View File

@ -56,7 +56,7 @@ public final class Color: Codable {
} }
init?(name: String) { init?(name: String) {
guard let colorTuple = UIColor.getColorAndHexFromName(name) else { return nil } guard let colorTuple = UIColor.names[name] else { return nil }
self.uiColor = colorTuple.uiColor self.uiColor = colorTuple.uiColor
self.hex = colorTuple.hex self.hex = colorTuple.hex
determineRGBA() determineRGBA()
@ -73,7 +73,7 @@ public final class Color: Codable {
if colorString.hasPrefix("#") { if colorString.hasPrefix("#") {
hex = colorString.replacingOccurrences(of: "#", with: "") hex = colorString.replacingOccurrences(of: "#", with: "")
} else { } else {
guard let hex = UIColor.getColorAndHexFromName(colorString)?.hex else { throw ColorError.badName(reason: "Check the spelling of your color.") } guard let hex = UIColor.names[colorString]?.hex else { throw ColorError.badName(reason: "Check the spelling of your color.") }
self.hex = hex.replacingOccurrences(of: "#", with: "") self.hex = hex.replacingOccurrences(of: "#", with: "")
name = colorString name = colorString
} }