wip

FreeAPS.xcodeproj/project.pbxproj

@@ -268,7 +268,6 @@
 		5A2325522BFCBF55003518CA /* NightscoutUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2325512BFCBF55003518CA /* NightscoutUploadView.swift */; };
 		5A2325542BFCBF66003518CA /* NightscoutFetchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2325532BFCBF65003518CA /* NightscoutFetchView.swift */; };
 		5A2325582BFCC168003518CA /* NightscoutConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2325572BFCC168003518CA /* NightscoutConnectView.swift */; };
-		5BFA1C2208114643B77F8CEB /* AddTempTargetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE53A13D26F101B332EFFC8 /* AddTempTargetProvider.swift */; };
 		5D16287A969E64D18CE40E44 /* PumpConfigStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F60E97100041040446F44E7 /* PumpConfigStateModel.swift */; };
 		63E890B4D951EAA91C071D5C /* BasalProfileEditorStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAFF91130F2FCCC7EBBA11AD /* BasalProfileEditorStateModel.swift */; };
 		642F76A05A4FF530463A9FD0 /* NightscoutConfigRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8782B44544F38F2B2D82C38E /* NightscoutConfigRootView.swift */; };
@@ -297,8 +296,6 @@
 		88AB39B23C9552BD6E0C9461 /* ISFEditorRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBB3BAE7494CB771ABAC7B8B /* ISFEditorRootView.swift */; };
 		891DECF7BC20968D7F566161 /* AutotuneConfigProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EF98E22A39CD656A230704 /* AutotuneConfigProvider.swift */; };
 		8B759CFCF47B392BB365C251 /* BasalProfileEditorDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67F94DD2853CF42BA4E30616 /* BasalProfileEditorDataFlow.swift */; };
-		8BC2F5A29AD1ED08AC0EE013 /* AddTempTargetRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9AAB83FB6C3B41EFD1846A0 /* AddTempTargetRootView.swift */; };
-		919DBD08F13BAFB180DF6F47 /* AddTempTargetStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C3B5FD881CA45DFDEE0EDA9 /* AddTempTargetStateModel.swift */; };
 		9702FF92A09C53942F20D7EA /* TargetsEditorRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD795BA46B193644D48138C /* TargetsEditorRootView.swift */; };
 		9825E5E923F0B8FA80C8C7C7 /* NightscoutConfigStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A48AE3AC813A49A517846A /* NightscoutConfigStateModel.swift */; };
 		98641AF4F92123DA668AB931 /* CREditorRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BDC6993C1087310EDFC428 /* CREditorRootView.swift */; };
@@ -415,7 +412,6 @@
 		CEE9A6592BBB418300EB5194 /* CalibrationsDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9A6542BBB418300EB5194 /* CalibrationsDataFlow.swift */; };
 		CEE9A65C2BBB41C800EB5194 /* CalibrationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9A65B2BBB41C800EB5194 /* CalibrationService.swift */; };
 		CEE9A65E2BBC9F6500EB5194 /* CalibrationsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9A65D2BBC9F6500EB5194 /* CalibrationsTests.swift */; };
-		D2165E9D78EFF692C1DED1C6 /* AddTempTargetDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B8A42073A2D03A278914448 /* AddTempTargetDataFlow.swift */; };
 		D6D02515BBFBE64FEBE89856 /* DataTableRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881E04BA5E0A003DE8E0A9C6 /* DataTableRootView.swift */; };
 		D6DEC113821A7F1056C4AA1E /* NightscoutConfigDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2A13DF0EDEEEDC4106AA2A /* NightscoutConfigDataFlow.swift */; };
 		D76333C9256787610B3B4875 /* AutotuneConfigStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D295A3F870E826BE371C0BB5 /* AutotuneConfigStateModel.swift */; };
