Merge branch 'mbruce/tilelet' into feature/tileletEnhancements
# Conflicts: # VDSSample/ViewControllers/TileletViewController.swift Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
commit
83d873db0a
@ -37,6 +37,12 @@ class TileletViewController: BaseViewController<Tilelet> {
|
|||||||
items: Tilelet.TextPosition.allCases.sorted{ $0.rawValue < $1.rawValue })
|
items: Tilelet.TextPosition.allCases.sorted{ $0.rawValue < $1.rawValue })
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
lazy var paddingPickerSelectorView = {
|
||||||
|
PickerSelectorView(title: "16",
|
||||||
|
picker: self.picker,
|
||||||
|
items: Tilelet.Padding.allCases)
|
||||||
|
}()
|
||||||
|
|
||||||
var clickableSwitch = Toggle()
|
var clickableSwitch = Toggle()
|
||||||
|
|
||||||
var titleTextField = TextField()
|
var titleTextField = TextField()
|
||||||
@ -67,7 +73,8 @@ class TileletViewController: BaseViewController<Tilelet> {
|
|||||||
|
|
||||||
addFormRow(label: "Title Style", view: titleStandardStylePickerSelectorView)
|
addFormRow(label: "Title Style", view: titleStandardStylePickerSelectorView)
|
||||||
addFormRow(label: "Other Style", view: otherStandardStylePickerSelectorView)
|
addFormRow(label: "Other Style", view: otherStandardStylePickerSelectorView)
|
||||||
|
addFormRow(label: "Padding", view: paddingPickerSelectorView)
|
||||||
|
|
||||||
addFormRow(label: "Title Text", view: titleTextField)
|
addFormRow(label: "Title Text", view: titleTextField)
|
||||||
addFormRow(label: "Title is Bold", view: titleIsBold)
|
addFormRow(label: "Title is Bold", view: titleIsBold)
|
||||||
addFormRow(label: "Subtitle Color", view: subtitleColorPickerSelectorView)
|
addFormRow(label: "Subtitle Color", view: subtitleColorPickerSelectorView)
|
||||||
@ -167,10 +174,15 @@ class TileletViewController: BaseViewController<Tilelet> {
|
|||||||
self?.component.directionalIconModel = nil
|
self?.component.directionalIconModel = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
titleIsBold.publisher(for: .valueChanged).sink { [weak self] toggle in
|
titleIsBold.publisher(for: .valueChanged).sink { [weak self] toggle in
|
||||||
self?.component.padding = .padding6X
|
|
||||||
self?.setTitleModel()
|
self?.setTitleModel()
|
||||||
}.store(in: &subscribers)
|
}.store(in: &subscribers)
|
||||||
|
|
||||||
|
paddingPickerSelectorView.onPickerDidSelect = { [weak self] item in
|
||||||
|
self?.component.padding = item
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func setupModel() {
|
func setupModel() {
|
||||||
@ -183,6 +195,7 @@ class TileletViewController: BaseViewController<Tilelet> {
|
|||||||
|
|
||||||
//setup UI
|
//setup UI
|
||||||
surfacePickerSelectorView.text = component.surface.rawValue
|
surfacePickerSelectorView.text = component.surface.rawValue
|
||||||
|
paddingPickerSelectorView.text = component.padding.rawValue
|
||||||
otherStandardStylePickerSelectorView.text = subTitleModel.standardStyle.rawValue
|
otherStandardStylePickerSelectorView.text = subTitleModel.standardStyle.rawValue
|
||||||
titleStandardStylePickerSelectorView.text = titleModel.standardStyle.rawValue
|
titleStandardStylePickerSelectorView.text = titleModel.standardStyle.rawValue
|
||||||
subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue
|
subtitleColorPickerSelectorView.text = subTitleModel.textColor.rawValue
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user