updated logic for change in VDS TitleLockup/Tilelet
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
9ea5443639
commit
0ed083fec4
@ -65,9 +65,9 @@ open class TileletModel: MoleculeModelProtocol {
|
|||||||
public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? {
|
public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? {
|
||||||
guard let title else { return nil }
|
guard let title else { return nil }
|
||||||
let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||||
let style: Tilelet.TitleModel.TextStyle? = title.fontStyle?.vdsSubsetStyle()
|
let style: TextStyle? = title.fontStyle?.vdsTextStyle()
|
||||||
if let style {
|
if let style, let standardStyle = Tilelet.TitleModel.StandardStyle(rawValue: style.toStandardStyle().rawValue) {
|
||||||
return .init(text: title.text, textAttributes: attrs, textStyle: style)
|
return .init(text: title.text, textAttributes: attrs, standardStyle: standardStyle)
|
||||||
} else {
|
} else {
|
||||||
return .init(text: title.text, textAttributes: attrs)
|
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? {
|
public func subTitleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.SubTitleModel? {
|
||||||
guard let subTitle else { return nil }
|
guard let subTitle else { return nil }
|
||||||
let style: Tilelet.SubTitleModel.TextStyle? = subTitle.fontStyle?.vdsSubsetStyle()
|
let attrs = subTitle.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
|
||||||
if let style {
|
let style: TextStyle? = subTitle.fontStyle?.vdsTextStyle()
|
||||||
return .init(text: subTitle.text, textStyle: style)
|
if let style, let standardStyle = Tilelet.SubTitleModel.StandardStyle(rawValue: style.toStandardStyle().rawValue) {
|
||||||
|
return .init(text: subTitle.text, textAttributes: attrs, standardStyle: standardStyle)
|
||||||
} else {
|
} else {
|
||||||
return .init(text: subTitle.text)
|
return .init(text: subTitle.text, textAttributes: attrs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user