@@ -859,7 +855,6 @@
 		5A2325512BFCBF55003518CA /* NightscoutUploadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutUploadView.swift; sourceTree = "<group>"; };
 		5A2325532BFCBF65003518CA /* NightscoutFetchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutFetchView.swift; sourceTree = "<group>"; };
 		5A2325572BFCC168003518CA /* NightscoutConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutConnectView.swift; sourceTree = "<group>"; };
-		5B8A42073A2D03A278914448 /* AddTempTargetDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AddTempTargetDataFlow.swift; sourceTree = "<group>"; };
 		5C018D1680307A31C9ED7120 /* CGMStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CGMStateModel.swift; sourceTree = "<group>"; };
 		5D5B4F8B4194BB7E260EF251 /* ConfigEditorStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigEditorStateModel.swift; sourceTree = "<group>"; };
 		60744C3E9BB3652895C908CC /* DataTableProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DataTableProvider.swift; sourceTree = "<group>"; };
@@ -884,7 +879,6 @@
 		8782B44544F38F2B2D82C38E /* NightscoutConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NightscoutConfigRootView.swift; sourceTree = "<group>"; };
 		881E04BA5E0A003DE8E0A9C6 /* DataTableRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DataTableRootView.swift; sourceTree = "<group>"; };
 		8A965332F237348B119FB858 /* PreferencesEditorRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PreferencesEditorRootView.swift; sourceTree = "<group>"; };
-		8C3B5FD881CA45DFDEE0EDA9 /* AddTempTargetStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AddTempTargetStateModel.swift; sourceTree = "<group>"; };
 		8CF5ACEE1F0859670E71B2C0 /* AutotuneConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AutotuneConfigRootView.swift; sourceTree = "<group>"; };
 		8DCCCCE633F5E98E41B0CD3C /* AutotuneConfigDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AutotuneConfigDataFlow.swift; sourceTree = "<group>"; };
 		920DDB21E5D0EB813197500D /* ConfigEditorRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigEditorRootView.swift; sourceTree = "<group>"; };
@@ -896,7 +890,6 @@
 		A401509D21F7F35D4E109EDA /* DataTableDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DataTableDataFlow.swift; sourceTree = "<group>"; };
 		A8630D58BDAD6D9C650B9B39 /* PumpConfigProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PumpConfigProvider.swift; sourceTree = "<group>"; };
 		AAFF91130F2FCCC7EBBA11AD /* BasalProfileEditorStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BasalProfileEditorStateModel.swift; sourceTree = "<group>"; };
-		AEE53A13D26F101B332EFFC8 /* AddTempTargetProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AddTempTargetProvider.swift; sourceTree = "<group>"; };
 		AF65DA88F972B56090AD6AC3 /* PumpConfigDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PumpConfigDataFlow.swift; sourceTree = "<group>"; };
 		B5822B15939E719628E9FF7C /* SnoozeRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SnoozeRootView.swift; sourceTree = "<group>"; };
 		B5EF98E22A39CD656A230704 /* AutotuneConfigProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AutotuneConfigProvider.swift; sourceTree = "<group>"; };
@@ -1030,7 +1023,6 @@
 		E0D4F80427513ECF00BDF1FE /* HealthKitSample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitSample.swift; sourceTree = "<group>"; };
 		E26904AACA8D9C15D229D675 /* SnoozeStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SnoozeStateModel.swift; sourceTree = "<group>"; };
 		E625985B47742D498CB1681A /* NotificationsConfigProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NotificationsConfigProvider.swift; sourceTree = "<group>"; };
-		E9AAB83FB6C3B41EFD1846A0 /* AddTempTargetRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AddTempTargetRootView.swift; sourceTree = "<group>"; };
 		F816825D28DB441200054060 /* HeartBeatManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeartBeatManager.swift; sourceTree = "<group>"; };
 		F816825F28DB441800054060 /* BluetoothTransmitter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothTransmitter.swift; sourceTree = "<group>"; };
 		F90692A9274B7AAE0037068D /* HealthKitManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitManager.swift; sourceTree = "<group>"; };
@@ -1296,7 +1288,6 @@
 				19E1F7E629D0828B005C8D20 /* IconConfig */,
 				19D466A129AA2B0A004D5F33 /* FPUConfig */,
 				F90692CD274B99850037068D /* HealthKit */,
-				A9A4C88374496B3C89058A89 /* AddTempTarget */,
 				672F63EEAE27400625E14BAD /* AutotuneConfig */,
 				A42F1FEDFFD0DDE00AAD54D3 /* BasalProfileEditor */,
 				3811DE0425C9D32E00A708ED /* Base */,
@@ -1997,14 +1988,6 @@
 			path = PreferencesEditor;
 			sourceTree = "<group>";
 		};
