Resolve build issues after pulling in Trio WIP

BolusStored+CoreDataProperties.swift

@@ -1,20 +1,15 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension BolusStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<BolusStored> {
-        return NSFetchRequest<BolusStored>(entityName: "BolusStored")
+public extension BolusStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<BolusStored> {
+        NSFetchRequest<BolusStored>(entityName: "BolusStored")
     }
 
-    @NSManaged public var amount: NSDecimalNumber?
-    @NSManaged public var isExternal: Bool
-    @NSManaged public var isSMB: Bool
-    @NSManaged public var pumpEvent: PumpEventStored?
-
+    @NSManaged var amount: NSDecimalNumber?
+    @NSManaged var isExternal: Bool
+    @NSManaged var isSMB: Bool
+    @NSManaged var pumpEvent: PumpEventStored?
 }
 
-extension BolusStored : Identifiable {
-
-}
+extension BolusStored: Identifiable {}

CarbEntryStored+CoreDataProperties.swift

@@ -1,25 +1,20 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension CarbEntryStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<CarbEntryStored> {
-        return NSFetchRequest<CarbEntryStored>(entityName: "CarbEntryStored")
+public extension CarbEntryStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<CarbEntryStored> {
+        NSFetchRequest<CarbEntryStored>(entityName: "CarbEntryStored")
     }
 
-    @NSManaged public var carbs: Double
-    @NSManaged public var date: Date?
-    @NSManaged public var fat: Double
-    @NSManaged public var fpuID: UUID?
-    @NSManaged public var id: UUID?
-    @NSManaged public var isFPU: Bool
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var note: String?
-    @NSManaged public var protein: Double
-
+    @NSManaged var carbs: Double
+    @NSManaged var date: Date?
+    @NSManaged var fat: Double
+    @NSManaged var fpuID: UUID?
+    @NSManaged var id: UUID?
+    @NSManaged var isFPU: Bool
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var note: String?
+    @NSManaged var protein: Double
 }
 
-extension CarbEntryStored : Identifiable {
-
-}
+extension CarbEntryStored: Identifiable {}

Forecast+CoreDataProperties.swift

@@ -1,38 +1,32 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension Forecast {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<Forecast> {
-        return NSFetchRequest<Forecast>(entityName: "Forecast")
+public extension Forecast {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<Forecast> {
+        NSFetchRequest<Forecast>(entityName: "Forecast")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var id: UUID?
-    @NSManaged public var type: String?
-    @NSManaged public var forecastValues: NSSet?
-    @NSManaged public var orefDetermination: OrefDetermination?
-
+    @NSManaged var date: Date?
+    @NSManaged var id: UUID?
+    @NSManaged var type: String?
+    @NSManaged var forecastValues: NSSet?
+    @NSManaged var orefDetermination: OrefDetermination?
 }
 
 // MARK: Generated accessors for forecastValues
-extension Forecast {
 
+public extension Forecast {
     @objc(addForecastValuesObject:)
-    @NSManaged public func addToForecastValues(_ value: ForecastValue)
+    @NSManaged func addToForecastValues(_ value: ForecastValue)
 
     @objc(removeForecastValuesObject:)
-    @NSManaged public func removeFromForecastValues(_ value: ForecastValue)
+    @NSManaged func removeFromForecastValues(_ value: ForecastValue)
 
     @objc(addForecastValues:)
-    @NSManaged public func addToForecastValues(_ values: NSSet)
+    @NSManaged func addToForecastValues(_ values: NSSet)
 
     @objc(removeForecastValues:)
-    @NSManaged public func removeFromForecastValues(_ values: NSSet)
-
+    @NSManaged func removeFromForecastValues(_ values: NSSet)
 }
 
-extension Forecast : Identifiable {
-
-}
+extension Forecast: Identifiable {}

ForecastValue+CoreDataProperties.swift

@@ -1,19 +1,14 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension ForecastValue {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<ForecastValue> {
-        return NSFetchRequest<ForecastValue>(entityName: "ForecastValue")
+public extension ForecastValue {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<ForecastValue> {
+        NSFetchRequest<ForecastValue>(entityName: "ForecastValue")
     }
 
-    @NSManaged public var index: Int32
-    @NSManaged public var value: Int32
-    @NSManaged public var forecast: Forecast?
-
+    @NSManaged var index: Int32
+    @NSManaged var value: Int32
+    @NSManaged var forecast: Forecast?
 }
 
-extension ForecastValue : Identifiable {
-
-}
+extension ForecastValue: Identifiable {}

FreeAPS.xcodeproj/project.pbxproj

@@ -21,7 +21,6 @@
 		1927C8E62744606D00347C69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1927C8E82744606D00347C69 /* InfoPlist.strings */; };
 		1935364028496F7D001E0B16 /* Oref2_variables.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1935363F28496F7D001E0B16 /* Oref2_variables.swift */; };
 		193F6CDD2A512C8F001240FD /* Loops.swift in Sources */ = {isa = PBXBuildFile; fileRef = 193F6CDC2A512C8F001240FD /* Loops.swift */; };
-		1956FB212AFF79E200C7B4FF /* CoreDataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1956FB202AFF79E200C7B4FF /* CoreDataStorage.swift */; };
 		195D80B42AF6973A00D25097 /* DynamicRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195D80B32AF6973A00D25097 /* DynamicRootView.swift */; };
 		195D80B72AF697B800D25097 /* DynamicDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195D80B62AF697B800D25097 /* DynamicDataFlow.swift */; };
 		195D80B92AF697F700D25097 /* DynamicProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 195D80B82AF697F700D25097 /* DynamicProvider.swift */; };
@@ -259,7 +258,6 @@
 		585E2CAE2BE7BF46006ECF1A /* PumpEvent+helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585E2CAD2BE7BF46006ECF1A /* PumpEvent+helper.swift */; };
 		5864E8592C42CFAE00294306 /* DeterminationStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5864E8582C42CFAE00294306 /* DeterminationStorage.swift */; };
 		587DA1F62B77F3DD00B28F8A /* SettingsRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587DA1F52B77F3DD00B28F8A /* SettingsRowView.swift */; };
-		587EB7B62C4C2EB0009EB23D /* OverrideProfilesConfig in Resources */ = {isa = PBXBuildFile; fileRef = 587EB7B52C4C2EB0009EB23D /* OverrideProfilesConfig */; };
 		5887527C2BD986E1008B081D /* OpenAPSBattery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5887527B2BD986E1008B081D /* OpenAPSBattery.swift */; };
 		588752842BD9986A008B081D /* OpenAPS_Battery+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588752822BD9986A008B081D /* OpenAPS_Battery+CoreDataClass.swift */; };
 		588752852BD9986A008B081D /* OpenAPS_Battery+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 588752832BD9986A008B081D /* OpenAPS_Battery+CoreDataProperties.swift */; };
@@ -420,6 +418,12 @@
 		DD3251872C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DD3251852C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodeld */; };
 		DD399FB31EACB9343C944C4C /* PreferencesEditorStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA3E609094E064C99A4752C /* PreferencesEditorStateModel.swift */; };
 		DD68889D2C386E17006E3C44 /* NightscoutExercise.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD68889C2C386E17006E3C44 /* NightscoutExercise.swift */; };
