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

Merge branch 'update/colorTokens' into 'develop'

Browse Source 
removed extension for color tokens update

See merge request BPHV_MIPS/vds_ios!63
This commit is contained in:
Bruce, Matt R 2023-05-03 17:24:27 +00:00
commit 66f7b7d87f
8 changed files with 98 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VDS.xcodeproj/project.pbxproj
View File

@ -44,7 +44,6 @@
EA4DB2FD28D3D0CA00103EE3 /* AnyEquatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB2FC28D3D0CA00103EE3 /* AnyEquatable.swift */; };
EA4DB30228DCBCA500103EE3 /* Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DB30128DCBCA500103EE3 /* Badge.swift */; };
EA5E304C294CBDD00082B959 /* TileContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304B294CBDD00082B959 /* TileContainer.swift */; };
EA5E304E294CC7F00082B959 /* VDSColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E304D294CC7F00082B959 /* VDSColor.swift */; };
EA5E30532950DDA60082B959 /* TitleLockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E30522950DDA60082B959 /* TitleLockup.swift */; };
EA5E3058295105A40082B959 /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E3057295105A40082B959 /* Tilelet.swift */; };
EA5E305A29510F8B0082B959 /* EnumSubset.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E305929510F8B0082B959 /* EnumSubset.swift */; };
@ -166,7 +165,6 @@
EA4DB2FC28D3D0CA00103EE3 /* AnyEquatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyEquatable.swift; sourceTree = "<group>"; };
EA4DB30128DCBCA500103EE3 /* Badge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Badge.swift; sourceTree = "<group>"; };
EA5E304B294CBDD00082B959 /* TileContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileContainer.swift; sourceTree = "<group>"; };
EA5E304D294CC7F00082B959 /* VDSColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VDSColor.swift; sourceTree = "<group>"; };
EA5E30522950DDA60082B959 /* TitleLockup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockup.swift; sourceTree = "<group>"; };
EA5E3057295105A40082B959 /* Tilelet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilelet.swift; sourceTree = "<group>"; };
EA5E305929510F8B0082B959 /* EnumSubset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumSubset.swift; sourceTree = "<group>"; };
@ -415,7 +413,6 @@
EAF7F0B6289C12A600B287F5 /* UITapGestureRecognizer.swift */,
EAB5FED329267EB300998C17 /* UIView.swift */,
EAB5FF0029424ACB00998C17 /* UIControl.swift */,
EA5E304D294CC7F00082B959 /* VDSColor.swift */,
EA985C662970C21600F2FF2E /* VDSLayout.swift */,
);
path = Extensions;
@ -855,7 +852,6 @@
EA3361AF288B26310071C351 /* FormFieldable.swift in Sources */,
44604AD729CE196600E62B51 /* Line.swift in Sources */,
EA5E3058295105A40082B959 /* Tilelet.swift in Sources */,
EA5E304E294CC7F00082B959 /* VDSColor.swift in Sources */,
EA89201528B56CF4006B9984 /* RadioBoxGroup.swift in Sources */,
EAF7F09E289AAEC000B287F5 /* Constants.swift in Sources */,
EA985C1D296CD13600F2FF2E /* BundleManager.swift in Sources */,

12
VDS/Components/Badge/Badge.swift
View File

@ -84,12 +84,12 @@ open class Badge: View {
private var backgroundColorConfig: AnyColorable = {
let config = KeyedColorConfiguration<Badge, FillColor>(keyPath: \.fillColor)
config.setSurfaceColors(VDSColor.backgroundBrandhighlight, VDSColor.backgroundBrandhighlight, forKey: .red)
config.setSurfaceColors(VDSColor.paletteYellow62, VDSColor.paletteYellow62, forKey: .yellow)
config.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forKey: .green)
config.setSurfaceColors(VDSColor.paletteOrange39, VDSColor.paletteOrange46, forKey: .orange)
config.setSurfaceColors(VDSColor.paletteBlue35, VDSColor.paletteBlue45, forKey: .blue)
config.setSurfaceColors(VDSColor.paletteBlack, VDSColor.paletteBlack, forKey: .black)
config.setSurfaceColors(VDSColor.paletteWhite, VDSColor.paletteWhite, forKey: .white)
config.setSurfaceColors(VDSColor.paletteYellow53, VDSColor.paletteYellow53, forKey: .yellow)
config.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen36, forKey: .green)
config.setSurfaceColors(VDSColor.paletteOrange41, VDSColor.paletteOrange58, forKey: .orange)
config.setSurfaceColors(VDSColor.paletteBlue38, VDSColor.paletteBlue46, forKey: .blue)
config.setSurfaceColors(VDSColor.backgroundPrimaryDark, VDSColor.backgroundPrimaryDark, forKey: .black)
config.setSurfaceColors(VDSColor.backgroundPrimaryLight, VDSColor.backgroundPrimaryLight, forKey: .white)
return config.eraseToAnyColorable()
}()