-		3F8670D63672AF88E2E9B09E /* View */ = {
-			isa = PBXGroup;
-			children = (
-				E9AAB83FB6C3B41EFD1846A0 /* AddTempTargetRootView.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		4E8C7B59F8065047ECE20965 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -2233,17 +2216,6 @@
 			path = BasalProfileEditor;
 			sourceTree = "<group>";
 		};
-		A9A4C88374496B3C89058A89 /* AddTempTarget */ = {
-			isa = PBXGroup;
-			children = (
-				5B8A42073A2D03A278914448 /* AddTempTargetDataFlow.swift */,
-				AEE53A13D26F101B332EFFC8 /* AddTempTargetProvider.swift */,
-				8C3B5FD881CA45DFDEE0EDA9 /* AddTempTargetStateModel.swift */,
-				3F8670D63672AF88E2E9B09E /* View */,
-			);
-			path = AddTempTarget;
-			sourceTree = "<group>";
-		};
 		B9488883C59C31550E0B4CEC /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -3123,15 +3095,11 @@
 				38E8755427561E9800975559 /* DataFlow.swift in Sources */,
 				38E44522274E3DDC00EC9A94 /* NetworkReachabilityManager.swift in Sources */,
 				CE7CA34F2A064973004BE681 /* BaseIntentsRequest.swift in Sources */,
-				D2165E9D78EFF692C1DED1C6 /* AddTempTargetDataFlow.swift in Sources */,
 				CE82E02728E869DF00473A9C /* AlertEntry.swift in Sources */,
 				38E4451E274DB04600EC9A94 /* AppDelegate.swift in Sources */,
-				5BFA1C2208114643B77F8CEB /* AddTempTargetProvider.swift in Sources */,
 				BD2FF1A02AE29D43005D1C5D /* CheckboxToggleStyle.swift in Sources */,
 				BDF34F932C10D0E100D51995 /* LiveActivityAttributes+Helper.swift in Sources */,
 				E0D4F80527513ECF00BDF1FE /* HealthKitSample.swift in Sources */,
-				919DBD08F13BAFB180DF6F47 /* AddTempTargetStateModel.swift in Sources */,
-				8BC2F5A29AD1ED08AC0EE013 /* AddTempTargetRootView.swift in Sources */,
 				38A00B1F25FC00F7006BC0B0 /* Autotune.swift in Sources */,
 				38AAF85525FFF846004AF583 /* CurrentGlucoseView.swift in Sources */,
 				041D1E995A6AE92E9289DC49 /* BolusDataFlow.swift in Sources */,

FreeAPS/Sources/Models/RawFetchedProfile.swift

@@ -4,24 +4,22 @@ struct FetchedNightscoutProfileStore: JSON {
     let _id: String
     let defaultProfile: String
     let startDate: String
-<<<<<<< HEAD
+    //TODO: what is this shit used for?
+//<<<<<<< HEAD
     let mills: Decimal
     let enteredBy: String
     let store: [String: ScheduledNightscoutProfile]
     let created_at: String
-=======
-    let enteredBy: String
-    let store: [String: FetchedNightscoutProfile]
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
+//=======
+//    let enteredBy: String
+//    let store: [String: FetchedNightscoutProfile]
+//>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
 }
 
 struct FetchedNightscoutProfile: JSON {
     let dia: Decimal
-<<<<<<< HEAD
     let carbs_hr: Int
     let delay: Decimal
-=======
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
     let timezone: String
     let target_low: [NightscoutTimevalue]
     let target_high: [NightscoutTimevalue]

FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetDataFlow.swift

@@ -1,5 +0,0 @@
-enum AddTempTarget {
-    enum Config {}
-}
-
-protocol AddTempTargetProvider: Provider {}

FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetProvider.swift

@@ -1,3 +0,0 @@
-extension AddTempTarget {
-    final class Provider: BaseProvider, AddTempTargetProvider {}
-}

FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetStateModel.swift

@@ -1,276 +0,0 @@
-import CoreData
-import SwiftUI
-
-extension AddTempTarget {
-    final class StateModel: BaseStateModel<Provider> {
-        @Injected() private var storage: TempTargetsStorage!
-        @Injected() var apsManager: APSManager!
-
-        let coredataContext = CoreDataStack.shared.newTaskContext()
-
-        @Published var low: Decimal = 0
-        @Published var high: Decimal = 0
-        @Published var duration: Decimal = 0
-        @Published var date = Date()
-        @Published var newPresetName = ""
-        @Published var presets: [TempTarget] = []
-        @Published var percentage = 100.0
-        @Published var maxValue: Decimal = 1.2
-        @Published var viewPercantage = false
-        @Published var hbt: Double = 160
-        @Published var saveSettings: Bool = false
-
-        private(set) var units: GlucoseUnits = .mgdL
-
-        override func subscribe() {
-            units = settingsManager.settings.units
-            presets = storage.presets()
-            maxValue = settingsManager.preferences.autosensMax
-        }
-
-        func enact() {
-            guard duration > 0 else {
-                return
-            }
-            var lowTarget = low
-
-            if viewPercantage {
-                lowTarget = Decimal(round(Double(computeTarget())))
-                coredataContext.performAndWait {
-                    let saveToCoreData = TempTargets(context: self.coredataContext)
-                    saveToCoreData.id = UUID().uuidString
-                    saveToCoreData.active = true
-                    saveToCoreData.hbt = hbt
-                    saveToCoreData.date = Date()
-                    saveToCoreData.duration = duration as NSDecimalNumber
-                    saveToCoreData.startDate = Date()
-
-                    do {
-                        guard self.coredataContext.hasChanges else { return }
-                        try self.coredataContext.save()
-                    } catch {
-                        print(error.localizedDescription)
-                    }
-                }
-                saveSettings = true
-            } else {
-                coredataContext.performAndWait {
-                    let saveToCoreData = TempTargets(context: coredataContext)
-                    saveToCoreData.active = false
-                    saveToCoreData.date = Date()
-                    do {
-                        guard self.coredataContext.hasChanges else { return }
-                        try self.coredataContext.save()
-                    } catch {
-                        print(error.localizedDescription)
-                    }
-                }
-            }
-            var highTarget = lowTarget
-
-            if units == .mmolL, !viewPercantage {
-                lowTarget = Decimal(round(Double(lowTarget.asMgdL)))
-                highTarget = lowTarget
-            }
-
-            let entry = TempTarget(
-                name: TempTarget.custom,
-                createdAt: date,
-                targetTop: highTarget,
-                targetBottom: lowTarget,
-                duration: duration,
-                enteredBy: TempTarget.manual,
-                reason: TempTarget.custom
-            )
-            storage.storeTempTargets([entry])
-            showModal(for: nil)
-        }
-
-        func cancel() {
-            storage.storeTempTargets([TempTarget.cancel(at: Date())])
-            showModal(for: nil)
-
-            coredataContext.performAndWait {
-                let saveToCoreData = TempTargets(context: self.coredataContext)
-                saveToCoreData.active = false
-                saveToCoreData.date = Date()
-                do {
-                    guard self.coredataContext.hasChanges else { return }
-                    try self.coredataContext.save()
-                } catch {
-                    print(error.localizedDescription)
-                }
-
-                let setHBT = TempTargetsSlider(context: self.coredataContext)
-                setHBT.enabled = false
-                setHBT.date = Date()
-                do {
-                    guard self.coredataContext.hasChanges else { return }
-                    try self.coredataContext.save()
-                } catch {
-                    print(error.localizedDescription)
-                }
-            }
-        }
-
-        private func convertAndRound(_ value: Decimal) -> Decimal {
-            if units == .mmolL {
-                return Decimal(round(Double(value.asMgdL)))
-            } else {
-                return Decimal(round(Double(value)))
-            }
-        }
-
-        func save() {
-            guard duration > 0 else {
-                return
-            }
-            var lowTarget = low
-
-            if viewPercantage {
-                lowTarget = Decimal(round(Double(computeTarget())))
-                saveSettings = true
-            }
-            var highTarget = lowTarget
-
-            if units == .mmolL, !viewPercantage {
-                lowTarget = Decimal(round(Double(lowTarget.asMgdL)))
-                highTarget = lowTarget
-            }
-
-            let entry = TempTarget(
-                name: newPresetName.isEmpty ? TempTarget.custom : newPresetName,
-                createdAt: Date(),
-                targetTop: highTarget,
-                targetBottom: lowTarget,
-                duration: duration,
-                enteredBy: TempTarget.manual,
-                reason: newPresetName.isEmpty ? TempTarget.custom : newPresetName
-            )
-            presets.append(entry)
-            storage.storePresets(presets)
-
-            if viewPercantage {
-                let id = entry.id
-
-                coredataContext.performAndWait {
-                    let saveToCoreData = TempTargetsSlider(context: self.coredataContext)
-                    saveToCoreData.id = id
-                    saveToCoreData.isPreset = true
-                    saveToCoreData.enabled = true
-                    saveToCoreData.hbt = hbt
-                    saveToCoreData.date = Date()
-                    saveToCoreData.duration = duration as NSDecimalNumber
-                    do {
-                        guard self.coredataContext.hasChanges else { return }
-                        try self.coredataContext.save()
-                    } catch {
-                        print(error.localizedDescription)
-                    }
-                }
-            }
-        }
-
-        func enactPreset(id: String) {
-            if var preset = presets.first(where: { $0.id == id }) {
-                preset.createdAt = Date()
-                storage.storeTempTargets([preset])
-                showModal(for: nil)
-
-                coredataContext.performAndWait {
-                    var tempTargetsArray = [TempTargetsSlider]()
-                    let requestTempTargets = TempTargetsSlider.fetchRequest() as NSFetchRequest<TempTargetsSlider>
-                    let sortTT = NSSortDescriptor(key: "date", ascending: false)
-                    requestTempTargets.sortDescriptors = [sortTT]
-                    try? tempTargetsArray = coredataContext.fetch(requestTempTargets)
-
-                    let whichID = tempTargetsArray.first(where: { $0.id == id })
-
-                    if whichID != nil {
-                        let saveToCoreData = TempTargets(context: self.coredataContext)
-                        saveToCoreData.active = true
-                        saveToCoreData.date = Date()
-                        saveToCoreData.hbt = whichID?.hbt ?? 160
-                        saveToCoreData.startDate = Date()
-                        saveToCoreData.duration = whichID?.duration ?? 0
-
-                        do {
-                            guard self.coredataContext.hasChanges else { return }
-                            try self.coredataContext.save()
-                        } catch {
-                            print(error.localizedDescription)
-                        }
-                    } else {
-                        let saveToCoreData = TempTargets(context: self.coredataContext)
-                        saveToCoreData.active = false
-                        saveToCoreData.date = Date()
-                        do {
-                            guard self.coredataContext.hasChanges else { return }
-                            try self.coredataContext.save()
-                        } catch {
-                            print(error.localizedDescription)
-                        }
-                    }
-                }
-            }
-        }
-
-        func removePreset(id: String) {
-            presets = presets.filter { $0.id != id }
-            storage.storePresets(presets)
-        }
-
-        func computeTarget() -> Decimal {
-            var ratio = Decimal(percentage / 100)
-            let c = Decimal(hbt - 100)
-            var target = (c / ratio) - c + 100
-
-            if c * (c + target - 100) <= 0 {
-                ratio = maxValue
-                target = (c / ratio) - c + 100
-            }
-            return Decimal(Double(target))
-        }
-
-        func computePercentage(target: Decimal) -> Decimal {
-            let c = Decimal(hbt - 100)
-            var ratio = c / (c + target - 100)
-
-            if ratio > maxValue {
-                ratio = maxValue
-            }
-
-            let adjustedPercentage = ratio * 100
-            let roundedPercentage = (adjustedPercentage as NSDecimalNumber).rounding(accordingToBehavior: nil)
-            return roundedPercentage as Decimal
-        }
-
-        func updatePreset(_ preset: TempTarget) {
-            var lowTarget = low
-
-            if viewPercantage {
-                lowTarget = Decimal(round(Double(computeTarget())))
-            }
-
-            if units == .mmolL, !viewPercantage {
-                lowTarget = Decimal(round(Double(lowTarget.asMgdL)))
-            }
-
-            let updatedPreset = TempTarget(
-                id: preset.id,
-                name: newPresetName.isEmpty ? preset.name : newPresetName,
-                createdAt: preset.createdAt,
-                targetTop: lowTarget,
-                targetBottom: lowTarget,
-                duration: duration,
-                enteredBy: preset.enteredBy,
-                reason: newPresetName.isEmpty ? preset.reason : newPresetName
-            )
-
-            if let index = presets.firstIndex(where: { $0.id == preset.id }) {
-                presets[index] = updatedPreset
-                storage.storePresets(presets)
-            }
-        }
-    }
-}

FreeAPS/Sources/Modules/AddTempTarget/View/AddTempTargetRootView.swift

@@ -1,433 +0,0 @@
-import CoreData
-import SwiftUI
-import Swinject
-
-extension AddTempTarget {
-    struct RootView: BaseView {
-        let resolver: Resolver
-        @StateObject var state = StateModel()
-        @State private var isPromptPresented = false
-        @State private var isRemoveAlertPresented = false
-        @State private var removeAlert: Alert?
-        @State private var isEditing = false
-        @State private var selectedPreset: TempTarget?
-        @State private var isEditSheetPresented = false
-
-        @FetchRequest(
-            entity: TempTargetsSlider.entity(),
-            sortDescriptors: [NSSortDescriptor(key: "date", ascending: false)]
-        ) var isEnabledArray: FetchedResults<TempTargetsSlider>
-
-        @Environment(\.colorScheme) var colorScheme
-
-        private var formatter: NumberFormatter {
-            let formatter = NumberFormatter()
-            formatter.numberStyle = .decimal
-            formatter.maximumFractionDigits = 1
-            return formatter
-        }
-
-        private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
-                gradient: Gradient(colors: [
-                    Color.bgDarkBlue,
-                    Color.bgDarkerDarkBlue
-                ]),
-                startPoint: .top,
-                endPoint: .bottom
-            )
-                :
-                LinearGradient(
-                    gradient: Gradient(colors: [Color.gray.opacity(0.1)]),
-                    startPoint: .top,
-                    endPoint: .bottom
-                )
-
-        private var displayString: String {
-            guard let preset = selectedPreset else { return "" }
-            var low = preset.targetBottom
-            var high = preset.targetBottom // change to only use targetBottom instead of targetTop
-            if state.units == .mmolL {
-                low = low?.asMmolL
-                high = high?.asMmolL
-            }
-
-            let formattedLow = low.flatMap { formatter.string(from: $0 as NSNumber) } ?? ""
-            let formattedDuration = formatter.string(from: preset.duration as NSNumber) ?? ""
-
-            return "\(formattedLow) \(state.units.rawValue) for \(formattedDuration) min"
-        }
-
-        var body: some View {
-            Form {
-                if !state.presets.isEmpty {
-                    Section(header: Text("Presets")) {
-                        ForEach(state.presets) { preset in
-                            presetView(for: preset)
-<<<<<<< HEAD
-                        }
-                    }.listRowBackground(Color.chart)
-                }
-
-                HStack {
-                    Text("Experimental")
-                    Toggle(isOn: $state.viewPercantage) {}.controlSize(.mini)
-                    Image(systemName: "figure.highintensity.intervaltraining")
-                    Image(systemName: "fork.knife")
-                }.listRowBackground(Color.chart)
-
-                if state.viewPercantage {
-                    Section {
-                        VStack {
-                            Text("\(state.percentage.formatted(.number)) % Insulin")
-                                .foregroundColor(isEditing ? .orange : .blue)
-                                .font(.largeTitle)
-                                .padding(.vertical)
-                            Slider(
-                                value: $state.percentage,
-                                in: 15 ...
-                                    min(Double(state.maxValue * 100), 200),
-                                step: 1,
-                                onEditingChanged: { editing in
-                                    isEditing = editing
-                                }
-                            )
-                            // Only display target slider when not 100 %
-                            if state.percentage != 100 {
-                                Spacer()
-                                Divider()
-                                Text(
-                                    (
-                                        state
-                                            .units == .mmolL ?
-                                            "\(state.computeTarget().asMmolL.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))) mmol/L" :
-                                            "\(state.computeTarget().formatted(.number.grouping(.never).rounded().precision(.fractionLength(0)))) mg/dl"
-                                    )
-                                        + NSLocalizedString(" Target Glucose", comment: "")
-                                )
-                                .foregroundColor(.green)
-                                .padding(.vertical)
-
-                                Slider(
-                                    value: $state.hbt,
-                                    in: 101 ... 295,
-                                    step: 1
-                                ).accentColor(.green)
-                            }
-                        }
-                    }.listRowBackground(Color.chart)
-                } else {
-                    Section(header: Text("Custom")) {
-                        HStack {
-                            Text("Target")
-                            Spacer()
-                            TextFieldWithToolBar(text: $state.low, placeholder: "0", numberFormatter: formatter)
-                            Text(state.units.rawValue).foregroundColor(.secondary)
-                        }
-                        HStack {
-                            Text("Duration")
-                            Spacer()
-                            TextFieldWithToolBar(text: $state.duration, placeholder: "0", numberFormatter: formatter)
-                            Text("minutes").foregroundColor(.secondary)
-                        }
-                        DatePicker("Date", selection: $state.date)
-                        Button { isPromptPresented = true }
-                        label: { Text("Save as preset") }
-                    }.listRowBackground(Color.chart)
-                }
-                if state.viewPercantage {
-                    Section {
-                        HStack {
-                            Text("Duration")
-                            Spacer()
-                            TextFieldWithToolBar(text: $state.duration, placeholder: "0", numberFormatter: formatter)
-                            Text("minutes").foregroundColor(.secondary)
-                        }
-                        DatePicker("Date", selection: $state.date)
-                        Button { isPromptPresented = true }
-                        label: { Text("Save as preset") }
-                            .disabled(state.duration == 0)
-                    }.listRowBackground(Color.chart)
-=======
-                                .swipeActions {
-                                    Button(role: .none, action: {
-                                        removeAlert = Alert(
-                                            title: Text("Are you sure?"),
-                                            message: Text("Delete preset \n\(preset.displayName)?"),
-                                            primaryButton: .destructive(Text("Delete"), action: {
-                                                state.removePreset(id: preset.id)
-                                                isRemoveAlertPresented = false
-                                            }),
-                                            secondaryButton: .cancel()
-                                        )
-                                        isRemoveAlertPresented = true
-                                    }) {
-                                        Label("Delete", systemImage: "trash")
-                                    }.tint(.red)
-                                    Button {
-                                        selectedPreset = preset
-                                        state.newPresetName = preset.displayName
-                                        state.low = state.units == .mmolL ? preset.targetBottom?.asMmolL ?? 0 : preset
-                                            .targetBottom ?? 0
-                                        state.duration = preset.duration
-                                        state.date = preset.date as? Date ?? Date()
-                                        isEditSheetPresented = true
-                                    } label: {
-                                        Label("Edit", systemImage: "square.and.pencil")
-                                    }
-                                    .tint(.blue)
-                                }
-                                .alert(isPresented: $isRemoveAlertPresented) {
-                                    removeAlert!
-                                }
-                        }
-                    }
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
-                }
-
-                settingsSection(header: "Custom")
-
-                DatePicker("Date", selection: $state.date)
-                Button { isPromtPresented = true }
-                label: { Text("Save as preset") }
-                    .disabled(state.duration == 0)
-
-                Section {
-                    Button { state.enact() }
-                    label: { Text("Enact") }
-                        .disabled(state.duration == 0)
-                    Button { state.cancel() }
-                    label: { Text("Cancel Temp Target") }
-<<<<<<< HEAD
-                }.listRowBackground(Color.chart)
-            }.scrollContentBackground(.hidden).background(color)
-                .popover(isPresented: $isPromptPresented) {
-                    Form {
-                        Section(header: Text("Enter preset name")) {
-                            TextField("Name", text: $state.newPresetName)
-                            Button {
-                                state.save()
-                                isPromptPresented = false
-                            }
-                            label: { Text("Save") }
-                            Button { isPromptPresented = false }
-                            label: { Text("Cancel") }
-                        }
-                    }
-                }
-                .onAppear {
-                    configureView()
-                    state.hbt = isEnabledArray.first?.hbt ?? 160
-                }
-                .navigationTitle("Enact Temp Target")
-                .navigationBarTitleDisplayMode(.inline)
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarLeading) {
-                        Button("Close") {
-                            state.hideModal()
-=======
-                }
-            }
-            .popover(isPresented: $isPromtPresented) {
-                Form {
-                    Section(header: Text("Enter preset name")) {
-                        TextField("Name", text: $state.newPresetName)
-                    }
-                    Section {
-                        Button {
-                            state.save()
-                            isPromtPresented = false
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
-                        }
-                    }
-                }
-<<<<<<< HEAD
-=======
-            }
-            .sheet(isPresented: $isEditSheetPresented) {
-                editPresetPopover()
-                    .padding()
-            }
-            .onAppear {
-                configureView()
-                state.hbt = isEnabledArray.first?.hbt ?? 160
-            }
-            .navigationTitle("Enact Temp Target")
-            .navigationBarTitleDisplayMode(.automatic)
-            .navigationBarItems(leading: Button("Close", action: state.hideModal))
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
-        }
-
-        @ViewBuilder func settingsSection(header: String) -> some View {
-            HStack {
-                Text("Experimental")
-                Toggle(isOn: $state.viewPercantage) {}
-                    .controlSize(.mini)
-                    .onChange(of: state.viewPercantage) { newValue in
-                        if newValue {
-                            guard let selectedPreset = selectedPreset,
-                                  let targetBottom = selectedPreset.targetBottom else { return }
-                            let computedPercentage = state.computePercentage(target: targetBottom)
-                            state.percentage = Double(truncating: computedPercentage as NSNumber)
-                        }
-                    }
-                Image(systemName: "figure.highintensity.intervaltraining")
-                Image(systemName: "fork.knife")
-            }
-
-            if state.viewPercantage {
-                Section {
-                    VStack {
-                        Text("\(state.percentage.formatted(.number)) % Insulin")
-                            .foregroundColor(isEditing ? .orange : .blue)
-                            .font(.largeTitle)
-                            .padding(.vertical)
-                        Slider(
-                            value: $state.percentage,
-                            in: 15 ...
-                                min(Double(state.maxValue * 100), 200),
-                            step: 1,
-                            onEditingChanged: { editing in
-                                isEditing = editing
-                            }
-                        )
-                        HStack {}
-                        // Only display target slider when not 100 %
-                        if state.percentage != 100 {
-                            Spacer()
-                            Divider()
-                            Text(
-                                (
-                                    state
-                                        .units == .mmolL ?
-                                        "\(state.computeTarget().asMmolL.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))) mmol/L" :
-                                        "\(state.computeTarget().formatted(.number.grouping(.never).rounded().precision(.fractionLength(0)))) mg/dl"
-                                )
-                                    + NSLocalizedString(" Target Glucose", comment: "")
-                            )
-                            .foregroundColor(.green)
-                            .padding(.vertical)
-                            Slider(
-                                value: $state.hbt,
-                                in: 101 ... 295,
-                                step: 1
-                            ).accentColor(.green)
-                        }
-                    }
-                }
-            } else {
-                Section(header: Text(header)) {
-                    HStack {
-                        Text("Target")
-                        Spacer()
-                        TextFieldWithToolBar(text: $state.low, placeholder: "0", numberFormatter: formatter)
-                        Text(state.units.rawValue).foregroundColor(.secondary)
-                    }
-                    HStack {
-                        Text("Duration")
-                        Spacer()
-                        TextFieldWithToolBar(text: $state.duration, placeholder: "0", numberFormatter: formatter)
-                        Text("minutes").foregroundColor(.secondary)
-                    }
-                }
-            }
-            if state.viewPercantage {
-                Section {
-                    HStack {
-                        Text("Duration")
-                        Spacer()
-                        TextFieldWithToolBar(text: $state.duration, placeholder: "0", numberFormatter: formatter)
-                        Text("minutes").foregroundColor(.secondary)
-                    }
-                }
-            }
-        }
-
-        @ViewBuilder private func editPresetPopover() -> some View {
-            Form {
-                Section(header: Text("Edit Name?")) {
-                    TextField("Name", text: $state.newPresetName)
-                    Text("Settings before change: \(displayString)")
-                        .foregroundColor(.secondary)
-                        .font(.caption)
-                }
-                settingsSection(header: "New target and duration")
-
-                Section {
-                    Button("Save") {
-                        guard let selectedPreset = selectedPreset else { return }
-                        state.updatePreset(selectedPreset)
-                        isEditSheetPresented = false
-                    }
-                    .disabled(state.newPresetName.isEmpty)
-
-                    Button("Cancel") {
-                        // Reset the fields and close the sheet
-                        resetFields()
-                        isEditSheetPresented = false
-                    }
-                }
-            }
-            .onAppear {
-                guard let selectedPreset = selectedPreset, let targetBottom = selectedPreset.targetBottom else { return }
-                let computedPercentage = state.computePercentage(target: targetBottom)
-                state.percentage = Double(truncating: computedPercentage as NSNumber)
-            }
-            .onDisappear {
-                if isEditSheetPresented == false {
-                    resetFields()
-                }
-            }
-        }
-
-        private func resetFields() {
-            state.newPresetName = ""
-            state.low = 0
-            state.duration = 0
-            state.percentage = 100 // Reset experimental slider if necessary
-        }
-
-        private func presetView(for preset: TempTarget) -> some View {
-            var low = preset.targetBottom
-            if state.units == .mmolL {
-                low = low?.asMmolL
-            }
-
-            return HStack {
-                VStack {
-                    HStack {
-                        Text(preset.displayName)
-                        Spacer()
-                    }
-                    HStack(spacing: 2) {
-                        if let lowValue = low,
-                           let formattedLow = formatter.string(from: lowValue as NSNumber)
-                        {
-                            Text(formattedLow)
-                                .foregroundColor(.secondary)
-                                .font(.caption)
-                        }
-
-                        Text(state.units.rawValue)
-                            .foregroundColor(.secondary)
-                            .font(.caption)
-                        Text("for")
-                            .foregroundColor(.secondary)
-                            .font(.caption)
-                        Text("\(formatter.string(from: preset.duration as NSNumber)!)")
-                            .foregroundColor(.secondary)
-                            .font(.caption)
-                        Text("min")
-                            .foregroundColor(.secondary)
-                            .font(.caption)
-
-                        Spacer()
-                    }.padding(.bottom, 2)
-                }
-                .contentShape(Rectangle())
-                .onTapGesture {
-                    state.enactPreset(id: preset.id)
-                }
-            }
-        } }
-}

