From 4269ded448bb29868816115c1561eb0e49326951 Mon Sep 17 00:00:00 2001
From: Matt Bruce <matt.bruce@verizon.com>
Date: Fri, 18 Nov 2022 12:57:45 -0600
Subject: [PATCH] refactored for right growable views

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
---
 .../ViewControllers/BadgeViewController.swift     |  3 ++-
 .../ViewControllers/BaseViewController.swift      | 15 +++++++++++++++
 .../ViewControllers/ButtonViewController.swift    | 14 +++-----------
 .../TextLinkCaretViewController.swift             |  9 +--------
 .../ViewControllers/TextLinkViewController.swift  | 10 ++--------
 .../ViewControllers/ToggleViewController.swift    |  2 +-
 6 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index 67d1ab9..4582ee9 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -55,7 +55,8 @@ class  BadgeViewController: BaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: badge)
+        
+        addContentTopView(view: .makeWrapper(for: badge))
         setupForm()
         setupPicker()
         setupModel()
diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift
index ea04a4e..9e2a937 100644
--- a/VDSSample/ViewControllers/BaseViewController.swift
+++ b/VDSSample/ViewControllers/BaseViewController.swift
@@ -10,6 +10,21 @@ import UIKit
 import Combine
 import VDS
 
+extension UIView {
+    public static func makeWrapper(for view: UIView) -> UIView {
+        let wrapper = UIView().with {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+        }
+        wrapper.addSubview(view)
+        view
+            .pinTop()
+            .pinBottom()
+            .pinLeading()
+        view.trailingAnchor.constraint(lessThanOrEqualTo: wrapper.trailingAnchor).isActive = true
+        return wrapper
+    }
+}
+
 public class BaseViewController: UIViewController, Initable {
     deinit {
         print("\(Self.self) deinit")
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 781fcbd..cccc306 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -24,7 +24,7 @@ class ButtonViewController: BaseViewController {
                             items: ButtonSize.allCases)
     }()
 
-    var disabledSwitch = UISwitch()
+    var disabledSwitch = Toggle()
     var textField = TextField()
     var widthTextField = TextField()
 
@@ -32,17 +32,9 @@ class ButtonViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+            
+        addContentTopView(view: .makeWrapper(for: button))
         
-        let view = UIView()
-        view.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(button)
-        button.pinTop()
-        button.pinBottom()
-        button.pinLeading()
-        button.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor).isActive = true
-        
-        addContentTopView(view: view)
-
         setupForm()
         setupPicker()
         setupModel()
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index 9c5e7c3..a0af2ce 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -24,14 +24,7 @@ class TextLinkCaretViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        let view = UIView()
-        view.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(textLinkCaret)
-        textLinkCaret.pinTop()
-        textLinkCaret.pinBottom()
-        textLinkCaret.pinLeading()
-        textLinkCaret.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor).isActive = true
-        addContentTopView(view: view)
+        addContentTopView(view: .makeWrapper(for: textLinkCaret))
 
         setupForm()
         setupPicker()
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index e3274ef..3fefeb6 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -24,14 +24,8 @@ class TextLinkViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        let view = UIView()
-        view.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(textLink)
-        textLink.pinTop()
-        textLink.pinBottom()
-        textLink.pinLeading()
-        textLink.trailingAnchor.constraint(lessThanOrEqualTo: view.trailingAnchor).isActive = true
-        addContentTopView(view: view)
+
+        addContentTopView(view: .makeWrapper(for: textLink))
 
         setupForm()
         setupPicker()
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 47b9f44..24e51c1 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -46,7 +46,7 @@ class ToggleViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: toggle)
+        addContentTopView(view: .makeWrapper(for: toggle))
                 
         setupForm()
         setupPicker()