mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bugs

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-12-20 11:17:53 -06:00
parent fbca279f7e
commit 9a69c2c112
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VDS/Components/TileContainer/TileContainer.swift
View File

@ -100,7 +100,7 @@ open class TileContainer: Control {
$0.clipsToBounds = true $0.clipsToBounds = true
} }
private var padding: CGFloat { internal var padding: CGFloat {
switch containerPadding { switch containerPadding {
case .twelve: case .twelve:
return 12.0 return 12.0
@ -115,12 +115,11 @@ open class TileContainer: Control {
} }
} }
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Constraints // MARK: - Constraints
//-------------------------------------------------- //--------------------------------------------------
private var widthConstraint: NSLayoutConstraint? internal var widthConstraint: NSLayoutConstraint?
private var heightConstraint: NSLayoutConstraint? internal var heightConstraint: NSLayoutConstraint?
internal var containerTopConstraint: NSLayoutConstraint? internal var containerTopConstraint: NSLayoutConstraint?
internal var containerBottomConstraint: NSLayoutConstraint? internal var containerBottomConstraint: NSLayoutConstraint?
internal var containerLeadingConstraint: 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 { class BackgroundColorConfiguration: ObjectColorable {
typealias ObjectType = TileContainer typealias ObjectType = TileContainer

23
VDS/Components/Tilet/Tilet.swift
View File

@ -20,10 +20,10 @@ public enum TiletTitleTypographicalStyle: String, Codable, EnumSubset {
case TitleSmall case TitleSmall
case BoldTitleSmall 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 BodyLarge
case BoldBodyLarge case BoldBodyLarge
case BodyMedium case BodyMedium
@ -31,7 +31,7 @@ public enum TiletOtherTypographicalStyle: String, Codable, CaseIterable {
case BodySmall case BodySmall
case BoldBodySmall case BoldBodySmall
public var defaultValue: TypographicalStyle { .BodySmall } public var defaultValue: TitleLockupOtherTypographicalStyle { .BodySmall }
} }
@ -79,7 +79,7 @@ open class Tilet: TileContainer {
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Constraints // MARK: - Constraints
//-------------------------------------------------- //--------------------------------------------------
internal var contentViewWithConstraint: NSLayoutConstraint?
//functions //functions
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Lifecycle // MARK: - Lifecycle
@ -87,12 +87,9 @@ open class Tilet: TileContainer {
open override func setup() { open override func setup() {
super.setup() super.setup()
containerView.addSubview(titleLockup) addContentView(titleLockup)
titleLockup.pinToSuperView() contentViewWithConstraint = titleLockup.widthAnchor.constraint(equalToConstant: width - (padding * 2))
titleLockup.pinTop() contentViewWithConstraint?.isActive = true
titleLockup.pinLeading()
titleLockup.trailingAnchor.constraint(lessThanOrEqualTo: containerView.trailingAnchor).isActive = true
titleLockup.bottomAnchor.constraint(lessThanOrEqualTo: containerView.bottomAnchor).isActive = true
} }
public override func reset() { public override func reset() {
@ -113,10 +110,14 @@ open class Tilet: TileContainer {
open override func updateView() { open override func updateView() {
super.updateView() super.updateView()
contentViewWithConstraint?.constant = width - (padding * 2)
titleLockup.titleText = titleText titleLockup.titleText = titleText
titleLockup.titleTypograpicalStyle = titleTypograpicalStyle.value
titleLockup.titleTextAttributes = titleTextAttributes titleLockup.titleTextAttributes = titleTextAttributes
titleLockup.subTitleText = titleText titleLockup.subTitleText = subTitleText
titleLockup.otherTypograpicalStyle = otherTypograpicalStyle.value
titleLockup.subTitleTextAttributes = titleTextAttributes titleLockup.subTitleTextAttributes = titleTextAttributes
titleLockup.subTitleColor = subTitleColor titleLockup.subTitleColor = subTitleColor
} }