From 8c13c6960d6bd9d2b11a85e3b60d3f6ef56989da Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 27 Apr 2023 15:11:49 -0500 Subject: [PATCH] refactored inset logic in helpers Signed-off-by: Matt Bruce --- VDSSample/Classes/Helper.swift | 8 ++++---- VDSSample/ViewControllers/BaseViewController.swift | 2 +- VDSSample/ViewControllers/TooltipViewController.swift | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/VDSSample/Classes/Helper.swift b/VDSSample/Classes/Helper.swift index 22611ef..8540dec 100644 --- a/VDSSample/Classes/Helper.swift +++ b/VDSSample/Classes/Helper.swift @@ -10,15 +10,15 @@ import VDS import UIKit extension UIView { - public static func makeWrapper(for view: UIView) -> UIView { + public static func makeWrapper(for view: UIView, edgeSpacing: CGFloat = 0.0) -> UIView { let wrapper = UIView().with { $0.translatesAutoresizingMaskIntoConstraints = false } wrapper.addSubview(view) view - .pinTop() - .pinBottom() - .pinLeading() + .pinTop(edgeSpacing) + .pinBottom(edgeSpacing) + .pinLeading(edgeSpacing) view.trailingAnchor.constraint(lessThanOrEqualTo: wrapper.trailingAnchor).isActive = true return wrapper } diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift index 8239696..d24647d 100644 --- a/VDSSample/ViewControllers/BaseViewController.swift +++ b/VDSSample/ViewControllers/BaseViewController.swift @@ -153,7 +153,7 @@ public class BaseViewController: UIViewController, Initable { viewController.didMove(toParent: self) } - open func addContentTopView(view: UIView) { + open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0) { view.translatesAutoresizingMaskIntoConstraints = false contentTopView.addSubview(view) view.pinToSuperView(.init(top: edgeSpacing, left: edgeSpacing, bottom: edgeSpacing, right: edgeSpacing)) diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift index 349fd47..ebf6c27 100644 --- a/VDSSample/ViewControllers/TooltipViewController.swift +++ b/VDSSample/ViewControllers/TooltipViewController.swift @@ -34,7 +34,7 @@ class TooltipViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - addContentTopView(view: .makeWrapper(for: tooltip)) + addContentTopView(view: .makeWrapper(for: tooltip, edgeSpacing: 16.0), edgeSpacing: 0.0) setupForm() setupPicker() @@ -102,6 +102,7 @@ class TooltipViewController: BaseViewController { self?.tooltip.fillColor = item } } + } class TooltipPopup: UIAlertController {