From ba13a9a8f4fb64f8c763de96b226420620f720a3 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 27 Jan 2023 10:11:04 -0600 Subject: [PATCH] updated to convert the Atomic LabelAttribute to VDS LabelAttribute Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift | 4 ++-- MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift index 101fd1f1..bd50714f 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Tilelet.swift @@ -37,8 +37,8 @@ open class Tilelet: VDS.Tilelet, VDSMoleculeViewProtocol { width = viewModel.width textWidth = viewModel.textWidth textPercentage = viewModel.textPercentage - titleModel = viewModel.titleModel - subTitleModel = viewModel.subTitleModel + titleModel = viewModel.titleModel(delegateObject: delegateObject, additionalData: additionalData) + subTitleModel = viewModel.subTitleModel(delegateObject: delegateObject, additionalData: additionalData) badgeModel = viewModel.badge descriptiveIconModel = viewModel.descriptiveIcon directionalIconModel = viewModel.directionalIcon diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift index 4cd032f9..b349eeb5 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift @@ -44,17 +44,18 @@ open class TileletModel: MoleculeModelProtocol { self.textPercentage = try container.decodeIfPresent(CGFloat.self, forKey: .textPercentage) } - public var titleModel: Tilelet.TitleModel? { + public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? { guard let title else { return nil } + let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) let style: Tilelet.TitleModel.TextStyle? = title.fontStyle?.vdsSubsetStyle() if let style { - return .init(text: title.text, textStyle: style) + return .init(text: title.text, textAttributes: attrs, textStyle: style) } else { - return .init(text: title.text) + return .init(text: title.text, textAttributes: attrs) } } - public var subTitleModel: Tilelet.SubTitleModel? { + public func subTitleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.SubTitleModel? { guard let subTitle else { return nil } let style: Tilelet.SubTitleModel.TextStyle? = subTitle.fontStyle?.vdsSubsetStyle() if let style {