Sync upstream Trio dev (23bb3be36, 1.0.2.59) into Tai dev

.gitmodules

@@ -1,54 +1,64 @@
 [submodule "LoopKit"]
 	path = LoopKit
 	url = https://github.com/loopandlearn/LoopKit.git
+	branch = trio-next-dev
 [submodule "CGMBLEKit"]
 	path = CGMBLEKit
 	url = https://github.com/loopandlearn/CGMBLEKit.git
+	branch = trio-next-dev
 [submodule "dexcom-share-client-swift"]
 	path = dexcom-share-client-swift
 	url = https://github.com/loopandlearn/dexcom-share-client-swift.git
+	branch = next-dev
 [submodule "RileyLinkKit"]
 	path = RileyLinkKit
 	url = https://github.com/loopandlearn/RileyLinkKit
+	branch = trio-next-dev
 [submodule "G7SensorKit"]
 	path = G7SensorKit
 	url = https://github.com/loopandlearn/G7SensorKit.git
-	branch = feat/trio-g7-direct
+	branch = trio-next-dev
 [submodule "MinimedKit"]
 	path = MinimedKit
 	url = https://github.com/loopandlearn/MinimedKit.git
+	branch = trio-next-dev
 [submodule "LibreTransmitter"]
 	path = LibreTransmitter
 	url = https://github.com/loopandlearn/LibreTransmitter.git
+	branch = trio-next-dev
 [submodule "TidepoolService"]
 	path = TidepoolService
 	url = https://github.com/loopandlearn/TidepoolService.git
+	branch = trio-next-dev
 [submodule "DanaKit"]
 	path = DanaKit
 	url = https://github.com/loopandlearn/DanaKit
+	branch = trio-next-dev
 [submodule "MedtrumKit"]
 	path = MedtrumKit
 	url = https://github.com/loopandlearn/MedtrumKit
+	branch = trio-next-dev
 [submodule "OmnipodKit"]
 	path = OmnipodKit
 	url = https://github.com/loopandlearn/OmnipodKit
+	branch = next-dev
 [submodule "AccuChekKit"]
 	path = AccuChekKit
 	url = https://github.com/loopandlearn/AccuChekKit
+	branch = trio-next-dev
 [submodule "EversenseKit"]
 	path = EversenseKit
 	url = https://github.com/loopandlearn/EversenseKit
+	branch = trio-next-dev
 [submodule "RoundWhiteDiscKit"]
 	path = RoundWhiteDiscKit
 	url = https://github.com/loopandlearn/RoundWhiteDiscKit.git
 	branch = main
 [submodule "LibreLoop"]
 	path = LibreLoop
 	url = https://github.com/loopandlearn/LibreLoop.git
-	branch = legacy-loopkit-compat
-[submodule "LoopAlgorithm"]
-	path = LoopAlgorithm
-	url = https://github.com/loopandlearn/LoopAlgorithm.git
+	branch = trio-next-dev
 [submodule "SyaiKit"]
 	path = SyaiKit
 	url = https://github.com/nightscout/SyaiKit
+	branch = trio-next-dev

Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 1.0.2
-APP_DEV_VERSION = 1.0.2.42
+APP_DEV_VERSION = 1.0.2.59
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE = autoISF 3.01
 

LiveActivity/LiveActivity+Helper.swift

@@ -38,10 +38,6 @@ extension Int {
     var asMmolL: Decimal {
         rounded(Decimal(self) * GlucoseUnits.exchangeRate, scale: 1, roundingMode: .plain)
     }
-
-    var formattedAsMmolL: String {
-        NumberFormatter.glucoseFormatter.string(from: asMmolL as NSDecimalNumber) ?? "\(asMmolL)"
-    }
 }
 
 extension Decimal {
@@ -52,21 +48,6 @@ extension Decimal {
     var asMgdL: Decimal {
         rounded(self / GlucoseUnits.exchangeRate, scale: 0, roundingMode: .plain)
     }
-
-    var formattedAsMmolL: String {
-        NumberFormatter.glucoseFormatter.string(from: asMmolL as NSDecimalNumber) ?? "\(asMmolL)"
-    }
-}
-
-extension NumberFormatter {
-    static let glucoseFormatter: NumberFormatter = {
-        let formatter = NumberFormatter()
-        formatter.locale = Locale.current
-        formatter.numberStyle = .decimal
-        formatter.minimumFractionDigits = 1
-        formatter.maximumFractionDigits = 1
-        return formatter
-    }()
 }
 
 extension LiveActivityAttributes.ContentState {

Model/Classes+Properties/PumpStatusStored+CoreDataClass.swift

@@ -0,0 +1,4 @@
+import CoreData
+import Foundation
+
+@objc(PumpStatusStored) public class PumpStatusStored: NSManagedObject {}

Model/Classes+Properties/PumpStatusStored+CoreDataProperties.swift

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

Model/Helper/PumpStatusStored+helper.swift

@@ -0,0 +1,32 @@
+import CoreData
+import Foundation
+
+extension PumpStatusStored {
+    /// Basal delivery as the pump manager reports it. Temp basals and their transitions count as active.
+    enum DeliveryState: String {
+        case active
+        /// Delivery active since `.distantPast`, which Omnipod reports while no pod is active.
+        case inactive
+        case suspending
+        case suspended
+        case resuming
+        /// No basal delivery state, or no pump.
+        case unknown
+    }
+
+    static func fetchLast() -> NSFetchRequest<PumpStatusStored> {
+        let request = PumpStatusStored.fetchRequest()
+        request.sortDescriptors = [NSSortDescriptor(keyPath: \PumpStatusStored.date, ascending: false)]
+        request.fetchLimit = 1
+        return request
+    }
+
+    var deliveryState: DeliveryState {
+        basalDeliveryState.flatMap(DeliveryState.init(rawValue:)) ?? .unknown
+    }
+
+    /// Without a pump manager nothing is bolusing, and the timestamp is when the stored state began.
+    var pumpStatus: PumpStatus {
+        PumpStatus(deliveryState: deliveryState, bolusing: false, timestamp: date)
+    }
+}

Model/TrioCoreDataPersistentContainer.xcdatamodeld/TrioCoreDataPersistentContainer.xcdatamodel/contents

@@ -328,6 +328,13 @@
             </uniquenessConstraint>
         </uniquenessConstraints>
     </entity>
+    <entity name="PumpStatusStored" representedClassName="PumpStatusStored" syncable="YES">
+        <attribute name="basalDeliveryState" optional="YES" attributeType="String"/>
+        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+        <fetchIndex name="byDate">
+            <fetchIndexElement property="date" type="Binary" order="descending"/>
+        </fetchIndex>
+    </entity>
     <entity name="StatsData" representedClassName="StatsData" syncable="YES">
         <attribute name="lastrun" attributeType="Date" defaultDateTimeInterval="704497620" usesScalarValueType="NO"/>
     </entity>