updated ui for button/line fixes

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2023-09-19 12:01:51 -05:00
parent d02db4b288
commit 02b1230d70
2 changed files with 33 additions and 5 deletions

View File

@ -28,6 +28,7 @@ class ButtonViewController: BaseViewController<Button> {
var disabledSwitch = Toggle() var disabledSwitch = Toggle()
var textField = TextField() var textField = TextField()
var widthTextField = NumericField() var widthTextField = NumericField()
var percentageTextField = NumericField()
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -45,6 +46,7 @@ class ButtonViewController: BaseViewController<Button> {
addFormRow(label: "Disabled", view: disabledSwitch) addFormRow(label: "Disabled", view: disabledSwitch)
addFormRow(label: "Text", view: textField) addFormRow(label: "Text", view: textField)
addFormRow(label: "Width", view: widthTextField) addFormRow(label: "Width", view: widthTextField)
addFormRow(label: "Percentage (1-100)", view: percentageTextField)
addFormRow(label: "Size", view: buttonSizePickerSelectorView) addFormRow(label: "Size", view: buttonSizePickerSelectorView)
@ -61,8 +63,23 @@ class ButtonViewController: BaseViewController<Button> {
widthTextField widthTextField
.numberPublisher .numberPublisher
.sink { [weak self] number in .sink { [weak self] number in
guard let self, let number else { return } if let number {
self.component.width = number.cgFloatValue self?.component.width = .value(number.cgFloatValue)
self?.percentageTextField.text = ""
} else {
self?.component.width = nil
}
}.store(in: &subscribers)
percentageTextField
.numberPublisher
.sink { [weak self] number in
if let number {
self?.component.width = .percentage(number.cgFloatValue)
self?.widthTextField.text = ""
} else {
self?.component.width = nil
}
}.store(in: &subscribers) }.store(in: &subscribers)
} }

View File

@ -16,10 +16,16 @@ class LineViewController: BaseViewController<Line> {
items: Line.Style.allCases) items: Line.Style.allCases)
}() }()
lazy var orientationPickerView = {
PickerSelectorView(title:"horizontal",
picker: self.picker,
items: Line.Orientation.allCases)
}()
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
addContentTopView(view: component) addContentTopView(view: component)
component.height(30)
setupPicker() setupPicker()
} }
@ -27,6 +33,7 @@ class LineViewController: BaseViewController<Line> {
super.setupForm() super.setupForm()
addFormRow(label: "Surface", view: surfacePickerSelectorView) addFormRow(label: "Surface", view: surfacePickerSelectorView)
addFormRow(label: "Style", view: lineStylePickerView) addFormRow(label: "Style", view: lineStylePickerView)
addFormRow(label: "Orientation", view: orientationPickerView)
} }
func setupPicker() { func setupPicker() {
@ -38,6 +45,10 @@ class LineViewController: BaseViewController<Line> {
lineStylePickerView.onPickerDidSelect = { [weak self] item in lineStylePickerView.onPickerDidSelect = { [weak self] item in
self?.component.style = item self?.component.style = item
} }
orientationPickerView.onPickerDidSelect = { [weak self] item in
self?.component.orientation = item
}
} }
} }