From 9a69c2c112d297cc5e6ba92b159b9c4798343005 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 20 Dec 2022 11:17:53 -0600 Subject: [PATCH] fixed bugs Signed-off-by: Matt Bruce --- .../TileContainer/TileContainer.swift | 12 ++++++---- VDS/Components/Tilet/Tilet.swift | 23 ++++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/VDS/Components/TileContainer/TileContainer.swift b/VDS/Components/TileContainer/TileContainer.swift index 0e54bfc1..78bde32a 100644 --- a/VDS/Components/TileContainer/TileContainer.swift +++ b/VDS/Components/TileContainer/TileContainer.swift @@ -100,7 +100,7 @@ open class TileContainer: Control { $0.clipsToBounds = true } - private var padding: CGFloat { + internal var padding: CGFloat { switch containerPadding { case .twelve: return 12.0 @@ -115,12 +115,11 @@ open class TileContainer: Control { } } - //-------------------------------------------------- // MARK: - Constraints //-------------------------------------------------- - private var widthConstraint: NSLayoutConstraint? - private var heightConstraint: NSLayoutConstraint? + internal var widthConstraint: NSLayoutConstraint? + internal var heightConstraint: NSLayoutConstraint? internal var containerTopConstraint: NSLayoutConstraint? internal var containerBottomConstraint: NSLayoutConstraint? internal var containerLeadingConstraint: NSLayoutConstraint? @@ -261,6 +260,11 @@ open class TileContainer: Control { } } + public func addContentView(_ view: UIView) { + containerView.addSubview(view) + view.pinToSuperView() + } + class BackgroundColorConfiguration: ObjectColorable { typealias ObjectType = TileContainer diff --git a/VDS/Components/Tilet/Tilet.swift b/VDS/Components/Tilet/Tilet.swift index 35c59b49..117c185f 100644 --- a/VDS/Components/Tilet/Tilet.swift +++ b/VDS/Components/Tilet/Tilet.swift @@ -20,10 +20,10 @@ public enum TiletTitleTypographicalStyle: String, Codable, EnumSubset { case TitleSmall case BoldTitleSmall - public var defaultValue: TypographicalStyle { .BoldTitleSmall } + public var defaultValue: TitleLockupTitleTypographicalStyle { .BoldTitleSmall } } -public enum TiletOtherTypographicalStyle: String, Codable, CaseIterable { +public enum TiletOtherTypographicalStyle: String, Codable, EnumSubset { case BodyLarge case BoldBodyLarge case BodyMedium @@ -31,7 +31,7 @@ public enum TiletOtherTypographicalStyle: String, Codable, CaseIterable { case BodySmall case BoldBodySmall - public var defaultValue: TypographicalStyle { .BodySmall } + public var defaultValue: TitleLockupOtherTypographicalStyle { .BodySmall } } @@ -79,7 +79,7 @@ open class Tilet: TileContainer { //-------------------------------------------------- // MARK: - Constraints //-------------------------------------------------- - + internal var contentViewWithConstraint: NSLayoutConstraint? //functions //-------------------------------------------------- // MARK: - Lifecycle @@ -87,12 +87,9 @@ open class Tilet: TileContainer { open override func setup() { super.setup() - containerView.addSubview(titleLockup) - titleLockup.pinToSuperView() - titleLockup.pinTop() - titleLockup.pinLeading() - titleLockup.trailingAnchor.constraint(lessThanOrEqualTo: containerView.trailingAnchor).isActive = true - titleLockup.bottomAnchor.constraint(lessThanOrEqualTo: containerView.bottomAnchor).isActive = true + addContentView(titleLockup) + contentViewWithConstraint = titleLockup.widthAnchor.constraint(equalToConstant: width - (padding * 2)) + contentViewWithConstraint?.isActive = true } public override func reset() { @@ -113,10 +110,14 @@ open class Tilet: TileContainer { open override func updateView() { super.updateView() + contentViewWithConstraint?.constant = width - (padding * 2) + titleLockup.titleText = titleText + titleLockup.titleTypograpicalStyle = titleTypograpicalStyle.value titleLockup.titleTextAttributes = titleTextAttributes - titleLockup.subTitleText = titleText + titleLockup.subTitleText = subTitleText + titleLockup.otherTypograpicalStyle = otherTypograpicalStyle.value titleLockup.subTitleTextAttributes = titleTextAttributes titleLockup.subTitleColor = subTitleColor }