+		DDD163122C4C689900CD525A /* OverrideStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD163112C4C689900CD525A /* OverrideStateModel.swift */; };
+		DDD163142C4C68D300CD525A /* OverrideProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD163132C4C68D300CD525A /* OverrideProvider.swift */; };
+		DDD163162C4C690300CD525A /* OverrideDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD163152C4C690300CD525A /* OverrideDataFlow.swift */; };
+		DDD163182C4C694000CD525A /* OverrideRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD163172C4C694000CD525A /* OverrideRootView.swift */; };
+		DDD1631A2C4C695E00CD525A /* EditOverrideForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD163192C4C695E00CD525A /* EditOverrideForm.swift */; };
+		DDD1631C2C4C697400CD525A /* AddOverrideForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD1631B2C4C697400CD525A /* AddOverrideForm.swift */; };
 		E00EEC0327368630002FF094 /* ServiceAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00EEBFD27368630002FF094 /* ServiceAssembly.swift */; };
 		E00EEC0427368630002FF094 /* SecurityAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00EEBFE27368630002FF094 /* SecurityAssembly.swift */; };
 		E00EEC0527368630002FF094 /* StorageAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = E00EEBFF27368630002FF094 /* StorageAssembly.swift */; };
@@ -572,7 +576,6 @@
 		193F1E3B2B44C14800525770 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		193F1E3C2B44C14800525770 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
 		193F6CDC2A512C8F001240FD /* Loops.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Loops.swift; sourceTree = "<group>"; };
-		1956FB202AFF79E200C7B4FF /* CoreDataStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataStorage.swift; sourceTree = "<group>"; };
 		195D80B32AF6973A00D25097 /* DynamicRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicRootView.swift; sourceTree = "<group>"; };
 		195D80B62AF697B800D25097 /* DynamicDataFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicDataFlow.swift; sourceTree = "<group>"; };
 		195D80B82AF697F700D25097 /* DynamicProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicProvider.swift; sourceTree = "<group>"; };
@@ -846,7 +849,6 @@
 		585E2CAD2BE7BF46006ECF1A /* PumpEvent+helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PumpEvent+helper.swift"; sourceTree = "<group>"; };
 		5864E8582C42CFAE00294306 /* DeterminationStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeterminationStorage.swift; sourceTree = "<group>"; };
 		587DA1F52B77F3DD00B28F8A /* SettingsRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsRowView.swift; sourceTree = "<group>"; };
-		587EB7B52C4C2EB0009EB23D /* OverrideProfilesConfig */ = {isa = PBXFileReference; lastKnownFileType = folder; path = OverrideProfilesConfig; sourceTree = "<group>"; };
 		5887527B2BD986E1008B081D /* OpenAPSBattery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAPSBattery.swift; sourceTree = "<group>"; };
 		588752822BD9986A008B081D /* OpenAPS_Battery+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OpenAPS_Battery+CoreDataClass.swift"; sourceTree = SOURCE_ROOT; };
 		588752832BD9986A008B081D /* OpenAPS_Battery+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OpenAPS_Battery+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
@@ -1011,6 +1013,12 @@
 		DD1DB7CD2BED00CF0048B367 /* SettingsRootViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsRootViewModel.swift; sourceTree = "<group>"; };
 		DD3251862C4C52F500E957C4 /* TrioPersistentContainer.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TrioPersistentContainer.xcdatamodel; sourceTree = "<group>"; };
 		DD68889C2C386E17006E3C44 /* NightscoutExercise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutExercise.swift; sourceTree = "<group>"; };
+		DDD163112C4C689900CD525A /* OverrideStateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideStateModel.swift; sourceTree = "<group>"; };
+		DDD163132C4C68D300CD525A /* OverrideProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideProvider.swift; sourceTree = "<group>"; };
+		DDD163152C4C690300CD525A /* OverrideDataFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideDataFlow.swift; sourceTree = "<group>"; };
+		DDD163172C4C694000CD525A /* OverrideRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideRootView.swift; sourceTree = "<group>"; };
+		DDD163192C4C695E00CD525A /* EditOverrideForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditOverrideForm.swift; sourceTree = "<group>"; };
+		DDD1631B2C4C697400CD525A /* AddOverrideForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddOverrideForm.swift; sourceTree = "<group>"; };
 		E00EEBFD27368630002FF094 /* ServiceAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceAssembly.swift; sourceTree = "<group>"; };
 		E00EEBFE27368630002FF094 /* SecurityAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecurityAssembly.swift; sourceTree = "<group>"; };
 		E00EEBFF27368630002FF094 /* StorageAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageAssembly.swift; sourceTree = "<group>"; };
@@ -1279,6 +1287,7 @@
 		3811DE0325C9D31700A708ED /* Modules */ = {
 			isa = PBXGroup;
 			children = (
+				DDD163032C4C67B400CD525A /* OverrideConfig */,
 				195D80B22AF696EE00D25097 /* Dynamic */,
 				BD7DA9A32AE06DBA00601B20 /* BolusCalculatorConfig */,
 				CEE9A64D2BBB411C00EB5194 /* Calibrations */,
@@ -1302,7 +1311,6 @@
 				5031FE61F63C2A8A8B7674DD /* ManualTempBasal */,
 				D533BF261CDC1C3F871E7BFD /* NightscoutConfig */,
 				F66B236E00924A05D6A9F9DF /* NotificationsConfig */,
-				587EB7B52C4C2EB0009EB23D /* OverrideProfilesConfig */,
 				3E1C41D9301B7058AA7BF5EA /* PreferencesEditor */,
 				99C01B871ACAB3F32CE755C7 /* PumpConfig */,
 				E493126EA71765130F64CCE5 /* PumpSettingsEditor */,
@@ -1798,7 +1806,6 @@
 				CE82E02428E867BA00473A9C /* AlertStorage.swift */,
 				BDC2EA442C3043B000E5BBD0 /* OverrideStorage.swift */,
 				5864E8582C42CFAE00294306 /* DeterminationStorage.swift */,
-				1956FB202AFF79E200C7B4FF /* CoreDataStorage.swift */,
 			);
 			path = Storage;
 			sourceTree = "<group>";
@@ -2386,6 +2393,27 @@
 			path = ISFEditor;
 			sourceTree = "<group>";
 		};
