From 05c4effb98ad2eb629850b747955b7ef2748d830 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Wed, 9 Aug 2023 13:39:37 -0500 Subject: [PATCH] updated rules on leading, max digits and trailing Signed-off-by: Matt Bruce --- VDS/Components/BadgeIndicator/BadgeIndicator.swift | 11 ++++++++--- VDS/SupportingFiles/ReleaseNotes.txt | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/VDS/Components/BadgeIndicator/BadgeIndicator.swift b/VDS/Components/BadgeIndicator/BadgeIndicator.swift index 09b403dd..25dd7a75 100644 --- a/VDS/Components/BadgeIndicator/BadgeIndicator.swift +++ b/VDS/Components/BadgeIndicator/BadgeIndicator.swift @@ -362,16 +362,21 @@ open class BadgeIndicator: View { let formatter = NumberFormatter() formatter.numberStyle = .decimal text = formatter.string(from: .init(integerLiteral: maxBadgetCount))! - + + //leading if let leadingCharacter, !leadingCharacter.isEmpty { text = "\(leadingCharacter)\(text)" - } else if maximumDigits.value < "\(badgeCount)".count { + } + + //maximumDigits + if maximumDigits.value < "\(badgeCount)".count { let formatter = NumberFormatter() formatter.numberStyle = .decimal text = "\(text)+" } - if let trailingText { + //trailing + if let trailingText, !trailingText.isEmpty { text = "\(text) \(trailingText)" } } diff --git a/VDS/SupportingFiles/ReleaseNotes.txt b/VDS/SupportingFiles/ReleaseNotes.txt index 5e0f477a..100c5663 100644 --- a/VDS/SupportingFiles/ReleaseNotes.txt +++ b/VDS/SupportingFiles/ReleaseNotes.txt @@ -1,3 +1,8 @@ +1.0.39 +======= +- CXTDT-423141 - Tabs - Selected Tab dark mode text color +- Badge Indicator update to latest specs from July + 1.0.38 ======= - Fixed bug in Typography TitleLarge Font update for Mobile