Merge branch 'feature/buttonGroupUpdate' into 'develop'
added back in width See merge request BPHV_MIPS/vds_ios_sample!12
This commit is contained in:
commit
f35e0de35f
@ -67,17 +67,14 @@ class ButtonGroupViewController: BaseViewController {
|
|||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
buttonGroup.rowQuantityPhone = 1
|
|
||||||
buttonGroup.rowQuantityTablet = 2
|
|
||||||
buttonGroup.buttons = [
|
buttonGroup.buttons = [
|
||||||
makeButton("Button"),
|
makeButton("Secondary").with{ $0.use = .secondary },
|
||||||
makeTextLink("Text Link Button Test Test2"),
|
makeButton("Primary"),
|
||||||
|
makeTextLink("Large Text Link"),
|
||||||
makeButton("Widge Label Button"),
|
makeButton("Widge Label Button"),
|
||||||
makeButton("Button"),
|
makeTextLinkCaret("Text Link Caret"),
|
||||||
makeTextLinkCaret("Caret Button"),
|
makeTextLink("Small Text Link").with{ $0.size = .small },
|
||||||
makeButton("Button Test"),
|
makeButton("Small Button").with{$0.size = .small; $0.use = .secondary }
|
||||||
makeTextLink("Text Link"),
|
|
||||||
makeTextLinkCaret("Text Caret")
|
|
||||||
]
|
]
|
||||||
|
|
||||||
addContentTopView(view: buttonGroup)
|
addContentTopView(view: buttonGroup)
|
||||||
@ -94,8 +91,7 @@ class ButtonGroupViewController: BaseViewController {
|
|||||||
addFormRow(label: "Disabled", view: .makeWrapper(for: disabledSwitch))
|
addFormRow(label: "Disabled", view: .makeWrapper(for: disabledSwitch))
|
||||||
addFormRow(label: "Position", view: buttonPositionSelectorView)
|
addFormRow(label: "Position", view: buttonPositionSelectorView)
|
||||||
addFormRow(label: "Row Quantity", view: rowQuantitySelectorView)
|
addFormRow(label: "Row Quantity", view: rowQuantitySelectorView)
|
||||||
|
addFormRow(label: "Width", view: widthTextField)
|
||||||
// addFormRow(label: "Width", view: widthTextField)
|
|
||||||
|
|
||||||
|
|
||||||
disabledSwitch
|
disabledSwitch
|
||||||
@ -104,13 +100,15 @@ class ButtonGroupViewController: BaseViewController {
|
|||||||
self?.buttonGroup.disabled = sender.isOn
|
self?.buttonGroup.disabled = sender.isOn
|
||||||
}.store(in: &subscribers)
|
}.store(in: &subscribers)
|
||||||
|
|
||||||
// widthTextField
|
widthTextField
|
||||||
// .textPublisher
|
.textPublisher
|
||||||
// .sink { [weak self] text in
|
.sink { [weak self] text in
|
||||||
// if let n = NumberFormatter().number(from: text) {
|
if let n = NumberFormatter().number(from: text) {
|
||||||
// self?.buttonGroup.width = CGFloat(truncating: n)
|
self?.buttonGroup.buttonWidth = CGFloat(truncating: n)
|
||||||
// }
|
} else {
|
||||||
// }.store(in: &subscribers)
|
self?.buttonGroup.buttonWidth = 0.0
|
||||||
|
}
|
||||||
|
}.store(in: &subscribers)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user