refactored adding component to screen with pinTrailing
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
58125423c9
commit
ae2ef2881a
@ -59,7 +59,7 @@ class BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component))
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,7 +54,7 @@ class BadgeViewController: BaseViewController<Badge> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component))
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -63,7 +63,7 @@ public class FormSection: UIStackView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
formRow.addArrangedSubview(label)
|
formRow.addArrangedSubview(label)
|
||||||
formRow.addArrangedSubview(pinTrailing ? view : .makeWrapper(for: view, edgeSpacing: 0))
|
formRow.addArrangedSubview(pinTrailing ? view : .makeWrapper(for: view))
|
||||||
|
|
||||||
addArrangedSubview(formRow)
|
addArrangedSubview(formRow)
|
||||||
return formRow
|
return formRow
|
||||||
@ -334,10 +334,16 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
|
|||||||
viewController.didMove(toParent: self)
|
viewController.didMove(toParent: self)
|
||||||
}
|
}
|
||||||
|
|
||||||
open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0) {
|
open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0, pinTrailing: Bool = true) {
|
||||||
view.translatesAutoresizingMaskIntoConstraints = false
|
view.translatesAutoresizingMaskIntoConstraints = false
|
||||||
contentTopView.addSubview(view)
|
if pinTrailing {
|
||||||
view.pinToSuperView(.uniform(edgeSpacing))
|
contentTopView.addSubview(view)
|
||||||
|
view.pinToSuperView(.uniform(edgeSpacing))
|
||||||
|
} else {
|
||||||
|
let wrapper = UIView.makeWrapper(for: view)
|
||||||
|
contentTopView.addSubview(wrapper)
|
||||||
|
wrapper.pinToSuperView(.uniform(edgeSpacing))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open func append(section: FormSection) {
|
open func append(section: FormSection) {
|
||||||
|
|||||||
@ -71,7 +71,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,7 +32,7 @@ class ButtonViewController: BaseViewController<Button> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
|
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
|
|||||||
@ -18,7 +18,7 @@ class CheckboxViewController: BaseViewController<Checkbox> {
|
|||||||
let toggle = UISwitch()
|
let toggle = UISwitch()
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -41,7 +41,7 @@ class IconViewController: BaseViewController<Icon> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component))
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,7 @@ class RadioButtonViewController: BaseViewController<RadioButton> {
|
|||||||
let toggle = UISwitch()
|
let toggle = UISwitch()
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -186,7 +186,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
|
|||||||
component.color = .secondary
|
component.color = .secondary
|
||||||
component.accessibilityLabel = "Tile Container"
|
component.accessibilityLabel = "Tile Container"
|
||||||
|
|
||||||
addContentTopView(view: .makeWrapper(for: component))
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
component.addContentView(mainView)
|
component.addContentView(mainView)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
|
|||||||
@ -317,7 +317,7 @@ class TileletViewController: BaseViewController<Tilelet> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component))
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,7 +36,7 @@ class ToggleViewController: BaseViewController<Toggle> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: component.makeWrapper(edgeSpacing: 16.0), edgeSpacing: 0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
|
|
||||||
setupPicker()
|
setupPicker()
|
||||||
}
|
}
|
||||||
@ -49,7 +49,7 @@ class ToggleViewController: BaseViewController<Toggle> {
|
|||||||
addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
|
addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
|
||||||
|
|
||||||
//add the hidden elements to textFormStackView
|
//add the hidden elements to textFormStackView
|
||||||
textFormStackView.addFormRow(label: "Bold", view: boldSwitch)
|
textFormStackView.addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
|
||||||
textFormStackView.addFormRow(label: "Text Size", view: textSizePickerSelectorView)
|
textFormStackView.addFormRow(label: "Text Size", view: textSizePickerSelectorView)
|
||||||
textFormStackView.addFormRow(label: "Text Position", view: textPositionPickerSelectorView)
|
textFormStackView.addFormRow(label: "Text Position", view: textPositionPickerSelectorView)
|
||||||
textFormStackView.addFormRow(label: "On Text", view: onTextField)
|
textFormStackView.addFormRow(label: "On Text", view: onTextField)
|
||||||
|
|||||||
@ -32,8 +32,7 @@ class TooltipViewController: BaseViewController<Tooltip> {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
|
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,8 +40,7 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
|
addContentTopView(view: component, pinTrailing: false)
|
||||||
|
|
||||||
setupPicker()
|
setupPicker()
|
||||||
setupModel()
|
setupModel()
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user