From 45904c0202534857017d035d4008fd03e36d9441 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 2 Dec 2022 13:30:27 -0600 Subject: [PATCH 1/2] added back in width Signed-off-by: Matt Bruce --- .../ButtonGroupViewController.swift | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift index 26a1e07..af9b11c 100644 --- a/VDSSample/ViewControllers/ButtonGroupViewController.swift +++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift @@ -67,8 +67,6 @@ class ButtonGroupViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - buttonGroup.rowQuantityPhone = 1 - buttonGroup.rowQuantityTablet = 2 buttonGroup.buttons = [ makeButton("Button"), makeTextLink("Text Link Button Test Test2"), @@ -94,8 +92,7 @@ class ButtonGroupViewController: BaseViewController { addFormRow(label: "Disabled", view: .makeWrapper(for: disabledSwitch)) addFormRow(label: "Position", view: buttonPositionSelectorView) addFormRow(label: "Row Quantity", view: rowQuantitySelectorView) - - // addFormRow(label: "Width", view: widthTextField) + addFormRow(label: "Width", view: widthTextField) disabledSwitch @@ -104,13 +101,15 @@ class ButtonGroupViewController: BaseViewController { self?.buttonGroup.disabled = sender.isOn }.store(in: &subscribers) -// widthTextField -// .textPublisher -// .sink { [weak self] text in -// if let n = NumberFormatter().number(from: text) { -// self?.buttonGroup.width = CGFloat(truncating: n) -// } -// }.store(in: &subscribers) + widthTextField + .textPublisher + .sink { [weak self] text in + if let n = NumberFormatter().number(from: text) { + self?.buttonGroup.buttonWidth = CGFloat(truncating: n) + } else { + self?.buttonGroup.buttonWidth = 0.0 + } + }.store(in: &subscribers) } From 95d72e329b5f0c2e866bb29ad2a41000426287e4 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 2 Dec 2022 13:53:48 -0600 Subject: [PATCH 2/2] updated sample Signed-off-by: Matt Bruce --- .../ViewControllers/ButtonGroupViewController.swift | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift index af9b11c..2b2aa45 100644 --- a/VDSSample/ViewControllers/ButtonGroupViewController.swift +++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift @@ -68,14 +68,13 @@ class ButtonGroupViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() buttonGroup.buttons = [ - makeButton("Button"), - makeTextLink("Text Link Button Test Test2"), + makeButton("Secondary").with{ $0.use = .secondary }, + makeButton("Primary"), + makeTextLink("Large Text Link"), makeButton("Widge Label Button"), - makeButton("Button"), - makeTextLinkCaret("Caret Button"), - makeButton("Button Test"), - makeTextLink("Text Link"), - makeTextLinkCaret("Text Caret") + makeTextLinkCaret("Text Link Caret"), + makeTextLink("Small Text Link").with{ $0.size = .small }, + makeButton("Small Button").with{$0.size = .small; $0.use = .secondary } ] addContentTopView(view: buttonGroup)