Просмотр исходного кода

Revert "Show ISF. Not working right now"

This reverts commit f94fb5318bcb996ea7d7b02ad658f9e24448a08b.
Jon Mårtensson 4 лет назад
Родитель
Сommit
c79fa8909f

+ 0 - 2
FreeAPS/Sources/Models/Suggestion.swift

@@ -16,7 +16,6 @@ struct Suggestion: JSON, Equatable {
     let temp: TempType?
     let bg: Decimal?
     let reservoir: Decimal?
-    let isf: Int?
     var timestamp: Date?
     var recieved: Bool?
 
@@ -49,7 +48,6 @@ extension Suggestion {
         case temp
         case bg
         case reservoir
-        case isf = "ISF"
         case timestamp
         case recieved
     }

+ 0 - 2
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -41,7 +41,6 @@ extension Home {
         @Published var errorDate: Date? = nil
         @Published var bolusProgress: Decimal?
         @Published var eventualBG: Int?
-        @Published var isf: Int?
         @Published var carbsRequired: Decimal?
         @Published var allowManualTemp = false
         @Published var units: GlucoseUnits = .mmolL
@@ -247,7 +246,6 @@ extension Home {
             }
 
             eventualBG = suggestion.eventualBG
-            isf = suggestion.isf
         }
 
         private func setupReservoir() {

+ 1 - 14
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -8,8 +8,7 @@ extension Home {
 
         @StateObject var state = StateModel()
         @State var isStatusPopupPresented = false
-        @State var currentISF: Int?
-        
+
         private var numberFormatter: NumberFormatter {
             let formatter = NumberFormatter()
             formatter.numberStyle = .decimal
@@ -161,18 +160,6 @@ extension Home {
                             state.cancelBolus()
                         }
                 }
-                Spacer()
-                Text(
-                    NSLocalizedString("ISF", comment: "current ISF") + ":"
-                )
-                .font(.system(size: 12))
-                .padding(.leading, 6)
-                .fixedSize()
-                Text(
-                    numberFormatter.string(from: (currentISF ?? 0) as NSNumber) ?? "0"
-                )
-                .font(.system(size: 12, weight: .bold)).foregroundColor(.secondary)
-                .fixedSize()
             }
             .frame(maxWidth: .infinity, maxHeight: 30)
         }