Jelajahi Sumber

Hide predicted glucose in Libre Transmitter (not used), glucose rounding fixes

Ivan Valkou 4 tahun lalu
induk
melakukan
dc659e8a6a

+ 1 - 2
Dependencies/LibreTransmitter/Sources/LibreTransmitter/Common/NotificationHelper.swift

@@ -12,7 +12,6 @@ import HealthKit
 import UserNotifications
 import os.log
 import UIKit
-import AudioToolbox
 
 fileprivate var logger = Logger(forType: "NotificationHelper")
 
@@ -44,7 +43,7 @@ public enum NotificationHelper {
             return
         }
 
-        AudioServicesPlaySystemSoundWithCompletion(SystemSoundID(1336)) {
+        AudioServicesPlaySystemSoundWithCompletion(1336) {
             playSound(times: times - 1)
         }
     }

+ 1 - 0
Dependencies/LibreTransmitter/Sources/LibreTransmitter/Common/QuantityFormatter.swift

@@ -63,6 +63,7 @@ open class QuantityFormatter {
         let formatter = NumberFormatter()
         formatter.numberStyle = .decimal
         formatter.locale = self.locale
+        formatter.roundingMode = .halfUp
         return formatter
     }()
 

+ 5 - 5
Dependencies/LibreTransmitter/Sources/LibreTransmitter/LibreTransmitterUI/Views/Settings/AlarmSettings/AlarmSettingsView.swift

@@ -29,8 +29,8 @@ private class AlarmSettingsIcons {
 class AlarmScheduleState : ObservableObject, Identifiable, Hashable{
 
     var id = UUID()
-    
 
+    private let glucoseRate = 18.018
 
     @Published var lowmgdl : Double = 72
     @Published var highmgdl : Double = 180  
@@ -42,7 +42,7 @@ class AlarmScheduleState : ObservableObject, Identifiable, Hashable{
     public func setLowAlarm(forUnit unit: HKUnit, lowAlarm: Double) {
 
         if unit == HKUnit.millimolesPerLiter {
-            self.lowmgdl = lowAlarm * 18
+            self.lowmgdl = lowAlarm * glucoseRate
             return
         }
 
@@ -52,7 +52,7 @@ class AlarmScheduleState : ObservableObject, Identifiable, Hashable{
     public func getLowAlarm(forUnit unit: HKUnit) -> Double {
 
         if unit == HKUnit.millimolesPerLiter {
-            return (lowmgdl / 18).roundTo(places: 1)
+            return (lowmgdl / glucoseRate).roundTo(places: 1)
         }
 
         return lowmgdl
@@ -65,7 +65,7 @@ class AlarmScheduleState : ObservableObject, Identifiable, Hashable{
     public func setHighAlarm(forUnit unit: HKUnit, highAlarm: Double) {
 
         if unit == HKUnit.millimolesPerLiter {
-            self.highmgdl = highAlarm * 18
+            self.highmgdl = highAlarm * glucoseRate
             return
         }
 
@@ -75,7 +75,7 @@ class AlarmScheduleState : ObservableObject, Identifiable, Hashable{
     public func getHighAlarm(forUnit unit: HKUnit) -> Double {
 
         if unit == HKUnit.millimolesPerLiter {
-            return (highmgdl / 18).roundTo(places: 1)
+            return (highmgdl / glucoseRate).roundTo(places: 1)
         }
         return highmgdl
 

+ 3 - 3
Dependencies/LibreTransmitter/Sources/LibreTransmitter/LibreTransmitterUI/Views/Settings/SettingsView.swift

@@ -353,9 +353,9 @@ struct SettingsView: View {
         List {
             snoozeSection
             measurementSection
-            if !glucoseMeasurement.predictionDate.isEmpty{
-                predictionSection
-            }
+//            if !glucoseMeasurement.predictionDate.isEmpty{
+//                predictionSection
+//            }
             advancedSection
             sensorInfoSection
             transmitterInfoSection