From 8c3bce746e48a2951e24c9c52960bf16740dd5f6 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 22 May 2024 15:33:30 -0500 Subject: [PATCH] refactored models Signed-off-by: Matt Bruce --- VDS/Components/Tilelet/Tilelet.swift | 4 +-- .../Tilelet/TileletIconModels.swift | 32 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index 98ce49aa..104d3551 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -532,7 +532,7 @@ open class Tilelet: TileContainerBase { var showIconContainerView = false if let descriptiveIconModel { descriptiveIcon.name = descriptiveIconModel.name - descriptiveIcon.color = descriptiveIconModel.color + descriptiveIcon.colorConfiguration = descriptiveIconModel.colorConfiguration descriptiveIcon.size = descriptiveIconModel.size descriptiveIcon.surface = backgroundColorSurface descriptiveIcon.accessibilityLabel = descriptiveIconModel.accessibleText @@ -541,7 +541,7 @@ open class Tilelet: TileContainerBase { if let directionalIconModel { directionalIcon.name = directionalIconModel.iconType.iconName - directionalIcon.color = directionalIconModel.color + directionalIcon.colorConfiguration = directionalIconModel.colorConfiguration directionalIcon.size = directionalIconModel.size directionalIcon.surface = backgroundColorSurface directionalIcon.accessibilityLabel = directionalIconModel.accessibleText diff --git a/VDS/Components/Tilelet/TileletIconModels.swift b/VDS/Components/Tilelet/TileletIconModels.swift index 788a2155..30048a3e 100644 --- a/VDS/Components/Tilelet/TileletIconModels.swift +++ b/VDS/Components/Tilelet/TileletIconModels.swift @@ -17,23 +17,23 @@ extension Tilelet { public var name: Icon.Name /// Color of the icon. - public var color: UIColor + public var colorConfiguration: SurfaceColorConfiguration /// Enum for a preset height and width for the icon. public var size: Icon.Size /// Accessible Text for the Icon public var accessibleText: String - - /// Current Surface and this is used to pass down to child objects that implement Surfacable - public var surface: Surface - public init(name: Icon.Name = .multipleDocuments, color: UIColor = VDSColor.paletteBlack, size: Icon.Size = .medium, accessibleText: String? = nil, surface: Surface = .dark) { + public init(name: Icon.Name = .multipleDocuments, + colorConfiguration: SurfaceColorConfiguration = .init(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark), + size: Icon.Size = .medium, + accessibleText: String? = nil) { + self.name = name - self.color = color + self.colorConfiguration = colorConfiguration self.accessibleText = accessibleText ?? name.rawValue self.size = size - self.surface = surface } } @@ -49,8 +49,8 @@ extension Tilelet { } /// Color of the icon. - public var color: UIColor - + public var colorConfiguration: SurfaceColorConfiguration + /// Accessible Text for the Icon public var accessibleText: String @@ -59,16 +59,16 @@ extension Tilelet { /// Enum for a preset height and width for the icon. public var size: Icon.Size - - /// Current Surface and this is used to pass down to child objects that implement Surfacable - public var surface: Surface - - public init(iconType: IconType = .rightArrow, color: UIColor = VDSColor.paletteBlack, size: Icon.Size = .medium, accessibleText: String? = nil, surface: Surface = .dark) { + + public init(iconType: IconType = .rightArrow, + colorConfiguration: SurfaceColorConfiguration = .init(.black, .white), + size: Icon.Size = .medium, + accessibleText: String? = nil) { + self.iconType = iconType - self.color = color + self.colorConfiguration = colorConfiguration self.accessibleText = accessibleText ?? iconType.iconName.rawValue self.size = size - self.surface = surface } } }