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

updated with internal wrapper view so the object won't stretch and mess up alignments

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-11-18 10:02:07 -06:00
parent 8a85e67681
commit 0b63f5abea
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,11 @@ public enum BadgeFillColor: String, Codable, CaseIterable {
@objc(VDSBadge) @objc(VDSBadge)
public class Badge: View, Accessable { public class Badge: View, Accessable {
private var contentView = UIView().with {
$0.translatesAutoresizingMaskIntoConstraints = false
$0.layer.cornerRadius = 2
}
private var label = Label().with { private var label = Label().with {
$0.setContentCompressionResistancePriority(.required, for: .vertical) $0.setContentCompressionResistancePriority(.required, for: .vertical)
$0.adjustsFontSizeToFitWidth = false $0.adjustsFontSizeToFitWidth = false
@ -65,14 +70,18 @@ public class Badge: View, Accessable {
isAccessibilityElement = true isAccessibilityElement = true
accessibilityTraits = .staticText accessibilityTraits = .staticText
addSubview(label)
layer.cornerRadius = 2
label.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 4).isActive = true contentView.addSubview(label)
label.topAnchor.constraint(equalTo: topAnchor, constant: 2).isActive = true addSubview(contentView)
trailingAnchor.constraint(greaterThanOrEqualTo: label.trailingAnchor, constant: 4).isActive = true
bottomAnchor.constraint(greaterThanOrEqualTo: label.bottomAnchor, constant: 2).isActive = true contentView
.pinTop()
.pinBottom()
.pinLeading()
contentView.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor).isActive = true
label.pinToSuperView(.init(top: 2, left: 4, bottom: 2, right: 4))
maxWidthConstraint = label.widthAnchor.constraint(lessThanOrEqualToConstant: 100) maxWidthConstraint = label.widthAnchor.constraint(lessThanOrEqualToConstant: 100)
minWidthConstraint = label.widthAnchor.constraint(greaterThanOrEqualToConstant: 23) minWidthConstraint = label.widthAnchor.constraint(greaterThanOrEqualToConstant: 23)
@ -174,13 +183,12 @@ public class Badge: View, Accessable {
}.eraseToAnyColorable() }.eraseToAnyColorable()
} }
} }
//-------------------------------------------------- //--------------------------------------------------
// MARK: - State // MARK: - State
//-------------------------------------------------- //--------------------------------------------------
open override func updateView() { open override func updateView() {
backgroundColor = backgroundColor() contentView.backgroundColor = backgroundColor()
label.textColorConfiguration = textColorConfiguration() label.textColorConfiguration = textColorConfiguration()
label.numberOfLines = numberOfLines label.numberOfLines = numberOfLines

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

@ -62,6 +62,11 @@ open class ToggleBase: Control, Accessable, DataTrackable, BinaryColorable {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Private Properties // MARK: - Private Properties
//-------------------------------------------------- //--------------------------------------------------
private var contentView = UIView().with {
$0.translatesAutoresizingMaskIntoConstraints = false
$0.layer.cornerRadius = 2
}
private var stackView = UIStackView().with { private var stackView = UIStackView().with {
$0.translatesAutoresizingMaskIntoConstraints = false $0.translatesAutoresizingMaskIntoConstraints = false
$0.axis = .horizontal $0.axis = .horizontal
@ -252,8 +257,16 @@ open class ToggleBase: Control, Accessable, DataTrackable, BinaryColorable {
isAccessibilityElement = true isAccessibilityElement = true
accessibilityTraits = .button accessibilityTraits = .button
addSubview(stackView) addSubview(contentView)
contentView.addSubview(stackView)
contentView
.pinTop()
.pinBottom()
.pinLeading()
contentView.trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor).isActive = true
//set the h/w to container size, since the width "can" grow if text is there //set the h/w to container size, since the width "can" grow if text is there
//allow this to be greaterThanEqualTo //allow this to be greaterThanEqualTo
heightAnchor.constraint(equalToConstant: toggleContainerSize.height).isActive = true heightAnchor.constraint(equalToConstant: toggleContainerSize.height).isActive = true
@ -286,10 +299,7 @@ open class ToggleBase: Control, Accessable, DataTrackable, BinaryColorable {
knobView.topAnchor.constraint(greaterThanOrEqualTo: toggleView.topAnchor).isActive = true knobView.topAnchor.constraint(greaterThanOrEqualTo: toggleView.topAnchor).isActive = true
//pin stackview to edges //pin stackview to edges
stackView.topAnchor.constraint(equalTo: topAnchor).isActive = true stackView.pinToSuperView()
stackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
stackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
stackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
} }
public override func reset() { public override func reset() {
@ -329,6 +339,5 @@ open class ToggleBase: Control, Accessable, DataTrackable, BinaryColorable {
setAccessibilityHint() setAccessibilityHint()
setAccessibilityValue(isOn) setAccessibilityValue(isOn)
setAccessibilityLabel(isOn) setAccessibilityLabel(isOn)
backgroundColor = surface.color
} }
} }