added action handlers

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

VDSSample/Classes/Helper.swift

@@ -37,35 +37,43 @@ extension UIView {
     }
 }
 
+func labelPublisherCompletionHandler() -> (String, UILabel) -> () {
+    return { (text, label) in
+        let newText = "\(text) clicked - "
+        if let labelText = label.text {
+            let components = labelText.components(separatedBy: " - ")
+            let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
+            let count = Int(last)!
+            label.text = "\(newText)\(count+1)"
+        } else {
+            label.text = "\(newText)1"
+        }
+    }
+}
+
 extension Changeable {
-    func labelPublisher(_ text: String, label: UILabel) {
+    func onChangeActionPublisher(_ text: String, label: UILabel) {
         onChange = { _ in
-                let newText = "\(text) clicked - "
+            let handler = labelPublisherCompletionHandler()
-                if let labelText = label.text {
+            handler(text, label)
-                    let components = labelText.components(separatedBy: " - ")
+        }
-                    let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
+    }
-                    let count = Int(last)!
+}
-                    label.text = "\(newText)\(count+1)"
+
-                } else {
+extension Clickable {
-                    label.text = "\(newText)1"
+    func onClickActionPublisher(_ text: String, label: UILabel) {
-                }
+        onClick = { _ in
-            }
+            let handler = labelPublisherCompletionHandler()
+            handler(text, label)
+        }
     }
 }
 
 extension ButtonBase {
     func labelPublisher(_ label: UILabel){
         onClick = { control in
-            let newText = "\(control.text!) clicked - "
+            let handler = labelPublisherCompletionHandler()
-            if let labelText = label.text {
+            handler(control.text!, label)
-                let components = labelText.components(separatedBy: " - ")
-                let last: String = (components.last ?? "0").trimmingCharacters(in: .whitespaces)
-                let count = Int(last)!
-                label.text = "\(newText)\(count+1)"
-            } else {
-                label.text = "\(newText)1"
-            }
-            print("clicked me")
         }
     }
 }

VDSSample/ViewControllers/BaseViewController.swift

@@ -251,6 +251,13 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
         addFormRow(label: "Show Bounds", view: debugViewSwitch)
     }
     
+    let actionLabel = Label()
+    
+    @discardableResult
+    public func addActionRow() -> UIView {
+        addFormRow(label: "Action", view: actionLabel)
+    }
+    
     public func scrollToBottom() {
         let bottomOffset = CGPoint(x: 0, y: bottomScrollView.contentSize.height - bottomScrollView.bounds.height + bottomScrollView.contentInset.bottom)
         bottomScrollView.setContentOffset(bottomOffset, animated: true)

VDSSample/ViewControllers/ButtonGroupViewController.swift

@@ -59,7 +59,6 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
                                         items: RowQuantity.allCases)
     }()
     
-    var label = Label()
     var disabledSwitch = Toggle()
     var widthTextField = NumericField()
     var percentageTextField = NumericField()
@@ -76,6 +75,8 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
         stackView.axis = .vertical
         stackView.spacing = 30
         
+        let label = actionLabel
+        
         component.buttons = [
             makeButton("Secondary", label: label).with{ $0.use = .secondary },
             makeButton("Primary", label: label),
@@ -107,8 +108,8 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
     }
     
     override func setupForm(){
-        super.setupForm()  
+        super.setupForm()
-        addFormRow(label: "Action", view: label)
+        addActionRow()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Position", view: buttonPositionSelectorView)

VDSSample/ViewControllers/ButtonIconViewController.swift

@@ -60,6 +60,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     override func setupForm(){
         super.setupForm()
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Surface Type", view: surfaceTypePickerSelectorView)
@@ -77,9 +78,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
             self?.component.disabled = sender.isOn
         }
 
-        component.onClick = { sender in
+        component.onClickActionPublisher("ButtonIcon", label: actionLabel)
-            print("Button Icon was clicked")
-        }
         
         floating.onChange =  { [weak self] sender in
             self?.component.floating = sender.isOn

VDSSample/ViewControllers/CheckBoxGroupViewController.swift

@@ -28,10 +28,9 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
         setupModel()
     }
     
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)

VDSSample/ViewControllers/CheckboxItemViewController.swift

@@ -27,10 +27,9 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
         setupModel()
     }
     
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
@@ -68,7 +67,7 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
                 self?.component.errorText = text
             }.store(in: &subscribers)
         
-        component.labelPublisher("Checkbox", label: actionLabel)
+        component.onChangeActionPublisher("Checkbox", label: actionLabel)
     }
     
     func setupModel() {

VDSSample/ViewControllers/CheckboxViewController.swift

@@ -23,10 +23,9 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
         setupModel()
     }
     
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Error", view: showErrorSwitch)
@@ -43,7 +42,7 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
             self?.component.disabled = sender.isOn
         }
 
-        component.labelPublisher("Checkbox", label: actionLabel)
+        component.onChangeActionPublisher("Checkbox", label: actionLabel)
     }
     
     func setupModel() {

VDSSample/ViewControllers/RadioBoxGroupViewController.swift

@@ -28,10 +28,9 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
         setupModel()
     }
         
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Strikethrough", view: strikeThroughSwitch)

VDSSample/ViewControllers/RadioButtonGroupViewController.swift

@@ -26,10 +26,9 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
         setupModel()
     }
     
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)

VDSSample/ViewControllers/RadioButtonItemViewController.swift

@@ -27,10 +27,9 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
         setupModel()
     }
     
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)

VDSSample/ViewControllers/RadioButtonViewController.swift

@@ -22,10 +22,9 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
         setupPicker()
         setupModel()
     }
-    var actionLabel = Label()
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Action", view: actionLabel)
+        addActionRow()
         addFormRow(label: "Disabled", view: disabledSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Error", view: showErrorSwitch)

VDSSample/ViewControllers/ToggleViewController.swift

@@ -43,7 +43,7 @@ class ToggleViewController: BaseViewController<Toggle> {
     
     override func setupForm() {
         super.setupForm()
-        
+        addActionRow()
         addFormRow(label: "Show Text", view: showTextSwitch)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Disabled", view: disabledSwitch)
@@ -59,12 +59,7 @@ class ToggleViewController: BaseViewController<Toggle> {
         append(section: textFormStackView)
         
         component.onChange = { [weak self] toggle in
-            let alertController:UIAlertController = UIAlertController(title: "Alert",
+            self?.actionLabel.text =  "Toggle Value: \(toggle.isOn)"
-                                                                      message: "Toggle Value: \(toggle.isOn)",
-                                                                      preferredStyle: UIAlertController.Style.alert)
-            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler:nil))
-            self?.present(alertController, animated: true)
-            print("toggle changed: \(toggle.isOn)")
         }
         
         showTextSwitch.onChange = { [weak self] sender in