From ac8b7ce1662454fa0129cd1b8ace29d4388efe5e Mon Sep 17 00:00:00 2001 From: alternateal Date: Sat, 3 Dec 2016 07:40:54 +0000 Subject: [PATCH] Issue #267 updated to show decimals in mmol/L values in watch app and complication --- WatchApp Extension/ComplicationController.swift | 8 +++++++- .../Controllers/StatusInterfaceController.swift | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WatchApp Extension/ComplicationController.swift b/WatchApp Extension/ComplicationController.swift index 63884fbbf0..642d9661e2 100644 --- a/WatchApp Extension/ComplicationController.swift +++ b/WatchApp Extension/ComplicationController.swift @@ -40,10 +40,13 @@ final class ComplicationController: NSObject, CLKComplicationDataSource { // MARK: - Timeline Population - private lazy var formatter = NumberFormatter() + // private lazy var formatter = NumberFormatter() func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: (@escaping (CLKComplicationTimelineEntry?) -> Void)) { + let formatter = NumberFormatter(); formatter.usesSignificantDigits = true; formatter.minimumSignificantDigits = 2; formatter.maximumSignificantDigits = 3 + + switch complication.family { case .modularSmall: if let context = ExtensionDelegate.shared().lastContext, @@ -69,6 +72,9 @@ final class ComplicationController: NSObject, CLKComplicationDataSource { func getTimelineEntries(for complication: CLKComplication, after date: Date, limit: Int, withHandler handler: (@escaping ([CLKComplicationTimelineEntry]?) -> Void)) { // Call the handler with the timeline entries after to the given date + + let formatter = NumberFormatter(); formatter.usesSignificantDigits = true; formatter.minimumSignificantDigits = 2; formatter.maximumSignificantDigits = 3 + if let context = ExtensionDelegate.shared().lastContext, let glucose = context.glucose, let unit = context.preferredGlucoseUnit, diff --git a/WatchApp Extension/Controllers/StatusInterfaceController.swift b/WatchApp Extension/Controllers/StatusInterfaceController.swift index 2da4b29324..fddefc73b4 100644 --- a/WatchApp Extension/Controllers/StatusInterfaceController.swift +++ b/WatchApp Extension/Controllers/StatusInterfaceController.swift @@ -46,7 +46,7 @@ final class StatusInterfaceController: WKInterfaceController, ContextUpdatable { loopHUDImage.setLoopImage(.Unknown) } - let numberFormatter = NumberFormatter() + let numberFormatter = NumberFormatter(); numberFormatter.usesSignificantDigits=true; numberFormatter.minimumSignificantDigits = 2; numberFormatter.maximumSignificantDigits = 3 if let glucose = context?.glucose, let unit = context?.preferredGlucoseUnit { let glucoseValue = glucose.doubleValue(for: unit)