Skip to content

Issue #267 - Displaying decimals on Watch for mmol #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Issue #267 - Displaying decimals on Watch for mmol #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac8b7ce
Issue #267 updated to show decimals in mmol/L values in watch app and…
alternateal Dec 3, 2016
12868f0
Merge pull request #1 from LoopKit/dev
alternateal Dec 4, 2016
b50f486
Merge pull request #3 from LoopKit/dev
alternateal Dec 11, 2016
ec81eaf
Merge pull request #4 from LoopKit/dev
alternateal Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion WatchApp Extension/ComplicationController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

@ps2 ps2 Dec 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this display with mg/dl?

Need to avoid repeating this code three times.



switch complication.family {
case .modularSmall:
if let context = ExtensionDelegate.shared().lastContext,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion WatchApp Extension/Controllers/StatusInterfaceController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down