Add 'Smoothing: On' tag to loop status HUD

BolusStored+CoreDataProperties.swift

@@ -1,28 +1,15 @@
-//
-//  BolusStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,33 +1,20 @@
-//
-//  CarbEntryStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,46 +1,32 @@
-//
-//  Forecast+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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: Set<ForecastValue>?
-    @NSManaged public var orefDetermination: OrefDetermination?
-
+    @NSManaged var date: Date?
+    @NSManaged var id: UUID?
+    @NSManaged var type: String?
+    @NSManaged var forecastValues: Set<ForecastValue>?
+    @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,27 +1,14 @@
-//
-//  ForecastValue+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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/Sources/Modules/Home/View/HomeRootView.swift

@@ -957,8 +957,12 @@ extension Home {
                         Text("Invalid CGM reading (HIGH).").font(.callout).bold().foregroundColor(.loopRed).padding(.top, 8)
                         Text("SMBs and High Temps Disabled.").font(.caption).foregroundColor(.white).padding(.bottom, 4)
                     } else {
-                        TagCloudView(tags: determination.reasonParts, shouldParseToMmolL: state.units == .mmolL)
-                            .animation(.none, value: false)
+                        var tags = !state.smooth ? determination.reasonParts : determination.reasonParts + ["Smoothing: On"]
+                        TagCloudView(
+                            tags: tags,
+                            shouldParseToMmolL: state.units == .mmolL
+                        )
+                        .animation(.none, value: false)
 
                         Text(
                             self

FreeAPS/Sources/Views/TagCloudView.swift

@@ -71,6 +71,8 @@ struct TagCloudView: View {
                 return .red
             case textTag where textTag.contains("SMB Ratio"):
                 return .orange
+            case textTag where textTag.contains("Smoothing: On"):
+                return .white
             default:
                 return .insulin
             }
@@ -84,7 +86,7 @@ struct TagCloudView: View {
                 .padding(.horizontal, 4)
                 .font(.subheadline)
                 .background(colorOfTag.opacity(0.8))
-                .foregroundColor(Color.white)
+                .foregroundColor(textTag.contains("Smoothing: On") ? Color.black : Color.white)
                 .cornerRadius(2)
         }
     }
@@ -189,7 +191,10 @@ struct TestTagCloudView: View {
             Text("Some other text")
             Divider()
             Text("Some other cloud")
-            TagCloudView(tags: ["Apple", "Google", "Amazon", "Microsoft", "Oracle", "Facebook"], shouldParseToMmolL: false)
+            TagCloudView(
+                tags: ["Apple", "Google", "Amazon", "Microsoft", "Oracle", "Facebook"],
+                shouldParseToMmolL: false
+            )
         }
     }
 }

GlucoseStored+CoreDataProperties.swift

@@ -1,30 +1,17 @@
-//
-//  GlucoseStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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 {}

LoopStatRecord+CoreDataProperties.swift

@@ -1,29 +1,16 @@
-//
-//  LoopStatRecord+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,28 +1,15 @@
-//
-//  MealPresetStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,30 +1,17 @@
-//
-//  OpenAPS_Battery+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,74 +1,60 @@
-//
-//  OrefDetermination+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,31 +1,18 @@
-//
-//  OverrideRunStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,46 +1,33 @@
-//
-//  OverrideStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,31 +1,18 @@
-//
-//  PumpEventStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,25 +1,12 @@
-//
-//  StatsData+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,28 +1,15 @@
-//
-//  TempBasalStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,30 +1,17 @@
-//
-//  TempTargets+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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,31 +1,18 @@
-//
-//  TempTargetsSlider+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 08.09.24.
-//
-//
-
-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 {}

Trio.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "cef813f4bbb01679d4ac9bf4a9f82c1a0a61e44dc839643e81aa92e4d00642bc",
+  "originHash" : "f5c836c216c4ca7d356e3777e58d6d4f9502b03f3974891349eb775f4c4cf750",
   "pins" : [
     {
       "identity" : "cryptoswift",
@@ -11,6 +11,15 @@
       }
     },
     {
+      "identity" : "mkringprogressview",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/maxkonovalov/MKRingProgressView.git",
+      "state" : {
+        "branch" : "master",
+        "revision" : "660888aab1d2ab0ed7eb9eb53caec12af4955fa7"
+      }
+    },
+    {
       "identity" : "slidebutton",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/no-comment/SlideButton",
@@ -20,15 +29,60 @@
       }
     },
     {
+      "identity" : "swift-algorithms",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-algorithms",
+      "state" : {
+        "revision" : "2327673b0e9c7e90e6b1826376526ec3627210e4",
+        "version" : "0.2.1"
+      }
+    },
+    {
+      "identity" : "swift-numerics",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-numerics",
+      "state" : {
+        "revision" : "6583ac70c326c3ee080c1d42d9ca3361dca816cd",
+        "version" : "0.1.0"
+      }
+    },
+    {
       "identity" : "swiftcharts",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/ivanschuetz/SwiftCharts",
+      "location" : "https://github.com/ivanschuetz/SwiftCharts.git",
       "state" : {
         "branch" : "master",
         "revision" : "c354c1945bb35a1f01b665b22474f6db28cba4a2"
       }
     },
     {
+      "identity" : "swiftdate",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/malcommac/SwiftDate",
+      "state" : {
+        "revision" : "6190d0cefff3013e77ed567e6b074f324e5c5bf5",
+        "version" : "6.3.1"
+      }
+    },
+    {
+      "identity" : "swiftmessages",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SwiftKickMobile/SwiftMessages",
+      "state" : {
+        "revision" : "62e12e138fc3eedf88c7553dd5d98712aa119f40",
+        "version" : "9.0.9"
+      }
+    },
+    {
+      "identity" : "swinject",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Swinject/Swinject",
+      "state" : {
+        "revision" : "be9dbcc7b86811bc131539a20c6f9c2d3e56919f",
+        "version" : "2.9.1"
+      }
+    },
+    {
       "identity" : "tidepoolkit",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tidepool-org/TidepoolKit",