From ae2ef2881a741bc207032bad358d29d16e048f8c Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Thu, 19 Sep 2024 10:17:53 -0500
Subject: [PATCH] refactored adding component to screen with pinTrailing

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../BadgeIndicatorViewController.swift             |  2 +-
 .../ViewControllers/BadgeViewController.swift      |  2 +-
 VDSSample/ViewControllers/BaseViewController.swift | 14 ++++++++++----
 .../ViewControllers/ButtonIconViewController.swift |  2 +-
 .../ViewControllers/ButtonViewController.swift     |  2 +-
 .../ViewControllers/CheckboxViewController.swift   |  2 +-
 VDSSample/ViewControllers/IconViewController.swift |  2 +-
 .../RadioButtonViewController.swift                |  2 +-
 .../TileContainerViewController.swift              |  2 +-
 .../ViewControllers/TileletViewController.swift    |  2 +-
 .../ViewControllers/ToggleViewController.swift     |  4 ++--
 .../ViewControllers/TooltipViewController.swift    |  3 +--
 .../TrailingTooltipLabelViewController.swift       |  3 +--
 13 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index 11368cb..7d8e523 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -59,7 +59,7 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index a0dd887..3fec5dd 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -54,7 +54,7 @@ class  BadgeViewController: BaseViewController<Badge> {
         
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift
index 837751c..7d24751 100644
--- a/VDSSample/ViewControllers/BaseViewController.swift
+++ b/VDSSample/ViewControllers/BaseViewController.swift
@@ -63,7 +63,7 @@ public class FormSection: UIStackView {
         }
         
         formRow.addArrangedSubview(label)
-        formRow.addArrangedSubview(pinTrailing ? view : .makeWrapper(for: view, edgeSpacing: 0))
+        formRow.addArrangedSubview(pinTrailing ? view : .makeWrapper(for: view))
 
         addArrangedSubview(formRow)
         return formRow
@@ -334,10 +334,16 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
         viewController.didMove(toParent: self)
     }
     
-    open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0) {
+    open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0, pinTrailing: Bool = true) {
         view.translatesAutoresizingMaskIntoConstraints = false
-        contentTopView.addSubview(view)
-        view.pinToSuperView(.uniform(edgeSpacing))
+        if pinTrailing {
+            contentTopView.addSubview(view)
+            view.pinToSuperView(.uniform(edgeSpacing))
+        } else {
+            let wrapper = UIView.makeWrapper(for: view)
+            contentTopView.addSubview(wrapper)
+            wrapper.pinToSuperView(.uniform(edgeSpacing))
+        }
     }
 
     open func append(section: FormSection) {
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index d2d42a0..23092cd 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -71,7 +71,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 371ec2a..22d1c4e 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -32,7 +32,7 @@ class ButtonViewController: BaseViewController<Button> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         
         setupPicker()
         setupModel()
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index 1535e23..4a79d5b 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -18,7 +18,7 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     let toggle = UISwitch()
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 8e3c5cb..56296d5 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -41,7 +41,7 @@ class IconViewController: BaseViewController<Icon> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 369bbeb..d8d2193 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -18,7 +18,7 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
     let toggle = UISwitch()
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index a214b22..d01ff6e 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -186,7 +186,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         component.color = .secondary
         component.accessibilityLabel = "Tile Container"
 
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         component.addContentView(mainView)
         setupPicker()
         setupModel()
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index 165f12f..dce6151 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -317,7 +317,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index f69c6f6..defc607 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -36,7 +36,7 @@ class ToggleViewController: BaseViewController<Toggle> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: component.makeWrapper(edgeSpacing: 16.0), edgeSpacing: 0)
+        addContentTopView(view: component, pinTrailing: false)
 
         setupPicker()
     }
@@ -49,7 +49,7 @@ class ToggleViewController: BaseViewController<Toggle> {
         addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         
         //add the hidden elements to textFormStackView
-        textFormStackView.addFormRow(label: "Bold", view: boldSwitch)
+        textFormStackView.addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         textFormStackView.addFormRow(label: "Text Size", view: textSizePickerSelectorView)
         textFormStackView.addFormRow(label: "Text Position", view: textPositionPickerSelectorView)
         textFormStackView.addFormRow(label: "On Text", view: onTextField)
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index 85d2f9f..df77805 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -32,8 +32,7 @@ class  TooltipViewController: BaseViewController<Tooltip> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
-        
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 15988aa..a3490e7 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -40,8 +40,7 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
-
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }