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

updating to fix for height

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-12-20 12:04:44 -06:00
parent 76454b2771
commit a340598861
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ open class TileContainer: Control {
case ratio16x9 = "16:9" case ratio16x9 = "16:9"
case ratio1x2 = "1:2" case ratio1x2 = "1:2"
case ratio2x1 = "2:1" case ratio2x1 = "2:1"
case none
} }
//-------------------------------------------------- //--------------------------------------------------
@ -120,6 +121,7 @@ open class TileContainer: Control {
//-------------------------------------------------- //--------------------------------------------------
internal var widthConstraint: NSLayoutConstraint? internal var widthConstraint: NSLayoutConstraint?
internal var heightConstraint: NSLayoutConstraint? internal var heightConstraint: NSLayoutConstraint?
internal var heightGreaterThanConstraint: 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?
@ -138,7 +140,10 @@ open class TileContainer: Control {
widthConstraint = widthAnchor.constraint(equalToConstant: width) widthConstraint = widthAnchor.constraint(equalToConstant: width)
widthConstraint?.isActive = true widthConstraint?.isActive = true
heightGreaterThanConstraint = heightAnchor.constraint(greaterThanOrEqualToConstant: 44.0)
heightGreaterThanConstraint?.isActive = false
heightConstraint = heightAnchor.constraint(equalToConstant: width) heightConstraint = heightAnchor.constraint(equalToConstant: width)
heightConstraint?.isActive = true heightConstraint?.isActive = true
@ -222,6 +227,9 @@ open class TileContainer: Control {
height = (2 / 1) * width height = (2 / 1) * width
case .ratio2x1: case .ratio2x1:
height = (1 / 2) * width height = (1 / 2) * width
default:
break
} }
return CGSize(width: width, height: height) return CGSize(width: width, height: height)
@ -250,13 +258,21 @@ open class TileContainer: Control {
containerBottomConstraint?.constant = -padding containerBottomConstraint?.constant = -padding
containerTrailingConstraint?.constant = -padding containerTrailingConstraint?.constant = -padding
if let height { if aspectRatio == .none {
widthConstraint?.constant = width
heightConstraint?.isActive = false
heightGreaterThanConstraint?.isActive = true
} else if let height {
widthConstraint?.constant = width widthConstraint?.constant = width
heightConstraint?.constant = height heightConstraint?.constant = height
heightConstraint?.isActive = true
heightGreaterThanConstraint?.isActive = false
} else { } else {
let size = ratioSize let size = ratioSize
widthConstraint?.constant = size.width widthConstraint?.constant = size.width
heightConstraint?.constant = size.height heightConstraint?.constant = size.height
heightConstraint?.isActive = true
heightGreaterThanConstraint?.isActive = false
} }
} }

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

@ -98,6 +98,7 @@ open class Tilet: TileContainer {
open override func setup() { open override func setup() {
super.setup() super.setup()
aspectRatio = .none
surface = .light surface = .light
addContentView(titleLockup) addContentView(titleLockup)
contentViewWithConstraint = titleLockup.widthAnchor.constraint(equalToConstant: width - (padding * 2)) contentViewWithConstraint = titleLockup.widthAnchor.constraint(equalToConstant: width - (padding * 2))