From 9f08712ae777ff5f78a175812af1d14214bf068b Mon Sep 17 00:00:00 2001 From: cdricms <36056008+cdricms@users.noreply.github.com> Date: Thu, 7 Aug 2025 16:03:47 +0200 Subject: [PATCH] Number formatting --- Sources/Units/Units.swift | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Sources/Units/Units.swift b/Sources/Units/Units.swift index 8e3f800..de411dd 100644 --- a/Sources/Units/Units.swift +++ b/Sources/Units/Units.swift @@ -275,19 +275,22 @@ public struct UnitValue: } // New reusable function - public func formatted(maximumFractionDigits: Int) -> String { + public func formatted(maximumFractionDigits: Int, showUnit: Bool = true) + -> String + { let formatter = NumberFormatter() formatter.maximumFractionDigits = maximumFractionDigits formatter.minimumFractionDigits = 0 // To avoid trailing zeros when not needed formatter.numberStyle = .decimal if let formattedValue = formatter.string( - from: NSNumber(value: self.value)) + from: NSNumber(value: value)) { - return "\(formattedValue) \(self.unit.rawValue)" - } else { - return "\(self.value) \(self.unit.rawValue)" + return showUnit + ? "\(formattedValue) \(unit.rawValue)" : "\(formattedValue)" } + return showUnit ? "\(value) \(unit.rawValue)" : "\(value)" + } // MARK: Equatable & Comparable Conformance