+		DDD163032C4C67B400CD525A /* OverrideConfig */ = {
+			isa = PBXGroup;
+			children = (
+				DDD1630A2C4C67F000CD525A /* View */,
+				DDD163112C4C689900CD525A /* OverrideStateModel.swift */,
+				DDD163132C4C68D300CD525A /* OverrideProvider.swift */,
+				DDD163152C4C690300CD525A /* OverrideDataFlow.swift */,
+			);
+			path = OverrideConfig;
+			sourceTree = "<group>";
+		};
+		DDD1630A2C4C67F000CD525A /* View */ = {
+			isa = PBXGroup;
+			children = (
+				DDD163172C4C694000CD525A /* OverrideRootView.swift */,
+				DDD163192C4C695E00CD525A /* EditOverrideForm.swift */,
+				DDD1631B2C4C697400CD525A /* AddOverrideForm.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		E00EEBFC27368630002FF094 /* Assemblies */ = {
 			isa = PBXGroup;
 			children = (
@@ -2680,7 +2708,6 @@
 				388E597225AD9CF10019842D /* json in Resources */,
 				38DF178E27733E6800B3528F /* Assets.xcassets in Resources */,
 				19DA48E829CD339B00EEA1E7 /* Assets.xcassets in Resources */,
-				587EB7B62C4C2EB0009EB23D /* OverrideProfilesConfig in Resources */,
 				388E596F25AD96040019842D /* javascript in Resources */,
 				B9CAAEFC2AE70836000F68BC /* branch.txt in Resources */,
 				1927C8E62744606D00347C69 /* InfoPlist.strings in Resources */,
@@ -2841,6 +2868,7 @@
 				CE94597E29E9E1EE0047C9C6 /* GarminManager.swift in Sources */,
 				3883583425EEB38000E024B2 /* PumpSettings.swift in Sources */,
 				38DAB280260CBB7F00F74C1A /* PumpView.swift in Sources */,
+				DDD1631C2C4C697400CD525A /* AddOverrideForm.swift in Sources */,
 				3811DEB125C9D88300A708ED /* Keychain.swift in Sources */,
 				CE95BF572BA5F5FE00DC3DE3 /* PluginManager.swift in Sources */,
 				382C133725F13A1E00715CE1 /* InsulinSensitivities.swift in Sources */,
@@ -2946,6 +2974,7 @@
 				38D0B3D925EC07C400CB6E88 /* CarbsEntry.swift in Sources */,
 				38A9260525F012D8009E3739 /* CarbRatios.swift in Sources */,
 				38FCF3D625E8FDF40078B0D1 /* MD5.swift in Sources */,
+				DDD163142C4C68D300CD525A /* OverrideProvider.swift in Sources */,
 				3871F39C25ED892B0013ECB5 /* TempTarget.swift in Sources */,
 				191F62682AD6B05A004D7911 /* NightscoutSettings.swift in Sources */,
 				3811DEAB25C9D88300A708ED /* HTTPResponseStatus.swift in Sources */,
@@ -2996,6 +3025,7 @@
 				D6DEC113821A7F1056C4AA1E /* NightscoutConfigDataFlow.swift in Sources */,
 				38E98A3025F52FF700C0CED0 /* Config.swift in Sources */,
 				5825D14C2BD4058F00F36E9B /* TempTargets+CoreDataClass.swift in Sources */,
+				DDD1631A2C4C695E00CD525A /* EditOverrideForm.swift in Sources */,
 				CE1856F72ADC4869007E39C7 /* CarbPresetIntentRequest.swift in Sources */,
 				CE1F6DDB2BAE08B60064EB8D /* TidepoolManager.swift in Sources */,
 				BD2B464E0745FBE7B79913F4 /* NightscoutConfigProvider.swift in Sources */,
@@ -3085,6 +3115,7 @@
 				1967DFBE29D052C200759F30 /* Icons.swift in Sources */,
 				38E8754F275556FA00975559 /* WatchManager.swift in Sources */,
 				A228DF96647338139F152B15 /* PreferencesEditorDataFlow.swift in Sources */,
+				DDD163182C4C694000CD525A /* OverrideRootView.swift in Sources */,
 				389ECE052601144100D86C4F /* ConcurrentMap.swift in Sources */,
 				CE7CA3562A064973004BE681 /* StateIntentRequest.swift in Sources */,
 				E4984C5262A90469788754BB /* PreferencesEditorProvider.swift in Sources */,
@@ -3098,6 +3129,7 @@
 				CE82E02728E869DF00473A9C /* AlertEntry.swift in Sources */,
 				38E4451E274DB04600EC9A94 /* AppDelegate.swift in Sources */,
 				BD2FF1A02AE29D43005D1C5D /* CheckboxToggleStyle.swift in Sources */,
+				DDD163162C4C690300CD525A /* OverrideDataFlow.swift in Sources */,
 				BDF34F932C10D0E100D51995 /* LiveActivityAttributes+Helper.swift in Sources */,
 				E0D4F80527513ECF00BDF1FE /* HealthKitSample.swift in Sources */,
 				38A00B1F25FC00F7006BC0B0 /* Autotune.swift in Sources */,
@@ -3127,6 +3159,7 @@
 				7BCFACB97C821041BA43A114 /* ManualTempBasalRootView.swift in Sources */,
 				38E44534274E411700EC9A94 /* Disk+InternalHelpers.swift in Sources */,
 				38A00B2325FC2B55006BC0B0 /* LRUCache.swift in Sources */,
+				DDD163122C4C689900CD525A /* OverrideStateModel.swift in Sources */,
 				3083261C4B268E353F36CD0B /* AutotuneConfigDataFlow.swift in Sources */,
 				891DECF7BC20968D7F566161 /* AutotuneConfigProvider.swift in Sources */,
 				D76333C9256787610B3B4875 /* AutotuneConfigStateModel.swift in Sources */,
@@ -3153,7 +3186,6 @@
 				19E1F7E829D082D0005C8D20 /* IconConfigDataFlow.swift in Sources */,
 				5A2325522BFCBF55003518CA /* NightscoutUploadView.swift in Sources */,
 				E3A08AAE59538BC8A8ABE477 /* NotificationsConfigDataFlow.swift in Sources */,
-				1956FB212AFF79E200C7B4FF /* CoreDataStorage.swift in Sources */,
 				0F7A65FBD2CD8D6477ED4539 /* NotificationsConfigProvider.swift in Sources */,
 				3171D2818C7C72CD1584BB5E /* NotificationsConfigStateModel.swift in Sources */,
 				CD78BB94E43B249D60CC1A1B /* NotificationsConfigRootView.swift in Sources */,

FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -270,7 +270,6 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
             self.tidepoolService.uploadGlucose(device: self.cgmManager?.cgmManagerStatus.device)
         }
 
-
         let glucoseForHealth = filteredByDate.filter { !glucoseFromHealth.contains($0) }
 
         guard glucoseForHealth.isNotEmpty else {

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -430,7 +430,7 @@ final class OpenAPS {
                 )
 
                 self.storage.save(averages, as: OpenAPS.Monitor.oref2_variables)
-                
+
                 return self.loadFileFromStorage(name: Monitor.oref2_variables)
 
             } else {

FreeAPS/Sources/APS/Storage/CoreDataStorage.swift

@@ -1,34 +0,0 @@
-import CoreData
-import Foundation
-import SwiftDate
-import Swinject
-
-final class CoreDataStorage {
-    let coredataContext = CoreDataStack.shared.persistentContainer.viewContext // newBackgroundContext()
-
-    func fetchGlucose(interval: NSDate) -> [Readings] {
-        var fetchGlucose = [Readings]()
-        coredataContext.performAndWait {
-            let requestReadings = Readings.fetchRequest() as NSFetchRequest<Readings>
-            let sort = NSSortDescriptor(key: "date", ascending: false)
-            requestReadings.sortDescriptors = [sort]
-            requestReadings.predicate = NSPredicate(
-                format: "glucose > 0 AND date > %@", interval
-            )
-            try? fetchGlucose = self.coredataContext.fetch(requestReadings)
-        }
-        return fetchGlucose
-    }
-
-    func fetchLatestOverride() -> [Override] {
-        var overrideArray = [Override]()
-        coredataContext.performAndWait {
-            let requestOverrides = Override.fetchRequest() as NSFetchRequest<Override>
-            let sortOverride = NSSortDescriptor(key: "date", ascending: false)
-            requestOverrides.sortDescriptors = [sortOverride]
-            requestOverrides.fetchLimit = 1
-            try? overrideArray = self.coredataContext.fetch(requestOverrides)
-        }
-        return overrideArray
-    }
-}

FreeAPS/Sources/APS/Storage/PumpHistoryStorage.swift

@@ -410,133 +410,3 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
         }
     }
 }
-
-extension NightscoutTreatment {
-    init?(event: PumpHistoryEvent, tempBasalDuration: PumpHistoryEvent? = nil) {
-        var basalDurationEvent: PumpHistoryEvent?
-        if tempBasalDuration != nil, tempBasalDuration?.timestamp == event.timestamp, event.type == .tempBasal,
-           tempBasalDuration?.type == .tempBasalDuration
-        {
-            basalDurationEvent = tempBasalDuration
-        }
-        switch event.type {
-        case .tempBasal:
-            self.init(
-                duration: basalDurationEvent?.durationMin,
-                rawDuration: basalDurationEvent,
-                rawRate: event,
-                absolute: event.rate,
-                rate: event.rate,
-                eventType: .nsTempBasal,
-                createdAt: event.timestamp,
-                enteredBy: NightscoutTreatment.local,
-                bolus: nil,
-                insulin: nil,
-                notes: nil,
-                carbs: nil,
-                fat: nil,
-                protein: nil,
-                targetTop: nil,
-                targetBottom: nil
-            )
-        case .bolus:
-            let eventType = determineBolusEventType(for: event)
-            self.init(
-                duration: event.duration,
-                rawDuration: nil,
-                rawRate: nil,
-                absolute: nil,
-                rate: nil,
-                eventType: eventType,
-                createdAt: event.timestamp,
-                enteredBy: NightscoutTreatment.local,
-                bolus: event,
-                insulin: event.amount,
-                notes: nil,
-                carbs: nil,
-                fat: nil,
-                protein: nil,
-                targetTop: nil,
-                targetBottom: nil
-            )
-        case .journalCarbs:
-            self.init(
-                duration: nil,
-                rawDuration: nil,
-                rawRate: nil,
-                absolute: nil,
-                rate: nil,
-                eventType: .nsCarbCorrection,
-                createdAt: event.timestamp,
-                enteredBy: NightscoutTreatment.local,
-                bolus: nil,
-                insulin: nil,
-                notes: nil,
-                carbs: Decimal(event.carbInput ?? 0),
-                fat: Decimal(event.fatInput ?? 0),
-                protein: Decimal(event.proteinInput ?? 0),
-                targetTop: nil,
-                targetBottom: nil
-            )
-        case .prime:
-            self.init(
-                duration: event.duration,
-                rawDuration: nil,
-                rawRate: nil,
-                absolute: nil,
-                rate: nil,
-                eventType: .nsSiteChange,
-                createdAt: event.timestamp,
-                enteredBy: NightscoutTreatment.local,
-                bolus: event,
-                insulin: nil,
-                notes: nil,
-                carbs: nil,
-                fat: nil,
-                protein: nil,
-                targetTop: nil,
-                targetBottom: nil
-            )
-        case .rewind:
-            self.init(
-                duration: nil,
-                rawDuration: nil,
-                rawRate: nil,
-                absolute: nil,
-                rate: nil,
-                eventType: .nsInsulinChange,
-                createdAt: event.timestamp,
-                enteredBy: NightscoutTreatment.local,
-                bolus: nil,
-                insulin: nil,
-                notes: nil,
-                carbs: nil,
-                fat: nil,
-                protein: nil,
-                targetTop: nil,
-                targetBottom: nil
-            )
-        case .pumpAlarm:
-            self.init(
-                duration: 30, // minutes
-                rawDuration: nil,
-                rawRate: nil,
-                absolute: nil,
-                rate: nil,
-                eventType: .nsAnnouncement,
-                createdAt: event.timestamp,
-                enteredBy: NightscoutTreatment.local,
-                bolus: nil,
-                insulin: nil,
-                notes: "Alarm \(String(describing: event.note)) \(event.type)",
-                carbs: nil,
-                fat: nil,
-                protein: nil,
-                targetTop: nil,
-                targetBottom: nil
-            )
-        default:
-            return nil
-        }
-    }
-}

FreeAPS/Sources/Models/NightscoutTreatment.swift

@@ -1,14 +1,5 @@
 import Foundation
 
-func determineBolusEventType(for event: PumpHistoryEvent) -> EventType {
-    if event.isExternalInsulin ?? false {
-        return .nsExternalInsulin
-    } else if event.isSMB ?? false {
-        return .smb
-    }
-    return event.type
-}
-
 struct NightscoutTreatment: JSON, Hashable, Equatable {
     var duration: Int?
     var rawDuration: PumpHistoryEvent?

FreeAPS/Sources/Models/PumpHistoryEvent.swift

@@ -77,7 +77,6 @@ enum EventType: String, JSON {
     case nsAnnouncement = "Announcement"
     case nsSensorChange = "Sensor Start"
     case capillaryGlucose = "BG Check"
-    case nsExternalInsulin = "External Insulin"
 }
 
 enum TempType: String, JSON {

FreeAPS/Sources/Models/RawFetchedProfile.swift

@@ -4,16 +4,16 @@ struct FetchedNightscoutProfileStore: JSON {
     let _id: String
     let defaultProfile: String
     let startDate: String
-    //TODO: what is this shit used for?
-//<<<<<<< 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
+    // >>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133
 }
 
 struct FetchedNightscoutProfile: JSON {

FreeAPS/Sources/Modules/AutotuneConfig/AutotuneConfigStateModel.swift

@@ -103,35 +103,5 @@ extension AutotuneConfig {
                 }
             }
         }
-
-        func replace() {
-            if let autotunedBasals = autotune {
-                let basals = autotunedBasals.basalProfile
-                    .map { basal -> BasalProfileEntry in
-                        BasalProfileEntry(
-                            start: String(basal.start.prefix(5)),
-                            minutes: basal.minutes,
-                            rate: basal.rate
-                        )
-                    }
-                guard let pump = apsManager.pumpManager else {
-                    storage.save(basals, as: OpenAPS.Settings.basalProfile)
-                    debug(.service, "Basals have been replaced with Autotuned Basals by user.")
-                    return
-                }
-                let syncValues = basals.map {
-                    RepeatingScheduleValue(startTime: TimeInterval($0.minutes * 60), value: Double($0.rate))
-                }
-                pump.syncBasalRateSchedule(items: syncValues) { result in
-                    switch result {
-                    case .success:
-                        self.storage.save(basals, as: OpenAPS.Settings.basalProfile)
-                        debug(.service, "Basals saved to pump!")
-                    case .failure:
-                        debug(.service, "Basals couldn't be save to pump")
-                    }
-                }
-            }
-        }
     }
 }

FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift

@@ -199,40 +199,6 @@ extension DataTable {
                 }
             }
         }
-
-        func logExternalInsulin() {
-            guard externalInsulinAmount > 0 else {
-                showModal(for: nil)
-                return
-            }
-
-            externalInsulinAmount = min(externalInsulinAmount, maxBolus * 3) // Allow for 3 * Max Bolus for external insulin
-            unlockmanager.unlock()
-                .sink { _ in } receiveValue: { [weak self] _ in
-                    guard let self = self else { return }
-                    pumpHistoryStorage.storeEvents(
-                        [
-                            PumpHistoryEvent(
-                                id: UUID().uuidString,
-                                type: .bolus,
-                                timestamp: externalInsulinDate,
-                                amount: externalInsulinAmount,
-                                duration: nil,
-                                durationMin: nil,
-                                rate: nil,
-                                temp: nil,
-                                carbInput: nil,
-                                isExternalInsulin: true
-                            )
-                        ]
-                    )
-                    debug(.default, "External insulin saved to pumphistory.json")
-
-                    // Reset amount to 0 for next entry
-                    externalInsulinAmount = 0
-                }
-                .store(in: &lifetime)
-        }
     }
 }
 

FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift

@@ -50,13 +50,6 @@ extension DataTable {
             return formatter
         }
 
