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

updated to use extension

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-11-18 11:16:19 -06:00
parent 7340ee7363
commit 5684104913
9 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VDS/Components/Checkbox/Checkbox.swift
View File

@ -190,10 +190,7 @@ open class CheckboxBase: Control, Accessable, DataTrackable, BinaryColorable, Er
updateSelector() updateSelector()
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true mainStackView.pinToSuperView()
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
} }

5
VDS/Components/Checkbox/CheckboxGroup.swift
View File

@ -79,10 +79,7 @@ public class CheckboxGroupBase<HandlerType: CheckboxBase>: SelectorGroupHandlerB
accessibilityTraits = .button accessibilityTraits = .button
addSubview(mainStackView) addSubview(mainStackView)
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true mainStackView.pinToSuperView()
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
} }
public var selectedHandlers: [HandlerType]? { public var selectedHandlers: [HandlerType]? {

11
VDS/Components/RadioBox/RadioBox.swift
View File

@ -180,15 +180,8 @@ open class RadioBoxBase: Control, BinaryColorable, Accessable, DataTrackable{
updateSelector() updateSelector()
selectorView.topAnchor.constraint(equalTo: topAnchor).isActive = true selectorView.pinToSuperView()
selectorView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true mainStackView.pinToSuperView(.init(top: 16, left: 16, bottom: 16, right: 16))
selectorView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
selectorView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
mainStackView.topAnchor.constraint(equalTo: selectorView.topAnchor, constant: 16).isActive = true
mainStackView.leadingAnchor.constraint(equalTo: selectorView.leadingAnchor, constant: 16).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: selectorView.trailingAnchor, constant: -16).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: selectorView.bottomAnchor, constant: -16).isActive = true
} }
func updateLabels() { func updateLabels() {

5
VDS/Components/RadioBox/RadioBoxGroup.swift
View File

@ -74,10 +74,7 @@ public class RadioBoxGroupBase<HandlerType: RadioBoxBase>: SelectorGroupSelected
accessibilityTraits = .button accessibilityTraits = .button
addSubview(mainStackView) addSubview(mainStackView)
ensureDevice() ensureDevice()
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true mainStackView.pinToSuperView()
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
NotificationCenter.default NotificationCenter.default
.publisher(for: UIDevice.orientationDidChangeNotification) .publisher(for: UIDevice.orientationDidChangeNotification)

5
VDS/Components/RadioButton/RadioButton.swift
View File

@ -195,10 +195,7 @@ open class RadioButtonBase: Control, Accessable, DataTrackable, BinaryColorable,
updateSelector() updateSelector()
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true mainStackView.pinToSuperView()
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
} }

5
VDS/Components/RadioButton/RadioButtonGroup.swift
View File

@ -79,9 +79,6 @@ public class RadioButtonGroupBase<HandlerType: RadioButtonBase>: SelectorGroupSe
accessibilityTraits = .button accessibilityTraits = .button
addSubview(mainStackView) addSubview(mainStackView)
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true mainStackView.pinToSuperView()
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
} }
} }

13
VDS/Components/RadioSwatch/RadioSwatch.swift
View File

@ -103,20 +103,17 @@ open class RadioSwatchBase: Control, Accessable, DataTrackable, BinaryColorable
selectorView.addSubview(fillView) selectorView.addSubview(fillView)
selectorView.topAnchor.constraint(equalTo: topAnchor).isActive = true selectorView.pinToSuperView()
selectorView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
selectorView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
selectorView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
let selectorSize = getSelectorSize() let selectorSize = getSelectorSize()
selectorView.heightAnchor.constraint(equalToConstant: selectorSize.height).isActive = true selectorView.height(selectorSize.height)
selectorView.widthAnchor.constraint(equalToConstant: selectorSize.width).isActive = true selectorView.width(selectorSize.width)
fillView.centerXAnchor.constraint(equalTo: selectorView.centerXAnchor).isActive = true fillView.centerXAnchor.constraint(equalTo: selectorView.centerXAnchor).isActive = true
fillView.centerYAnchor.constraint(equalTo: selectorView.centerYAnchor).isActive = true fillView.centerYAnchor.constraint(equalTo: selectorView.centerYAnchor).isActive = true
fillView.heightAnchor.constraint(equalToConstant: fillSize.height).isActive = true fillView.height(fillSize.height)
fillView.widthAnchor.constraint(equalToConstant: fillSize.width).isActive = true fillView.width(fillSize.width)
} }

28
VDS/Components/RadioSwatch/RadioSwatchGroup.swift
View File

@ -87,16 +87,19 @@ public class RadioSwatchGroupBase<HandlerType: RadioSwatchBase>: SelectorGroupSe
accessibilityTraits = .button accessibilityTraits = .button
addSubview(label) addSubview(label)
addSubview(collectionView) addSubview(collectionView)
NSLayoutConstraint.activate([
label.topAnchor.constraint(equalTo: topAnchor), label
label.leadingAnchor.constraint(equalTo: leadingAnchor), .pinTop()
label.trailingAnchor.constraint(equalTo: trailingAnchor), .pinLeading()
label.heightAnchor.constraint(equalToConstant: labelHeight), .pinTrailing()
collectionView.topAnchor.constraint(equalTo: label.bottomAnchor, constant: labelSpacing), .height(labelHeight)
collectionView.leadingAnchor.constraint(equalTo: leadingAnchor),
collectionView.trailingAnchor.constraint(equalTo: trailingAnchor), collectionView
collectionView.bottomAnchor.constraint(equalTo: bottomAnchor), .pinTop(label.bottomAnchor, labelSpacing)
]) .pinLeading()
.pinTrailing()
.pinBottom()
//TODO: Look at this width stuff, we should NOT need it! //TODO: Look at this width stuff, we should NOT need it!
collectionViewWidth = collectionView.widthAnchor.constraint(equalToConstant: cellSize * 20) collectionViewWidth = collectionView.widthAnchor.constraint(equalToConstant: cellSize * 20)
collectionViewWidth?.isActive = true collectionViewWidth?.isActive = true
@ -180,10 +183,7 @@ public class RadioSwatchGroupBase<HandlerType: RadioSwatchBase>: SelectorGroupSe
handler.isUserInteractionEnabled = false handler.isUserInteractionEnabled = false
cell.subviews.forEach { $0.removeFromSuperview() } cell.subviews.forEach { $0.removeFromSuperview() }
cell.addSubview(handler) cell.addSubview(handler)
handler.topAnchor.constraint(equalTo: cell.topAnchor).isActive = true handler.pinToSuperView()
handler.leadingAnchor.constraint(equalTo: cell.leadingAnchor).isActive = true
handler.trailingAnchor.constraint(equalTo: cell.trailingAnchor).isActive = true
handler.bottomAnchor.constraint(equalTo: cell.bottomAnchor).isActive = true
return cell return cell
} }

5
VDS/Components/TextFields/EntryField/EntryField.swift
View File

@ -178,10 +178,7 @@ open class EntryField: Control, Accessable {
stackView.setCustomSpacing(8, after: container) stackView.setCustomSpacing(8, after: container)
stackView.setCustomSpacing(8, after: errorLabel) stackView.setCustomSpacing(8, after: errorLabel)
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
titleLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable() titleLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable()
errorLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable() errorLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable()