From 0ed083fec4b5fc16129976cd07e671ddd5d492c0 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 29 Jun 2023 15:28:41 -0500 Subject: [PATCH] updated logic for change in VDS TitleLockup/Tilelet Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift index c6685364..620e0940 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift @@ -65,9 +65,9 @@ open class TileletModel: MoleculeModelProtocol { 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, textAttributes: attrs, textStyle: style) + let style: TextStyle? = title.fontStyle?.vdsTextStyle() + if let style, let standardStyle = Tilelet.TitleModel.StandardStyle(rawValue: style.toStandardStyle().rawValue) { + return .init(text: title.text, textAttributes: attrs, standardStyle: standardStyle) } else { return .init(text: title.text, textAttributes: attrs) } @@ -75,11 +75,12 @@ open class TileletModel: MoleculeModelProtocol { 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 { - return .init(text: subTitle.text, textStyle: style) + let attrs = subTitle.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) + let style: TextStyle? = subTitle.fontStyle?.vdsTextStyle() + if let style, let standardStyle = Tilelet.SubTitleModel.StandardStyle(rawValue: style.toStandardStyle().rawValue) { + return .init(text: subTitle.text, textAttributes: attrs, standardStyle: standardStyle) } else { - return .init(text: subTitle.text) + return .init(text: subTitle.text, textAttributes: attrs) } }