From 3eda3bd68ec593a2996a4447994fc7577929d4a4 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 5 Jun 2024 13:09:04 -0500 Subject: [PATCH] fixed titlelet Signed-off-by: Matt Bruce --- VDS/Components/Tilelet/Tilelet.swift | 8 ++++++-- VDS/Components/Tilelet/TileletIconModels.swift | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index 4d714874..c49542b2 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -540,7 +540,9 @@ open class Tilelet: TileContainerBase { var showIconContainerView = false if let descriptiveIconModel { descriptiveIcon.name = descriptiveIconModel.name - descriptiveIcon.color = descriptiveIconModel.iconColor.uiColor ?? VDSColor.paletteBlack + if let color = descriptiveIconModel.iconColor?.uiColor { + descriptiveIcon.color = color + } descriptiveIcon.size = descriptiveIconModel.size descriptiveIcon.surface = backgroundColorSurface showIconContainerView = true @@ -548,7 +550,9 @@ open class Tilelet: TileContainerBase { if let directionalIconModel { directionalIcon.name = directionalIconModel.iconType.iconName - directionalIcon.color = directionalIconModel.iconColor.uiColor ?? VDSColor.paletteBlack + if let color = directionalIconModel.iconColor?.uiColor { + directionalIcon.color = color + } directionalIcon.size = directionalIconModel.size.value directionalIcon.surface = backgroundColorSurface showIconContainerView = true diff --git a/VDS/Components/Tilelet/TileletIconModels.swift b/VDS/Components/Tilelet/TileletIconModels.swift index 1ade5c57..b9b0a181 100644 --- a/VDS/Components/Tilelet/TileletIconModels.swift +++ b/VDS/Components/Tilelet/TileletIconModels.swift @@ -24,7 +24,7 @@ extension Tilelet { public var uiColor: UIColor { switch self { case .token(let color): - return color + return color.uiColor case .custom(let color): return color }