From e5eb2269db6fb41b02ae5e66e31a204e7f98b28c Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 30 Aug 2022 17:01:16 -0500 Subject: [PATCH] refactored base viewcontroller, fixes some stackview issues Signed-off-by: Matt Bruce --- .../ModelScrollViewController.swift | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/VDSSample/ViewControllers/ModelScrollViewController.swift b/VDSSample/ViewControllers/ModelScrollViewController.swift index e021f60..f734dfe 100644 --- a/VDSSample/ViewControllers/ModelScrollViewController.swift +++ b/VDSSample/ViewControllers/ModelScrollViewController.swift @@ -79,12 +79,9 @@ public class ModelScrollViewController: UIViewController, } }() - public var contentStackView: UIStackView = { - return UIStackView().with { + public var contentView: UIView = { + return UIView().with { $0.translatesAutoresizingMaskIntoConstraints = false - $0.alignment = .fill - $0.distribution = .fillProportionally - $0.axis = .vertical } }() @@ -116,11 +113,23 @@ public class ModelScrollViewController: UIViewController, embed(scrollViewController) scrollViewController.scrollView.alwaysBounceVertical = true - scrollViewController.contentView = contentStackView - contentStackView.addArrangedSubview(contentTopView) - contentStackView.addArrangedSubview(contentBottomView) + scrollViewController.contentView = contentView + contentView.addSubview(contentTopView) + contentView.addSubview(contentBottomView) contentBottomView.addSubview(formStackView) + +// contentTopView.backgroundColor = .green +// contentBottomView.backgroundColor = .yellow + + contentTopView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: edgeSpacing).isActive = true + contentTopView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: edgeSpacing).isActive = true + contentTopView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -edgeSpacing).isActive = true + contentBottomView.topAnchor.constraint(equalTo: contentTopView.bottomAnchor, constant: edgeSpacing).isActive = true + contentBottomView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: edgeSpacing).isActive = true + contentBottomView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -edgeSpacing).isActive = true + contentBottomView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -edgeSpacing).isActive = true + formStackView.topAnchor.constraint(equalTo: contentBottomView.topAnchor, constant: edgeSpacing).isActive = true formStackView.leadingAnchor.constraint(equalTo: contentBottomView.leadingAnchor, constant: edgeSpacing).isActive = true formStackView.trailingAnchor.constraint(equalTo: contentBottomView.trailingAnchor, constant: -edgeSpacing).isActive = true