Skip to content

Widget should always display data using the preferred dispay unit, #434

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

Merged
merged 1 commit into from
Apr 5, 2017
Merged

Widget should always display data using the preferred dispay unit, #434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Widget should always display data using the preferred dispay unit, 
regardless of the units used in the StatusExtensionContext.
  • Loading branch information
Bharat Mediratta committed Apr 3, 2017
commit 7b9f51fd2e2b47789f5ac21f6bc4a020c88c7f09
7 changes: 4 additions & 3 deletions Loop Status Extension/StatusViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
let unit = glucose[0].unit
let glucoseFormatter = NumberFormatter.glucoseFormatter(for: unit)

charts.glucoseUnit = unit
charts.glucosePoints = glucose.map {
ChartPoint(
x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
Expand All @@ -225,20 +226,20 @@ class StatusViewController: UIViewController, NCWidgetProviding {
charts.predictedGlucosePoints = predictedGlucose.map {
ChartPoint(
x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
y: ChartAxisValueDoubleUnit($0.value, unitString: unit.unitString, formatter: glucoseFormatter)
y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: unit), unitString: unit.unitString, formatter: glucoseFormatter)
)
}

if let eventualGlucose = predictedGlucose.last {
let formatter = NumberFormatter.glucoseFormatter(for: eventualGlucose.unit)

if let eventualGlucoseNumberString = formatter.string(from: NSNumber(value: eventualGlucose.value)) {
if let eventualGlucoseNumberString = formatter.string(from: NSNumber(value: eventualGlucose.quantity.doubleValue(for: unit))) {
subtitleLabel.text = String(
format: NSLocalizedString(
"Eventually %1$@ %2$@",
comment: "The subtitle format describing eventual glucose. (1: localized glucose value description) (2: localized glucose units description)"),
eventualGlucoseNumberString,
eventualGlucose.unit.glucoseUnitDisplayString
unit.glucoseUnitDisplayString
)
subtitleLabel.isHidden = false
}
Expand Down