From 7357a199d2adcf8a4c2bc8e864c426badf9f6886 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Sat, 29 Jun 2024 09:48:18 -0500 Subject: [PATCH] fixes for VDS TileContainer update Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift | 3 +-- MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift index 8ed4fd55..7d0968df 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift @@ -137,8 +137,7 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol{ extension Tilelet: MVMCoreUIViewConstrainingProtocol { - // Investigate later. - //public func horizontalAlignment() -> UIStackView.Alignment { .leading } + public func horizontalAlignment() -> UIStackView.Alignment { .leading } public func isClippable() -> Bool { return false diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift index cf5d382b..561d45b4 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift @@ -44,7 +44,9 @@ open class TileletModel: TileContainerBaseModel, Molec case directionalIcon case textWidth case textPercentage + case aspectRatio } + required public init(from decoder: Decoder) throws { let container = try decoder.container(keyedBy: CodingKeys.self) id = try container.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString @@ -86,8 +88,10 @@ open class TileletModel: TileContainerBaseModel, Molec } else { subTitleColor = .primary } - + try super.init(from: decoder) + //Tilelet default is .none, not ratio1x1 (TileContainer) + aspectRatio = try container.decodeIfPresent(Tilelet.AspectRatio.self, forKey: .aspectRatio) ?? .none } public func eyebrowModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.EyebrowModel? {