145
VDS/Components/Icon/IconColor.swift
View File

@ -20,72 +20,95 @@ extension Icon {
case gray44
case gray20
case gray11
case orange91
case orange46
case orange39
case orange15
case orange94
case orange83
case orange71
case orange58
case orange41
case orange24
case orange17
case yellow94
case yellow62
case yellow87
case yellow74
case yellow53
case yellow39
case yellow20
case blue91
case blue45
case blue35
case blue13
case green89
case green34
case yellow15
case blue94
case blue82
case blue62
case blue46
case blue38
case blue21
case blue15
case green91
case green77
case green61
case green36
case green26
case green11
case green15
case green10
case pink87
case pink76
case pink62
case pink46
case pink25
case purple85
case purple75
case purple60
case purple39
case purple20
// Map each color name to its corresponding UIColor object.
public var value: UIColor {
switch self {
case .black:
return VDSColor.paletteBlack
case .white:
return VDSColor.paletteWhite
case .red:
return VDSColor.paletteRed
case .gray95:
return VDSColor.paletteGray95
case .gray85:
return VDSColor.paletteGray85
case .gray65:
return VDSColor.paletteGray65
case .gray44:
return VDSColor.paletteGray44
case .gray20:
return VDSColor.paletteGray20
case .gray11:
return VDSColor.paletteGray11
case .orange91:
return VDSColor.paletteOrange91
case .orange46:
return VDSColor.paletteOrange46
case .orange39:
return VDSColor.paletteOrange39
case .orange15:
return VDSColor.paletteOrange15
case .yellow94:
return VDSColor.paletteYellow94
case .yellow62:
return VDSColor.paletteYellow62
case .yellow20:
return VDSColor.paletteYellow20
case .blue91:
return VDSColor.paletteBlue91
case .blue45:
return VDSColor.paletteBlue45
case .blue35:
return VDSColor.paletteBlue35
case .blue13:
return VDSColor.paletteBlue13
case .green89:
return VDSColor.paletteGreen89
case .green34:
return VDSColor.paletteGreen34
case .green26:
return VDSColor.paletteGreen26
case .green11:
return VDSColor.paletteGreen11
case .black: return VDSColor.paletteBlack
case .white: return VDSColor.paletteWhite
case .red: return VDSColor.paletteRed
case .gray95: return VDSColor.paletteGray95
case .gray85: return VDSColor.paletteGray85
case .gray65: return VDSColor.paletteGray65
case .gray44: return VDSColor.paletteGray44
case .gray20: return VDSColor.paletteGray20
case .gray11: return VDSColor.paletteGray11
case .orange94: return VDSColor.paletteOrange94
case .orange83: return VDSColor.paletteOrange83
case .orange71: return VDSColor.paletteOrange71
case .orange58: return VDSColor.paletteOrange58
case .orange41: return VDSColor.paletteOrange41
case .orange24: return VDSColor.paletteOrange24
case .orange17: return VDSColor.paletteOrange17
case .yellow94: return VDSColor.paletteYellow94
case .yellow87: return VDSColor.paletteYellow87
case .yellow74: return VDSColor.paletteYellow74
case .yellow53: return VDSColor.paletteYellow53
case .yellow39: return VDSColor.paletteYellow39
case .yellow20: return VDSColor.paletteYellow20
case .yellow15: return VDSColor.paletteYellow15
case .blue94: return VDSColor.paletteBlue94
case .blue82: return VDSColor.paletteBlue82
case .blue62: return VDSColor.paletteBlue62
case .blue46: return VDSColor.paletteBlue46
case .blue38: return VDSColor.paletteBlue38
case .blue21: return VDSColor.paletteBlue21
case .blue15: return VDSColor.paletteBlue15
case .green91: return VDSColor.paletteGreen91
case .green77: return VDSColor.paletteGreen77
case .green61: return VDSColor.paletteGreen61
case .green36: return VDSColor.paletteGreen36
case .green26: return VDSColor.paletteGreen26
case .green15: return VDSColor.paletteGreen15
case .green10: return VDSColor.paletteGreen10
case .pink87: return VDSColor.palettePink87
case .pink76: return VDSColor.palettePink76
case .pink62: return VDSColor.palettePink62
case .pink46: return VDSColor.palettePink46
case .pink25: return VDSColor.palettePink25
case .purple85: return VDSColor.palettePurple85
case .purple75: return VDSColor.palettePurple75
case .purple60: return VDSColor.palettePurple60
case .purple39: return VDSColor.palettePurple39
case .purple20: return VDSColor.palettePurple20
}
}
}

