Fix eventually glucose amount missing

shake73 · May 10, 2024 · 74239a8 · 74239a8
1 parent b5794f5
commit 74239a8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/LoopCaregiver/LoopCaregiver/Views/Charts/ChartsListView.swift b/LoopCaregiver/LoopCaregiver/Views/Charts/ChartsListView.swift
@@ -98,11 +98,11 @@ struct ChartsListView: View {
     }
 
     func eventualGlucose() -> String {
-        guard remoteDataSource.predictedGlucose.last != nil else {
+        guard let eventualGlucose = remoteDataSource.predictedGlucose.last else {
             return ""
         }
 
-        return "Eventually \(settings.glucoseDisplayUnits.shortLocalizedUnitString(avoidLineBreaking: true))"
+        return "Eventually \(eventualGlucose.presentableStringValue(displayUnits: settings.glucoseDisplayUnits, includeShortUnits: true))"
     }
 
     func formattedCOB() -> String {

diff --git a/LoopCaregiver/LoopCaregiver/Views/Home/HUDView.swift b/LoopCaregiver/LoopCaregiver/Views/Home/HUDView.swift
@@ -34,7 +34,8 @@ struct HUDView: View {
                 HStack {
                     Text(
                         nightscoutDataSource.currentGlucoseSample?.presentableStringValue(
-                            displayUnits: settings.glucoseDisplayUnits
+                            displayUnits: settings.glucoseDisplayUnits,
+                            includeShortUnits: false
                         ) ?? " "
                     )
                         .strikethrough(egvIsOutdated())

diff --git a/LoopCaregiver/LoopCaregiverWatchApp/HomeView.swift b/LoopCaregiver/LoopCaregiverWatchApp/HomeView.swift
@@ -30,7 +30,7 @@ struct HomeView: View {
     var body: some View {
         VStack {
             HStack {
-                Text(remoteDataSource.currentGlucoseSample?.presentableStringValue(displayUnits: settings.glucoseDisplayUnits) ?? " ")
+                Text(remoteDataSource.currentGlucoseSample?.presentableStringValue(displayUnits: settings.glucoseDisplayUnits, includeShortUnits: false) ?? " ")
                     .strikethrough(egvIsOutdated())
                     .font(.largeTitle)
                     .foregroundColor(egvValueColor())
@@ -90,7 +90,8 @@ struct HomeView: View {
 
     func glucoseText() -> String {
         return remoteDataSource.currentGlucoseSample?.presentableStringValue(
-            displayUnits: settings.glucoseDisplayUnits
+            displayUnits: settings.glucoseDisplayUnits,
+            includeShortUnits: false
         ) ?? " "
     }
 

diff --git a/...aregiverKit/Sources/LoopCaregiverKit/Models/Extensions/NewGlucoseSample+Presentable.swift b/...aregiverKit/Sources/LoopCaregiverKit/Models/Extensions/NewGlucoseSample+Presentable.swift
@@ -14,9 +14,13 @@ public extension NewGlucoseSample {
         return quantity.doubleValue(for: displayUnits)
     }
 
-    func presentableStringValue(displayUnits: HKUnit) -> String {
+    func presentableStringValue(displayUnits: HKUnit, includeShortUnits: Bool) -> String {
         let unitInUserUnits = quantity.doubleValue(for: displayUnits)
-        return LocalizationUtils.presentableStringFromGlucoseAmount(unitInUserUnits, displayUnits: displayUnits)
+        var result = LocalizationUtils.presentableStringFromGlucoseAmount(unitInUserUnits, displayUnits: displayUnits)
+        if includeShortUnits {
+            result += " " + displayUnits.shortLocalizedUnitString(avoidLineBreaking: true)
+        }
+        return result
     }
 }
 

diff --git a/LoopCaregiverKit/Sources/LoopCaregiverKitUI/WidgetViewModel.swift b/LoopCaregiverKit/Sources/LoopCaregiverKitUI/WidgetViewModel.swift
@@ -43,7 +43,7 @@ public struct WidgetViewModel {
 
     public var currentGlucoseText: String {
         var toRet = ""
-        let latestGlucoseValue = latestGlucose.presentableStringValue(displayUnits: glucoseDisplayUnits)
+        let latestGlucoseValue = latestGlucose.presentableStringValue(displayUnits: glucoseDisplayUnits, includeShortUnits: false)
         toRet += "\(latestGlucoseValue)"
 
         if let lastGlucoseChangeFormatted {
@@ -55,7 +55,7 @@ public struct WidgetViewModel {
 
     public var currentGlucoseNumberText: String {
         var toRet = ""
-        let latestGlucoseValue = latestGlucose.presentableStringValue(displayUnits: glucoseDisplayUnits)
+        let latestGlucoseValue = latestGlucose.presentableStringValue(displayUnits: glucoseDisplayUnits, includeShortUnits: false)
         toRet += "\(latestGlucoseValue)"
 
         return toRet