From 50117f3f2fc4a6a7112cabfaa8dff7d7c881e932 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Mon, 7 Oct 2024 15:58:56 -0500 Subject: [PATCH] updated to include badge color changes to dependent components Signed-off-by: Matt Bruce --- VDS/Components/Tilelet/Tilelet.swift | 1 + VDS/Components/Tilelet/TileletBadgeModel.swift | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/VDS/Components/Tilelet/Tilelet.swift b/VDS/Components/Tilelet/Tilelet.swift index 29a0b835..86bb64c2 100644 --- a/VDS/Components/Tilelet/Tilelet.swift +++ b/VDS/Components/Tilelet/Tilelet.swift @@ -468,6 +468,7 @@ open class Tilelet: TileContainerBase, ParentViewProtocol { private func updateBadge() { if let badgeModel { badge.text = badgeModel.text + badge.textColor = badgeModel.textColor badge.fillColor = badgeModel.fillColor badge.numberOfLines = badgeModel.numberOfLines badge.surface = backgroundColorSurface diff --git a/VDS/Components/Tilelet/TileletBadgeModel.swift b/VDS/Components/Tilelet/TileletBadgeModel.swift index 90c523da..bbc6cab7 100644 --- a/VDS/Components/Tilelet/TileletBadgeModel.swift +++ b/VDS/Components/Tilelet/TileletBadgeModel.swift @@ -15,6 +15,9 @@ extension Tilelet { /// Text that will be used for the badge. public var text: String = "" + /// Text color that will be used for the badge. + public var textColor: Badge.TextColor? + /// Fill color that will be used for the badge. public var fillColor: Badge.FillColor @@ -30,8 +33,9 @@ extension Tilelet { /// LineBreakMode used in Badge label. public var lineBreakMode: NSLineBreakMode - public init(text: String, fillColor: Badge.FillColor = .red, surface: Surface = .light, numberOfLines: Int = 0, maxWidth: CGFloat? = nil, lineBreakMode: NSLineBreakMode = .byTruncatingTail) { + public init(text: String, textColor: Badge.TextColor? = nil, fillColor: Badge.FillColor = .red, surface: Surface = .light, numberOfLines: Int = 0, maxWidth: CGFloat? = nil, lineBreakMode: NSLineBreakMode = .byTruncatingTail) { self.text = text + self.textColor = textColor self.fillColor = fillColor self.surface = surface self.numberOfLines = numberOfLines