From cff7490d05f58b70241b25901c6e25aeaff31c68 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 17 May 2023 10:42:41 -0500 Subject: [PATCH] updated extension Signed-off-by: Matt Bruce --- VDS.xcodeproj/project.pbxproj | 8 ++++---- .../{VDSColor.swift => UIColor+VDSColor.swift} | 16 +++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) rename VDS/Extensions/{VDSColor.swift => UIColor+VDSColor.swift} (89%) diff --git a/VDS.xcodeproj/project.pbxproj b/VDS.xcodeproj/project.pbxproj index 63be730a..174e2101 100644 --- a/VDS.xcodeproj/project.pbxproj +++ b/VDS.xcodeproj/project.pbxproj @@ -48,7 +48,7 @@ EA5E3058295105A40082B959 /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E3057295105A40082B959 /* Tilelet.swift */; }; EA5E305A29510F8B0082B959 /* EnumSubset.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E305929510F8B0082B959 /* EnumSubset.swift */; }; EA81410B2A0E8E3C004F60D2 /* ButtonIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA81410A2A0E8E3C004F60D2 /* ButtonIcon.swift */; }; - EA8141102A127066004F60D2 /* VDSColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA81410F2A127066004F60D2 /* VDSColor.swift */; }; + EA8141102A127066004F60D2 /* UIColor+VDSColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA81410F2A127066004F60D2 /* UIColor+VDSColor.swift */; }; EA89200428AECF4B006B9984 /* UITextField+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */; }; EA89200628B526D6006B9984 /* CheckboxGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200528B526D6006B9984 /* CheckboxGroup.swift */; }; EA89201328B568D8006B9984 /* RadioBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201228B568D8006B9984 /* RadioBox.swift */; }; @@ -169,7 +169,7 @@ EA5E3057295105A40082B959 /* Tilelet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilelet.swift; sourceTree = ""; }; EA5E305929510F8B0082B959 /* EnumSubset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumSubset.swift; sourceTree = ""; }; EA81410A2A0E8E3C004F60D2 /* ButtonIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonIcon.swift; sourceTree = ""; }; - EA81410F2A127066004F60D2 /* VDSColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSColor.swift; sourceTree = ""; }; + EA81410F2A127066004F60D2 /* UIColor+VDSColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+VDSColor.swift"; sourceTree = ""; }; EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Publisher.swift"; sourceTree = ""; }; EA89200528B526D6006B9984 /* CheckboxGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxGroup.swift; sourceTree = ""; }; EA89201228B568D8006B9984 /* RadioBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBox.swift; sourceTree = ""; }; @@ -409,12 +409,12 @@ EA33622D2891EA3C0071C351 /* DispatchQueue+Once.swift */, EAB2376529E9952D00AABE9A /* UIApplication.swift */, EA3361A7288B23300071C351 /* UIColor.swift */, + EA81410F2A127066004F60D2 /* UIColor+VDSColor.swift */, EA33623D2892EE950071C351 /* UIDevice.swift */, EAF7F0B6289C12A600B287F5 /* UITapGestureRecognizer.swift */, EAB5FED329267EB300998C17 /* UIView.swift */, EAB5FF0029424ACB00998C17 /* UIControl.swift */, EA985C662970C21600F2FF2E /* VDSLayout.swift */, - EA81410F2A127066004F60D2 /* VDSColor.swift */, ); path = Extensions; sourceTree = ""; @@ -821,7 +821,7 @@ EA4DB2FD28D3D0CA00103EE3 /* AnyEquatable.swift in Sources */, EA5E305A29510F8B0082B959 /* EnumSubset.swift in Sources */, EA985BF7296C665E00F2FF2E /* IconName.swift in Sources */, - EA8141102A127066004F60D2 /* VDSColor.swift in Sources */, + EA8141102A127066004F60D2 /* UIColor+VDSColor.swift in Sources */, EAF7F0AF289B144C00B287F5 /* UnderlineLabelAttribute.swift in Sources */, EAC925842911C63100091998 /* Colorable.swift in Sources */, EAB5FEF5292D371F00998C17 /* ButtonBase.swift in Sources */, diff --git a/VDS/Extensions/VDSColor.swift b/VDS/Extensions/UIColor+VDSColor.swift similarity index 89% rename from VDS/Extensions/VDSColor.swift rename to VDS/Extensions/UIColor+VDSColor.swift index 3e29e31b..2b76e403 100644 --- a/VDS/Extensions/VDSColor.swift +++ b/VDS/Extensions/UIColor+VDSColor.swift @@ -8,8 +8,8 @@ import Foundation import VDSColorTokens -extension VDSColor { - public enum Color: String, CaseIterable { +extension UIColor { + public enum VDSColor: String, CaseIterable { case paletteBlack case paletteWhite case paletteRed @@ -97,22 +97,20 @@ extension VDSColor { case elementsLowcontrastOndark // Map each color name to its corresponding UIColor object. - public var uiColor: UIColor { + public var uiColor: UIColor { do { - let color = try VDSColor.getTokenByString(tokenName: "VDSColor.\(rawValue)") + let color = try VDSColorTokens.VDSColor.getTokenByString(tokenName: "VDSColor.\(rawValue)") return color } catch { print(error) - return VDSColor.paletteBlack + return VDSColorTokens.VDSColor.paletteBlack } } } -} -extension UIColor { - public static func isVDSColor(color: UIColor) -> Bool { + public static func isVDSColor(color: UIColor) -> Bool { guard let hex = color.hexString else { return false } - let found = VDSColor.Color.allCases.first{ $0.uiColor.hexString == hex } + let found = VDSColor.allCases.first{ $0.uiColor.hexString == hex } guard let _ = found else { return false} return true }