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

refactored naming for enum

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-01-13 08:29:31 -06:00
parent 3b037d8443
commit 2ea6e9fb43
3 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,14 +38,27 @@ open class TileContainer: Control {
case transparent case transparent
} }
public enum ContainerPadding: String, Codable, EnumSubset { public enum ContainerPadding: String, Codable {
case spacing2X case padding2X
case spacing4X case padding4X
case spacing6X case padding6X
case spacing8X case padding8X
case spacing12X case padding12X
public var defaultValue: VDSLayout.Spacing { .space4X } public var value: CGFloat {
switch self {
case .padding2X:
return VDSLayout.Spacing.space2X.value
case .padding4X:
return VDSLayout.Spacing.space4X.value
case .padding6X:
return VDSLayout.Spacing.space6X.value
case .padding8X:
return VDSLayout.Spacing.space8X.value
case .padding12X:
return VDSLayout.Spacing.space12X.value
}
}
} }
public enum ContainerScalingType: String, Codable, CaseIterable { public enum ContainerScalingType: String, Codable, CaseIterable {
@ -72,7 +85,7 @@ open class TileContainer: Control {
public var containerBackgroundColor: ContainerBackgroundColor = .white { didSet{ didChange() } } public var containerBackgroundColor: ContainerBackgroundColor = .white { didSet{ didChange() } }
public var containerPadding: ContainerPadding = .spacing4X { didSet{ didChange() } } public var containerPadding: ContainerPadding = .padding4X { didSet{ didChange() } }
public var aspectRatio: ContainerScalingType = .ratio1x1 { didSet{ didChange() } } public var aspectRatio: ContainerScalingType = .ratio1x1 { didSet{ didChange() } }
@ -153,13 +166,13 @@ open class TileContainer: Control {
containerView.isUserInteractionEnabled = false containerView.isUserInteractionEnabled = false
containerView.backgroundColor = .clear containerView.backgroundColor = .clear
containerTopConstraint = containerView.topAnchor.constraint(equalTo: topAnchor, constant: containerPadding.value.doubleValue) containerTopConstraint = containerView.topAnchor.constraint(equalTo: topAnchor, constant: containerPadding.value)
containerTopConstraint?.isActive = true containerTopConstraint?.isActive = true
containerBottomConstraint = containerView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: containerPadding.value.doubleValue) containerBottomConstraint = containerView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: containerPadding.value)
containerBottomConstraint?.isActive = true containerBottomConstraint?.isActive = true
containerLeadingConstraint = containerView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: containerPadding.value.doubleValue) containerLeadingConstraint = containerView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: containerPadding.value)
containerLeadingConstraint?.isActive = true containerLeadingConstraint?.isActive = true
containerTrailingConstraint = containerView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: containerPadding.value.doubleValue) containerTrailingConstraint = containerView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: containerPadding.value)
containerTrailingConstraint?.isActive = true containerTrailingConstraint?.isActive = true
highlightView.pinToSuperView() highlightView.pinToSuperView()
@ -252,10 +265,10 @@ open class TileContainer: Control {
layer.borderColor = borderColorConfig.getColor(self).cgColor layer.borderColor = borderColorConfig.getColor(self).cgColor
layer.borderWidth = showBorder ? VDSFormControls.widthBorder : 0 layer.borderWidth = showBorder ? VDSFormControls.widthBorder : 0
containerTopConstraint?.constant = containerPadding.value.doubleValue containerTopConstraint?.constant = containerPadding.value
containerLeadingConstraint?.constant = containerPadding.value.doubleValue containerLeadingConstraint?.constant = containerPadding.value
containerBottomConstraint?.constant = -containerPadding.value.doubleValue containerBottomConstraint?.constant = -containerPadding.value
containerTrailingConstraint?.constant = -containerPadding.value.doubleValue containerTrailingConstraint?.constant = -containerPadding.value
if let width, aspectRatio == .none && height == nil{ if let width, aspectRatio == .none && height == nil{
widthConstraint?.constant = width widthConstraint?.constant = width

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

@ -393,13 +393,13 @@ open class Tilet: TileContainer {
extension TileContainer.ContainerPadding { extension TileContainer.ContainerPadding {
fileprivate var tiletSpacing: CGFloat { fileprivate var tiletSpacing: CGFloat {
switch self { switch self {
case .spacing2X: case .padding2X:
return 16 return 16
case .spacing4X: case .padding4X:
return 24 return 24
case .spacing6X: case .padding6X:
return 32 return 32
case .spacing8X: case .padding8X:
return 48 return 48
default: default:
return 16 return 16

2
VDS/Extensions/VDSLayout.swift
View File

@ -21,7 +21,7 @@ public struct VDSLayout {
case space24X case space24X
case space32X case space32X
public var doubleValue: Double { public var value: CGFloat {
switch self { switch self {
case .space1X: case .space1X:
return 4 return 4