-        private var insulinFormatter: NumberFormatter {
-            let formatter = NumberFormatter()
-            formatter.numberStyle = .decimal
-            formatter.maximumFractionDigits = 2
-            return formatter
-        }
-
         private var glucoseFormatter: NumberFormatter {
             let formatter = NumberFormatter()
             formatter.numberStyle = .decimal
@@ -185,19 +178,6 @@ extension DataTable {
             default:
                 return .updatingHistory
             }
-            .sheet(isPresented: $showManualGlucose) {
-                logGlucoseView
-            }
-        }
-
-        private var logInsulinButton: some View {
-            Button(action: { showExternalInsulin = true
-                state.externalInsulinDate = Date() }, label: {
-                Text("Log Insulin")
-                    .foregroundColor(Color.accentColor)
-                Image(systemName: "plus")
-                    .foregroundColor(Color.accentColor)
-            }).buttonStyle(.borderless)
         }
 
         private var logGlucoseButton: some View {

FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -104,7 +104,7 @@ extension Home {
             setupOverrides()
             setupOverrideRunStored()
 
-        // TODO: isUploadEnabled the right var here??
+            // TODO: isUploadEnabled the right var here??
             uploadStats = settingsManager.settings.isUploadEnabled
             units = settingsManager.settings.units
             allowManualTemp = !settingsManager.settings.closedLoop

FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift

@@ -181,7 +181,7 @@ struct PumpView: View {
     }
 }
 
-//#Preview("message") {
+// #Preview("message") {
 //    PumpView(
 //        reservoir: .constant(Decimal(10.0)),
 //        battery: .constant(nil),
@@ -190,9 +190,9 @@ struct PumpView: View {
 //        timerDate: .constant(Date()),
 //        pumpStatusHighlightMessage: .constant("⚠️\n Insulin suspended")
 //    )
-//}
+// }
 //
-//#Preview("pump reservoir") {
+// #Preview("pump reservoir") {
 //    PumpView(
 //        reservoir: .constant(Decimal(40.0)),
 //        battery: .constant(Battery(percent: 50, voltage: 2.0, string: BatteryState.normal, display: true)),
@@ -201,9 +201,9 @@ struct PumpView: View {
 //        timerDate: .constant(Date().addingTimeInterval(-24.hours)),
 //        pumpStatusHighlightMessage: .constant(nil)
 //    )
-//}
+// }
 //
-//#Preview("pump expiration") {
+// #Preview("pump expiration") {
 //    PumpView(
 //        reservoir: .constant(Decimal(10.0)),
 //        battery: .constant(Battery(percent: 50, voltage: 2.0, string: BatteryState.normal, display: false)),
@@ -212,9 +212,9 @@ struct PumpView: View {
 //        timerDate: .constant(Date().addingTimeInterval(2.hours)),
 //        pumpStatusHighlightMessage: .constant(nil)
 //    )
-//}
+// }
 //
-//#Preview("no pump") {
+// #Preview("no pump") {
 //    PumpView(
 //        reservoir: .constant(nil),
 //        name: .constant(nil),
@@ -223,4 +223,4 @@ struct PumpView: View {
 //        timeZone: .constant(Date()),
 //        pumpStatusHighlightMessage: .constant(nil)
 //    )
-//}
+// }

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -854,7 +854,7 @@ extension Home {
 
                     Spacer()
 
-                    NavigationStack { OverrideProfilesConfig.RootView(resolver: resolver) }
+                    NavigationStack { OverrideConfig.RootView(resolver: resolver) }
                         .tabItem {
                             Label(
                                 "Adjustments",

FreeAPS/Sources/Modules/NightscoutConfig/View/NightscoutConfigRootView.swift

@@ -102,14 +102,14 @@ extension NightscoutConfig {
                             )
                         }
                 }
-                
+
                 Section {
-                    Button("Backfill glucose") { 
+                    Button("Backfill glucose") {
                         Task {
-                            state.backfillGlucose()
+                            await state.backfillGlucose()
                         }
                     }
-                        .disabled(state.url.isEmpty || state.connecting || state.backfilling)
+                    .disabled(state.url.isEmpty || state.connecting || state.backfilling)
                 } header: { Text("Backfill glucose from Nightscout")
                 }
             }

FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesDataFlow.swift

@@ -1,7 +1,7 @@
 import Foundation
 import SwiftUI
 
-enum OverrideProfilesConfig {
+enum OverrideConfig {
     enum Config {}
 
     enum Tab: String, Hashable, Identifiable, CaseIterable {
@@ -24,4 +24,4 @@ enum OverrideProfilesConfig {
     }
 }
 
-protocol OverrideProfilesProvider: Provider {}
+protocol OverrideProvider: Provider {}

FreeAPS/Sources/Modules/OverrideConfig/OverrideProvider.swift

@@ -0,0 +1,3 @@
+extension OverrideConfig {
+    final class Provider: BaseProvider, OverrideProvider {}
+}

FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesStateModel.swift

@@ -1,7 +1,7 @@
 import CoreData
 import SwiftUI
 
-extension OverrideProfilesConfig {
+extension OverrideConfig {
     final class StateModel: BaseStateModel<Provider> {
         @Injected() var broadcaster: Broadcaster!
         @Injected() var storage: TempTargetsStorage!
@@ -93,7 +93,7 @@ extension OverrideProfilesConfig {
 
 // MARK: - Setup Notifications
 
-extension OverrideProfilesConfig.StateModel {
+extension OverrideConfig.StateModel {
     // Custom Notification to update View when an Override has been cancelled via Home View
     func setupNotification() {
         Foundation.NotificationCenter.default.addObserver(
@@ -430,7 +430,7 @@ extension OverrideProfilesConfig.StateModel {
 
 // MARK: - TEMP TARGET
 
-extension OverrideProfilesConfig.StateModel {
+extension OverrideConfig.StateModel {
     func enact() {
         guard durationTT > 0 else {
             return
@@ -623,7 +623,7 @@ extension OverrideProfilesConfig.StateModel {
     }
 }
 
-extension OverrideProfilesConfig.StateModel: SettingsObserver {
+extension OverrideConfig.StateModel: SettingsObserver {
     func settingsDidChange(_: FreeAPSSettings) {
         units = settingsManager.settings.units
         defaultSmbMinutes = settingsManager.preferences.maxSMBBasalMinutes

FreeAPS/Sources/Modules/OverrideProfilesConfig/View/AddOverrideForm.swift

@@ -3,7 +3,7 @@ import SwiftUI
 
 struct AddOverrideForm: View {
     @Environment(\.presentationMode) var presentationMode
-    @StateObject var state: OverrideProfilesConfig.StateModel
+    @StateObject var state: OverrideConfig.StateModel
     @State private var isEditing = false
     @State private var overrideTarget = false
     @Environment(\.colorScheme) var colorScheme

FreeAPS/Sources/Modules/OverrideProfilesConfig/View/EditOverrideForm.swift

@@ -5,7 +5,7 @@ struct EditOverrideForm: View {
     @ObservedObject var override: OverrideStored
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.colorScheme) var colorScheme
-    @StateObject var state: OverrideProfilesConfig.StateModel
+    @StateObject var state: OverrideConfig.StateModel
 
     @State private var name: String
     @State private var percentage: Double
@@ -28,7 +28,7 @@ struct EditOverrideForm: View {
     @State private var target_override = false
     @State private var showAlert = false
 
-    init(overrideToEdit: OverrideStored, state: OverrideProfilesConfig.StateModel) {
+    init(overrideToEdit: OverrideStored, state: OverrideConfig.StateModel) {
         override = overrideToEdit
         _state = StateObject(wrappedValue: state)
         _name = State(initialValue: overrideToEdit.name ?? "")

FreeAPS/Sources/Modules/OverrideProfilesConfig/View/OverrideProfilesRootView.swift

@@ -2,7 +2,7 @@ import CoreData
 import SwiftUI
 import Swinject
 
-extension OverrideProfilesConfig {
+extension OverrideConfig {
     struct RootView: BaseView {
         let resolver: Resolver
 

FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesProvider.swift

@@ -1,3 +0,0 @@
-extension OverrideProfilesConfig {
-    final class Provider: BaseProvider, OverrideProfilesProvider {}
-}

FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -76,7 +76,7 @@ extension PreferencesEditor {
                     settable: self
                 )
             ]
-            
+
             let smbFields = [
                 Field(
                     displayName: NSLocalizedString("Enable SMB Always", comment: "Enable SMB Always"),

FreeAPS/Sources/Modules/PumpConfig/View/PumpSetupView.swift

@@ -69,16 +69,11 @@ extension PumpConfig {
                 )
             }
 
-            // setupViewController.setupDelegate = setupDelegate
-            // setupViewController.completionDelegate = completionDelegate
-            // return setupViewController
-
             switch setupViewController {
             case var .userInteractionRequired(setupViewControllerUI):
                 setupViewControllerUI.pumpManagerOnboardingDelegate = setupDelegate
                 setupViewControllerUI.completionDelegate = completionDelegate
                 return setupViewControllerUI
-            // show(setupViewController, sender: self)
             case let .createdAndOnboarded(pumpManagerUI):
                 debug(.default, "Pump manager  created and onboarded")
                 setupDelegate?.pumpManagerOnboarding(didCreatePumpManager: pumpManagerUI)

FreeAPS/Sources/Modules/PumpSettingsEditor/View/PumpSettingsEditorRootView.swift

@@ -41,7 +41,7 @@ extension PumpSettingsEditor {
                         Text("Max Bolus")
                         TextFieldWithToolBar(text: $state.maxBolus, placeholder: "U", numberFormatter: formatter)
                     }
-                    //TODO: is max carbs now somewhere else?
+                    // TODO: is max carbs now somewhere else?
 //                    HStack {
 //                        Text("Max Carbs")
 //                        TextFieldWithToolBar(text: $state.maxCarbs, placeholder: "g", numberFormatter: formatter)

FreeAPS/Sources/Modules/Settings/SettingsStateModel.swift

@@ -33,7 +33,6 @@ extension Settings {
 
             branch = BuildDetails.default.branchAndSha
 
-
             copyrightNotice = Bundle.main.infoDictionary?["NSHumanReadableCopyright"] as? String ?? ""
 
             subscribeSetting(\.animatedBackground, on: $animatedBackground) { animatedBackground = $0 }

FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -38,7 +38,7 @@ extension Settings {
                 header: {
                     Text(viewModel.headerText).textCase(nil)
                 }.listRowBackground(Color.chart)
-                
+
                 Section {
                     SettingsRowView(imageName: "chart.xyaxis.line", title: "Statistics", tint: Color.green, spacing: 10)
                         .navigationLink(to: .statistics, from: self)

FreeAPS/Sources/Modules/StatConfig/StatConfigStateModel.swift

@@ -3,7 +3,7 @@ import SwiftUI
 extension StatConfig {
     final class StateModel: BaseStateModel<Provider> {
         @Published var overrideHbA1cUnit = false
-        
+
         @Published var skipBolusScreenAfterCarbs: Bool = false
         @Published var useFPUconversion: Bool = true
         @Published var tins: Bool = false

FreeAPS/Sources/Router/Screen.swift

@@ -27,7 +27,7 @@ enum Screen: Identifiable, Hashable {
     case notificationsConfig
     case fpuConfig
     case iconConfig
-    case overrideProfilesConfig
+    case overrideConfig
     case snooze
     case statistics
     case watch
@@ -92,8 +92,8 @@ extension Screen {
             FPUConfig.RootView(resolver: resolver)
         case .iconConfig:
             IconConfig.RootView(resolver: resolver)
-        case .overrideProfilesConfig:
-            OverrideProfilesConfig.RootView(resolver: resolver)
+        case .overrideConfig:
+            OverrideConfig.RootView(resolver: resolver)
         case .snooze:
             Snooze.RootView(resolver: resolver)
         case .watch:

FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -138,7 +138,6 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
 
     var glucoseManager: FetchGlucoseManager?
     var cgmManager: CGMManagerUI?
-    var cgmType: CGMType = .nightscout
 
     func fetch(_: DispatchTimer?) -> AnyPublisher<[BloodGlucose], Never> {
         Future { promise in

FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -173,10 +173,10 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
                     self.state.bolusRecommended = self.apsManager
                         .roundBolus(amount: max(recommended, 0))
                 }
-            self.state.bolusAfterCarbs = !self.settingsManager.settings.skipBolusScreenAfterCarbs
-            self.state.displayOnWatch = self.settingsManager.settings.displayOnWatch
-            self.state.displayFatAndProteinOnWatch = self.settingsManager.settings.displayFatAndProteinOnWatch
-            self.state.confirmBolusFaster = self.settingsManager.settings.confirmBolusFaster
+                self.state.bolusAfterCarbs = !self.settingsManager.settings.skipBolusScreenAfterCarbs
+                self.state.displayOnWatch = self.settingsManager.settings.displayOnWatch
+                self.state.displayFatAndProteinOnWatch = self.settingsManager.settings.displayFatAndProteinOnWatch
+                self.state.confirmBolusFaster = self.settingsManager.settings.confirmBolusFaster
 
                 self.state.iob = lastDetermination?.iob as? Decimal
                 self.state.cob = lastDetermination?.cob as? Decimal

GlucoseStored+CoreDataProperties.swift

@@ -1,22 +1,17 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension GlucoseStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<GlucoseStored> {
-        return NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
+public extension GlucoseStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<GlucoseStored> {
+        NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var direction: String?
-    @NSManaged public var glucose: Int16
-    @NSManaged public var id: UUID?
-    @NSManaged public var isManual: Bool
-    @NSManaged public var isUploadedToNS: Bool
-
+    @NSManaged var date: Date?
+    @NSManaged var direction: String?
+    @NSManaged var glucose: Int16
+    @NSManaged var id: UUID?
+    @NSManaged var isManual: Bool
+    @NSManaged var isUploadedToNS: Bool
 }
 
-extension GlucoseStored : Identifiable {
-
-}
+extension GlucoseStored: Identifiable {}

ImportError+CoreDataProperties.swift

@@ -1,18 +1,13 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension ImportError {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<ImportError> {
-        return NSFetchRequest<ImportError>(entityName: "ImportError")
+public extension ImportError {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<ImportError> {
+        NSFetchRequest<ImportError>(entityName: "ImportError")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var error: String?
-
+    @NSManaged var date: Date?
+    @NSManaged var error: String?
 }
 
-extension ImportError : Identifiable {
-
-}
+extension ImportError: Identifiable {}

LoopStatRecord+CoreDataProperties.swift

@@ -1,21 +1,16 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension LoopStatRecord {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<LoopStatRecord> {
-        return NSFetchRequest<LoopStatRecord>(entityName: "LoopStatRecord")
+public extension LoopStatRecord {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<LoopStatRecord> {
+        NSFetchRequest<LoopStatRecord>(entityName: "LoopStatRecord")
     }
 
-    @NSManaged public var duration: Double
-    @NSManaged public var end: Date?
-    @NSManaged public var interval: Double
-    @NSManaged public var loopStatus: String?
-    @NSManaged public var start: Date?
-
+    @NSManaged var duration: Double
+    @NSManaged var end: Date?
+    @NSManaged var interval: Double
+    @NSManaged var loopStatus: String?
+    @NSManaged var start: Date?
 }
 
-extension LoopStatRecord : Identifiable {
-
-}
+extension LoopStatRecord: Identifiable {}

MealPresetStored+CoreDataProperties.swift

@@ -1,20 +1,15 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension MealPresetStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<MealPresetStored> {
-        return NSFetchRequest<MealPresetStored>(entityName: "MealPresetStored")
+public extension MealPresetStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<MealPresetStored> {
+        NSFetchRequest<MealPresetStored>(entityName: "MealPresetStored")
     }
 
-    @NSManaged public var carbs: NSDecimalNumber?
-    @NSManaged public var dish: String?
-    @NSManaged public var fat: NSDecimalNumber?
-    @NSManaged public var protein: NSDecimalNumber?
-
+    @NSManaged var carbs: NSDecimalNumber?
+    @NSManaged var dish: String?
+    @NSManaged var fat: NSDecimalNumber?
+    @NSManaged var protein: NSDecimalNumber?
 }
 
-extension MealPresetStored : Identifiable {
-
-}
+extension MealPresetStored: Identifiable {}

OpenAPS_Battery+CoreDataProperties.swift

@@ -1,22 +1,17 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OpenAPS_Battery {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OpenAPS_Battery> {
-        return NSFetchRequest<OpenAPS_Battery>(entityName: "OpenAPS_Battery")
+public extension OpenAPS_Battery {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OpenAPS_Battery> {
+        NSFetchRequest<OpenAPS_Battery>(entityName: "OpenAPS_Battery")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var display: Bool
-    @NSManaged public var id: UUID?
-    @NSManaged public var percent: Int16
-    @NSManaged public var status: String?
-    @NSManaged public var voltage: NSDecimalNumber?
-
+    @NSManaged var date: Date?
+    @NSManaged var display: Bool
+    @NSManaged var id: UUID?
+    @NSManaged var percent: Int16
+    @NSManaged var status: String?
+    @NSManaged var voltage: NSDecimalNumber?
 }
 
-extension OpenAPS_Battery : Identifiable {
-
-}
+extension OpenAPS_Battery: Identifiable {}

OrefDetermination+CoreDataProperties.swift

@@ -1,66 +1,60 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OrefDetermination {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OrefDetermination> {
-        return NSFetchRequest<OrefDetermination>(entityName: "OrefDetermination")
+public extension OrefDetermination {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OrefDetermination> {
+        NSFetchRequest<OrefDetermination>(entityName: "OrefDetermination")
     }
 
-    @NSManaged public var bolus: NSDecimalNumber?
-    @NSManaged public var carbRatio: NSDecimalNumber?
-    @NSManaged public var carbsRequired: Int16
-    @NSManaged public var cob: Int16
-    @NSManaged public var currentTarget: NSDecimalNumber?
-    @NSManaged public var deliverAt: Date?
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var enacted: Bool
-    @NSManaged public var eventualBG: NSDecimalNumber?
-    @NSManaged public var expectedDelta: NSDecimalNumber?
-    @NSManaged public var glucose: NSDecimalNumber?
-    @NSManaged public var id: UUID?
-    @NSManaged public var insulinForManualBolus: NSDecimalNumber?
-    @NSManaged public var insulinReq: NSDecimalNumber?
-    @NSManaged public var insulinSensitivity: NSDecimalNumber?
-    @NSManaged public var iob: NSDecimalNumber?
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var manualBolusErrorString: NSDecimalNumber?
-    @NSManaged public var minDelta: NSDecimalNumber?
-    @NSManaged public var rate: NSDecimalNumber?
-    @NSManaged public var reason: String?
-    @NSManaged public var received: Bool
-    @NSManaged public var reservoir: NSDecimalNumber?
-    @NSManaged public var scheduledBasal: NSDecimalNumber?
-    @NSManaged public var sensitivityRatio: NSDecimalNumber?
-    @NSManaged public var smbToDeliver: NSDecimalNumber?
-    @NSManaged public var temp: String?
-    @NSManaged public var tempBasal: NSDecimalNumber?
-    @NSManaged public var threshold: NSDecimalNumber?
-    @NSManaged public var timestamp: Date?
-    @NSManaged public var timestampEnacted: Date?
-    @NSManaged public var totalDailyDose: NSDecimalNumber?
-    @NSManaged public var forecasts: NSSet?
-
+    @NSManaged var bolus: NSDecimalNumber?
+    @NSManaged var carbRatio: NSDecimalNumber?
+    @NSManaged var carbsRequired: Int16
+    @NSManaged var cob: Int16
+    @NSManaged var currentTarget: NSDecimalNumber?
+    @NSManaged var deliverAt: Date?
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var enacted: Bool
+    @NSManaged var eventualBG: NSDecimalNumber?
+    @NSManaged var expectedDelta: NSDecimalNumber?
+    @NSManaged var glucose: NSDecimalNumber?
+    @NSManaged var id: UUID?
+    @NSManaged var insulinForManualBolus: NSDecimalNumber?
+    @NSManaged var insulinReq: NSDecimalNumber?
+    @NSManaged var insulinSensitivity: NSDecimalNumber?
+    @NSManaged var iob: NSDecimalNumber?
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var manualBolusErrorString: NSDecimalNumber?
+    @NSManaged var minDelta: NSDecimalNumber?
+    @NSManaged var rate: NSDecimalNumber?
+    @NSManaged var reason: String?
+    @NSManaged var received: Bool
+    @NSManaged var reservoir: NSDecimalNumber?
+    @NSManaged var scheduledBasal: NSDecimalNumber?
+    @NSManaged var sensitivityRatio: NSDecimalNumber?
+    @NSManaged var smbToDeliver: NSDecimalNumber?
+    @NSManaged var temp: String?
+    @NSManaged var tempBasal: NSDecimalNumber?
+    @NSManaged var threshold: NSDecimalNumber?
+    @NSManaged var timestamp: Date?
+    @NSManaged var timestampEnacted: Date?
+    @NSManaged var totalDailyDose: NSDecimalNumber?
+    @NSManaged var forecasts: NSSet?
 }
 
 // MARK: Generated accessors for forecasts
-extension OrefDetermination {
 
+public extension OrefDetermination {
     @objc(addForecastsObject:)
-    @NSManaged public func addToForecasts(_ value: Forecast)
+    @NSManaged func addToForecasts(_ value: Forecast)
 
     @objc(removeForecastsObject:)
-    @NSManaged public func removeFromForecasts(_ value: Forecast)
+    @NSManaged func removeFromForecasts(_ value: Forecast)
 
     @objc(addForecasts:)
-    @NSManaged public func addToForecasts(_ values: NSSet)
+    @NSManaged func addToForecasts(_ values: NSSet)
 
     @objc(removeForecasts:)
-    @NSManaged public func removeFromForecasts(_ values: NSSet)
-
+    @NSManaged func removeFromForecasts(_ values: NSSet)
 }
 
-extension OrefDetermination : Identifiable {
-
-}
+extension OrefDetermination: Identifiable {}

OverrideRunStored+CoreDataProperties.swift

@@ -1,23 +1,18 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OverrideRunStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OverrideRunStored> {
-        return NSFetchRequest<OverrideRunStored>(entityName: "OverrideRunStored")
+public extension OverrideRunStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OverrideRunStored> {
+        NSFetchRequest<OverrideRunStored>(entityName: "OverrideRunStored")
     }
 
-    @NSManaged public var endDate: Date?
-    @NSManaged public var id: UUID?
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var name: String?
-    @NSManaged public var startDate: Date?
-    @NSManaged public var target: NSDecimalNumber?
-    @NSManaged public var override: OverrideStored?
-
+    @NSManaged var endDate: Date?
+    @NSManaged var id: UUID?
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var name: String?
+    @NSManaged var startDate: Date?
+    @NSManaged var target: NSDecimalNumber?
+    @NSManaged var override: OverrideStored?
 }
 
-extension OverrideRunStored : Identifiable {
-
-}
+extension OverrideRunStored: Identifiable {}

OverrideStored+CoreDataProperties.swift

@@ -1,38 +1,33 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OverrideStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OverrideStored> {
-        return NSFetchRequest<OverrideStored>(entityName: "OverrideStored")
+public extension OverrideStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OverrideStored> {
+        NSFetchRequest<OverrideStored>(entityName: "OverrideStored")
     }
 
-    @NSManaged public var advancedSettings: Bool
-    @NSManaged public var cr: Bool
-    @NSManaged public var date: Date?
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var enabled: Bool
-    @NSManaged public var end: NSDecimalNumber?
-    @NSManaged public var id: String?
-    @NSManaged public var indefinite: Bool
-    @NSManaged public var isf: Bool
-    @NSManaged public var isfAndCr: Bool
-    @NSManaged public var isPreset: Bool
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var name: String?
-    @NSManaged public var orderPosition: Int16
-    @NSManaged public var percentage: Double
-    @NSManaged public var smbIsAlwaysOff: Bool
-    @NSManaged public var smbIsOff: Bool
-    @NSManaged public var smbMinutes: NSDecimalNumber?
-    @NSManaged public var start: NSDecimalNumber?
-    @NSManaged public var target: NSDecimalNumber?
-    @NSManaged public var uamMinutes: NSDecimalNumber?
-    @NSManaged public var overrideRun: OverrideRunStored?
-
+    @NSManaged var advancedSettings: Bool
+    @NSManaged var cr: Bool
+    @NSManaged var date: Date?
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var enabled: Bool
+    @NSManaged var end: NSDecimalNumber?
+    @NSManaged var id: String?
+    @NSManaged var indefinite: Bool
+    @NSManaged var isf: Bool
+    @NSManaged var isfAndCr: Bool
+    @NSManaged var isPreset: Bool
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var name: String?
+    @NSManaged var orderPosition: Int16
+    @NSManaged var percentage: Double
+    @NSManaged var smbIsAlwaysOff: Bool
+    @NSManaged var smbIsOff: Bool
+    @NSManaged var smbMinutes: NSDecimalNumber?
+    @NSManaged var start: NSDecimalNumber?
+    @NSManaged var target: NSDecimalNumber?
+    @NSManaged var uamMinutes: NSDecimalNumber?
+    @NSManaged var overrideRun: OverrideRunStored?
 }
 
-extension OverrideStored : Identifiable {
-
-}
+extension OverrideStored: Identifiable {}

PumpEventStored+CoreDataProperties.swift

@@ -1,23 +1,18 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension PumpEventStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<PumpEventStored> {
-        return NSFetchRequest<PumpEventStored>(entityName: "PumpEventStored")
+public extension PumpEventStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<PumpEventStored> {
+        NSFetchRequest<PumpEventStored>(entityName: "PumpEventStored")
     }
 
-    @NSManaged public var id: String?
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var note: String?
-    @NSManaged public var timestamp: Date?
-    @NSManaged public var type: String?
-    @NSManaged public var bolus: BolusStored?
-    @NSManaged public var tempBasal: TempBasalStored?
-
+    @NSManaged var id: String?
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var note: String?
+    @NSManaged var timestamp: Date?
+    @NSManaged var type: String?
+    @NSManaged var bolus: BolusStored?
+    @NSManaged var tempBasal: TempBasalStored?
 }
 
-extension PumpEventStored : Identifiable {
-
-}
+extension PumpEventStored: Identifiable {}

StatsData+CoreDataProperties.swift

@@ -1,17 +1,12 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension StatsData {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<StatsData> {
-        return NSFetchRequest<StatsData>(entityName: "StatsData")
+public extension StatsData {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<StatsData> {
+        NSFetchRequest<StatsData>(entityName: "StatsData")
     }
 
-    @NSManaged public var lastrun: Date?
-
+    @NSManaged var lastrun: Date?
 }
 
-extension StatsData : Identifiable {
-
-}
+extension StatsData: Identifiable {}

TempBasalStored+CoreDataProperties.swift

@@ -1,20 +1,15 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension TempBasalStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempBasalStored> {
-        return NSFetchRequest<TempBasalStored>(entityName: "TempBasalStored")
+public extension TempBasalStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<TempBasalStored> {
+        NSFetchRequest<TempBasalStored>(entityName: "TempBasalStored")
     }
 
-    @NSManaged public var duration: Int16
-    @NSManaged public var rate: NSDecimalNumber?
-    @NSManaged public var tempType: String?
-    @NSManaged public var pumpEvent: PumpEventStored?
-
+    @NSManaged var duration: Int16
+    @NSManaged var rate: NSDecimalNumber?
+    @NSManaged var tempType: String?
+    @NSManaged var pumpEvent: PumpEventStored?
 }
 
-extension TempBasalStored : Identifiable {
-
-}
+extension TempBasalStored: Identifiable {}

TempTargets+CoreDataProperties.swift

@@ -1,22 +1,17 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension TempTargets {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempTargets> {
-        return NSFetchRequest<TempTargets>(entityName: "TempTargets")
+public extension TempTargets {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<TempTargets> {
+        NSFetchRequest<TempTargets>(entityName: "TempTargets")
     }
 
-    @NSManaged public var active: Bool
-    @NSManaged public var date: Date?
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var hbt: Double
-    @NSManaged public var id: String?
-    @NSManaged public var startDate: Date?
-
+    @NSManaged var active: Bool
+    @NSManaged var date: Date?
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var hbt: Double
+    @NSManaged var id: String?
+    @NSManaged var startDate: Date?
 }
 
-extension TempTargets : Identifiable {
-
-}
+extension TempTargets: Identifiable {}

TempTargetsSlider+CoreDataProperties.swift

@@ -1,23 +1,18 @@
-import Foundation
 import CoreData
+import Foundation
 
-
-extension TempTargetsSlider {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempTargetsSlider> {
-        return NSFetchRequest<TempTargetsSlider>(entityName: "TempTargetsSlider")
+public extension TempTargetsSlider {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<TempTargetsSlider> {
+        NSFetchRequest<TempTargetsSlider>(entityName: "TempTargetsSlider")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var defaultHBT: Double
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var enabled: Bool
-    @NSManaged public var hbt: Double
-    @NSManaged public var id: String?
-    @NSManaged public var isPreset: Bool
-
+    @NSManaged var date: Date?
+    @NSManaged var defaultHBT: Double
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var enabled: Bool
+    @NSManaged var hbt: Double
+    @NSManaged var id: String?
+    @NSManaged var isPreset: Bool
 }
 
-extension TempTargetsSlider : Identifiable {
-
-}
+extension TempTargetsSlider: Identifiable {}