FreeAPS/Sources/Modules/Calibrations/View/CalibrationsRootView.swift

@@ -107,11 +107,8 @@ extension Calibrations {
                     }
                 }
             }
-<<<<<<< HEAD
             .scrollContentBackground(.hidden).background(color)
-=======
             .dynamicTypeSize(...DynamicTypeSize.xxLarge)
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
             .onAppear(perform: configureView)
             .navigationTitle("Calibrations")
             .navigationBarItems(trailing: EditButton().disabled(state.calibrations.isEmpty))

FreeAPS/Sources/Modules/StatConfig/StatConfigStateModel.swift

@@ -3,19 +3,12 @@ import SwiftUI
 extension StatConfig {
     final class StateModel: BaseStateModel<Provider> {
         @Published var overrideHbA1cUnit = false
-<<<<<<< HEAD
-        @Published var low: Decimal = 4 / 0.0555
-        @Published var high: Decimal = 10 / 0.0555
-        @Published var xGridLines = false
-        @Published var yGridLines: Bool = false
-        @Published var oneDimensionalGraph = false
-        @Published var rulerMarks: Bool = false
+        
         @Published var skipBolusScreenAfterCarbs: Bool = false
         @Published var useFPUconversion: Bool = true
         @Published var tins: Bool = false
         @Published var historyLayout: HistoryLayout = .twoTabs
         @Published var lockScreenView: LockScreenView = .simple
-=======
         @Published var low: Decimal = 70
         @Published var high: Decimal = 180
         @Published var hours: Decimal = 6
@@ -23,7 +16,6 @@ extension StatConfig {
         @Published var yGridLines: Bool = false
         @Published var oneDimensionalGraph = false
         @Published var rulerMarks: Bool = true
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
 
         var units: GlucoseUnits = .mgdL
 

FreeAPS/Sources/Modules/StatConfig/View/StatConfigRootView.swift

@@ -50,19 +50,15 @@ extension StatConfig {
                     Toggle("Display Chart Threshold lines for Low and High", isOn: $state.rulerMarks)
                     Toggle("Standing / Laying TIR Chart", isOn: $state.oneDimensionalGraph)
                     Toggle("Enable total insulin in scope", isOn: $state.tins)
-                } header: { Text("Home Chart settings ") }
-
-<<<<<<< HEAD
-                Section {
-=======
                     HStack {
                         Text("Hours X-Axis (6 default)")
                         Spacer()
                         TextFieldWithToolBar(text: $state.hours, placeholder: "6", numberFormatter: carbsFormatter)
                         Text("hours").foregroundColor(.secondary)
                     }
+                } header: { Text("Home Chart settings ") }
 
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
+                Section {
                     HStack {
                         Text("Low")
                         Spacer()

FreeAPS/Sources/Modules/WatchConfig/View/WatchConfigRootView.swift

@@ -39,13 +39,6 @@ extension WatchConfig {
                     Toggle("Confirm Bolus Faster", isOn: $state.confirmBolusFaster)
                 }
 
-<<<<<<< HEAD
-                Toggle("Display Protein & Fat", isOn: $state.displayFatAndProteinOnWatch)
-
-                Toggle("Confirm Bolus Faster", isOn: $state.confirmBolusFaster)
-
-=======
->>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
                 Section(header: Text("Garmin Watch")) {
                     List {
                         ForEach(state.devices, id: \.uuid) { device in