2
VDS/Components/Line/Line.swift
View File

@ -54,7 +54,7 @@ open class Line: View {
public var lineViewColorConfig: AnyColorable = {
let config = KeyedColorConfiguration<Line, Style>(keyPath: \.style)
config.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forKey: .primary)
config.setSurfaceColors(VDSColor.elementsLowContrastOnLight, VDSColor.elementsLowContrastOnDark, forKey: .secondary)
config.setSurfaceColors(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark, forKey: .secondary)
return config.eraseToAnyColorable()
}()

4
VDS/Components/TileContainer/TileContainer.swift
View File

@ -202,8 +202,8 @@ open class TileContainer: Control {
private var backgroundColorConfig = BackgroundColorConfiguration()
private var borderColorConfig = SurfaceColorConfiguration().with {
$0.lightColor = VDSColor.elementsLowContrastOnLight
$0.darkColor = VDSColor.elementsLowContrastOnDark
$0.lightColor = VDSColor.elementsLowcontrastOnlight
$0.darkColor = VDSColor.elementsLowcontrastOndark
}
private var imageFallbackColorConfig = SurfaceColorConfiguration().with {

8
VDS/Components/Toggle/Toggle.swift
View File

@ -72,14 +72,14 @@ open class Toggle: Control, Changeable {
// MARK: - Configuration Properties
//--------------------------------------------------
// Sizes are from InVision design specs.
public let toggleSize = CGSize(width: 52, height: 24)
public let toggleSize = CGSize(width: 52, height: 28)
public let toggleContainerSize = CGSize(width: 52, height: 44)
public let knobSize = CGSize(width: 20, height: 20)
public let knobSize = CGSize(width: 24, height: 24)
private var toggleColorConfiguration = ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.paletteGray44, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
$0.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen34, forState: .selected)
$0.setSurfaceColors(VDSColor.paletteGreen26, VDSColor.paletteGreen36, forState: .selected)
}
private var knobColorConfiguration = ControlColorConfiguration().with {
@ -197,7 +197,7 @@ open class Toggle: Control, Changeable {
//--------------------------------------------------
private func updateLabel() {
stackView.spacing = showText ? 12 : 0
stackView.spacing = showText ? VDSLayout.Spacing.space3X.value : 0
if stackView.subviews.contains(label) {
label.removeFromSuperview()

2
VDS/Components/Tooltip/TooltipAlertViewController.swift
View File

@ -38,7 +38,7 @@ open class TooltipAlertViewController: UIViewController, Surfaceable {
}
private var line = Line().with { instance in
instance.lineViewColorConfig = SurfaceColorConfiguration(VDSColor.elementsLowContrastOnLight, VDSColor.elementsLowContrastOnLight).eraseToAnyColorable()
instance.lineViewColorConfig = SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark).eraseToAnyColorable()
}
//--------------------------------------------------

15
VDS/Extensions/VDSColor.swift
View File

@ -1,15 +0,0 @@
//
// VDSColor.swift
// VDS
//
// Created by Matt Bruce on 12/16/22.
//
import Foundation
import VDSColorTokens
import UIKit
extension VDSColor {
public static let elementsLowContrastOnLight = UIColor.init(hexString: "#D8DADA")
public static let elementsLowContrastOnDark = UIColor.init(hexString: "#333333")
}