Преглед изворни кода

chore: correct misunderstanding in merge conflict resolution

Andreas Stokholm пре 1 година
родитељ
комит
d97f8ecc25

+ 11 - 10
FreeAPS/Sources/Modules/AutosensSettings/AutosensSettingsStateModel.swift

@@ -3,10 +3,10 @@ import Observation
 import SwiftUI
 import SwiftUI
 
 
 extension AutosensSettings {
 extension AutosensSettings {
-    @Observable final class StateModel: BaseStateModel<Provider> {
-        @ObservationIgnored @Injected() var settings: SettingsManager!
-        @ObservationIgnored @Injected() var storage: FileStorage!
-        @ObservationIgnored @Injected() var determinationStorage: DeterminationStorage!
+    final class StateModel: BaseStateModel<Provider> {
+        @Injected() var settings: SettingsManager!
+        @Injected() var storage: FileStorage!
+        @Injected() var determinationStorage: DeterminationStorage!
 
 
         var units: GlucoseUnits = .mgdL
         var units: GlucoseUnits = .mgdL
 
 
@@ -16,9 +16,9 @@ extension AutosensSettings {
 
 
         let viewContext = CoreDataStack.shared.persistentContainer.viewContext
         let viewContext = CoreDataStack.shared.persistentContainer.viewContext
 
 
-        var autosensMax: Decimal = 1.2
-        var autosensMin: Decimal = 0.7
-        var rewindResetsAutosens: Bool = true
+        @Published var autosensMax: Decimal = 1.2
+        @Published var autosensMin: Decimal = 0.7
+        @Published var rewindResetsAutosens: Bool = true
 
 
         var preferences: Preferences {
         var preferences: Preferences {
             settingsManager.preferences
             settingsManager.preferences
@@ -26,9 +26,10 @@ extension AutosensSettings {
 
 
         override func subscribe() {
         override func subscribe() {
             units = settingsManager.settings.units
             units = settingsManager.settings.units
-            autosensMax = settings.preferences.autosensMax
-            autosensMin = settings.preferences.autosensMin
-            rewindResetsAutosens = settings.preferences.rewindResetsAutosens
+
+            subscribePreferencesSetting(\.autosensMax, on: $autosensMax) { autosensMax = $0 }
+            subscribePreferencesSetting(\.autosensMin, on: $autosensMin) { autosensMin = $0 }
+            subscribePreferencesSetting(\.rewindResetsAutosens, on: $rewindResetsAutosens) { rewindResetsAutosens = $0 }
 
 
             if let newISF = provider.autosense.newisf {
             if let newISF = provider.autosense.newisf {
                 autosensISF = newISF
                 autosensISF = newISF

+ 0 - 1
FreeAPS/Sources/Modules/AutosensSettings/View/AutosensSettingsRootView.swift

@@ -107,7 +107,6 @@ extension AutosensSettings {
                             action: {
                             action: {
                                 hintLabel = "Autosens"
                                 hintLabel = "Autosens"
                                 selectedVerboseHint = AnyView(autosensVerboseHint)
                                 selectedVerboseHint = AnyView(autosensVerboseHint)
-//                                    ((shouldDisplayHint.wrappedValue != nil) ? AnyView(autosensVerboseHint) : nil)
                                 shouldDisplayHint.toggle()
                                 shouldDisplayHint.toggle()
                             },
                             },
                             label: {
                             label: {