|
|
@@ -55,45 +55,44 @@ struct CurrentGlucoseView: View {
|
|
|
.map { deltaFormatter.string(from: Double(units == .mmolL ? $0.asMmolL : Decimal($0)) as NSNumber)!
|
|
|
} ??
|
|
|
"--"
|
|
|
-
|
|
|
- ).font(.caption2).foregroundColor(.secondary)
|
|
|
- }
|
|
|
+ ).font(.system(size: 12, weight: .bold)) }
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- var colorOfGlucose: Color {
|
|
|
- guard var recentBG = recentGlucose?.glucose
|
|
|
- else { return .loopYellow }
|
|
|
-
|
|
|
- recentBG /= 18 // convert to mmol/l for calculation
|
|
|
+ var colorOfGlucose: Color {
|
|
|
+ guard var recentBG = recentGlucose?.glucose
|
|
|
+ else { return .loopYellow }
|
|
|
|
|
|
- switch recentBG {
|
|
|
- case 4 ... 7:
|
|
|
- return .loopGreen
|
|
|
- case 8 ... 9:
|
|
|
- return .loopYellow
|
|
|
- default:
|
|
|
- return .loopRed
|
|
|
- }
|
|
|
+ recentBG = Int(recentBG.asMmolL) // convert to mmol/l for calculation
|
|
|
+
|
|
|
+ switch recentBG {
|
|
|
+ case 4 ... 7:
|
|
|
+ return .loopGreen
|
|
|
+ case 8 ... 9:
|
|
|
+ return .loopYellow
|
|
|
+ default:
|
|
|
+ return .loopRed
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- var minutesAgo: Int {
|
|
|
- let lastGlucoseDateString = recentGlucose.map { dateFormatter.string(from: $0.dateString) } ?? "--"
|
|
|
- let LastGlucoseDate = Date(lastGlucoseDateString) ?? Date()
|
|
|
- let now = Date()
|
|
|
- let diff = Int(now.timeIntervalSince1970 - LastGlucoseDate.timeIntervalSince1970)
|
|
|
- let hoursDiff = diff / 3600
|
|
|
- let minutesDiff = (diff - hoursDiff * 3600) / 60
|
|
|
- return minutesDiff
|
|
|
- }
|
|
|
+ var minutesAgo: Int {
|
|
|
+ let lastGlucoseDateString = recentGlucose.map { dateFormatter.string(from: $0.dateString) } ?? "--"
|
|
|
+ let LastGlucoseDate = Date(lastGlucoseDateString) ?? Date()
|
|
|
+ let now = Date()
|
|
|
+ let diff = Int(now.timeIntervalSince1970 - LastGlucoseDate.timeIntervalSince1970)
|
|
|
+ let hoursDiff = diff / 3600
|
|
|
+ let minutesDiff = (diff - hoursDiff * 3600) / 60
|
|
|
+ return minutesDiff
|
|
|
+ }
|
|
|
|
|
|
- func colorOfMinutesAgo(_ minutes: Int) -> Color {
|
|
|
- switch minutes {
|
|
|
- case 0 ... 5:
|
|
|
- return .loopGreen
|
|
|
- case 6 ... 9:
|
|
|
- return .loopYellow
|
|
|
- default:
|
|
|
- return .loopRed
|
|
|
+ func colorOfMinutesAgo(_ minutes: Int) -> Color {
|
|
|
+ switch minutes {
|
|
|
+ case 0 ... 5:
|
|
|
+ return .loopGreen
|
|
|
+ case 6 ... 9:
|
|
|
+ return .loopYellow
|
|
|
+ default:
|
|
|
+ return .loopRed
|
|
|
}
|
|
|
}
|
|
|
|