Merge branch 'dev' into cameron/LOOP-5259-homescreen-charts-update

Author: Camji55

LoopKit.xcodeproj/project.pbxproj

@@ -670,6 +670,7 @@
 		B4C004D12416961300B40429 /* GuidePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4C004B3241085DB00B40429 /* GuidePage.swift */; };
 		B4C004D22416961300B40429 /* GuideNavigationButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4C004B4241085DC00B40429 /* GuideNavigationButton.swift */; };
 		B4C004D32416961300B40429 /* ActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4C004B2241085DB00B40429 /* ActionButton.swift */; };
+		B4CA4D3D2D79B252005F8FF3 /* BasalDisplayState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CA4D3C2D79B252005F8FF3 /* BasalDisplayState.swift */; };
 		B4CEE2A5256E912A0093111B /* DoseProgressTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CEE2A4256E91290093111B /* DoseProgressTests.swift */; };
 		B4CEE2E3257129780093111B /* UnfinalizedDoseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CEE2E2257129780093111B /* UnfinalizedDoseTests.swift */; };
 		B4CEE2E5257129780093111B /* MockKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89D2047221CC7BD7001238CC /* MockKit.framework */; };
@@ -1607,6 +1608,7 @@
 		B4C004B2241085DB00B40429 /* ActionButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionButton.swift; sourceTree = "<group>"; };
 		B4C004B3241085DB00B40429 /* GuidePage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GuidePage.swift; sourceTree = "<group>"; };
 		B4C004B4241085DC00B40429 /* GuideNavigationButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GuideNavigationButton.swift; sourceTree = "<group>"; };
+		B4CA4D3C2D79B252005F8FF3 /* BasalDisplayState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasalDisplayState.swift; sourceTree = "<group>"; };
 		B4CEE2A4256E91290093111B /* DoseProgressTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoseProgressTests.swift; sourceTree = "<group>"; };
 		B4CEE2E0257129780093111B /* MockKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MockKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B4CEE2E2257129780093111B /* UnfinalizedDoseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnfinalizedDoseTests.swift; sourceTree = "<group>"; };
@@ -3161,6 +3163,7 @@
 		E9086B4624B5404D0062F5C8 /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				B4CA4D3C2D79B252005F8FF3 /* BasalDisplayState.swift */,
 				14C9706F2C5A8E1500E8A01B /* ChartAxisValueDoubleCarbEntry.swift */,
 				A9D3FF0F2A6C19CA000C891D /* ChartAxisValueDoubleLog.swift */,
 				E9086B4724B5405E0062F5C8 /* ChartAxisValueDoubleUnit.swift */,
@@ -3879,6 +3882,7 @@
 				E949E38F24B3711E00024DA0 /* InsulinModelInformationView.swift in Sources */,
 				895FE08B22011F0C00FCF18A /* EmojiInputHeaderView.swift in Sources */,
 				895FE08322011F0C00FCF18A /* OverrideSelectionFooterView.swift in Sources */,
+				B4CA4D3D2D79B252005F8FF3 /* BasalDisplayState.swift in Sources */,
 				89AF78C22447E353002B4FCC /* Splat.swift in Sources */,
 				893C9F8C2447DBD900CD4185 /* CardBuilder.swift in Sources */,
 				B4D4C20D25F95A8700DA809D /* DisplayGlucosePreference.swift in Sources */,

LoopKit/DailyValueSchedule.swift

@@ -71,8 +71,14 @@ public protocol DailySchedule {
 
 
 public extension DailySchedule {
+    func scheduleSegment(at time: Date) -> AbsoluteScheduleValue<T> {
+        return between(start: time, end: time).first!
+    }
     func value(at time: Date) -> T {
-        return between(start: time, end: time).first!.value
+        return scheduleSegment(at: time).value
+    }
+    func startDate(at time: Date) -> Date {
+        return scheduleSegment(at: time).startDate
     }
 }
 

LoopKitUI/Models/BasalDisplayState.swift

@@ -0,0 +1,25 @@
+//
+//  BasalDisplayState.swift
+//  LoopKit
+//
+//  Created by Nathaniel Hamming on 2025-03-06.
+//  Copyright © 2025 LoopKit Authors. All rights reserved.
+//
+
+public enum BasalDisplayState: Equatable {
+    case basalTempManual(Double)
+    case basalScheduled
+    case basalTempAutoAbove
+    case basalTempAutoBelow
+    case basalTempAutoNoDelivery
+    
+    public var imageName: String? {
+        switch self {
+        case .basalScheduled: return "arrow.right.square.fill"
+        case .basalTempAutoAbove: return "arrow.up.square.fill"
+        case .basalTempAutoBelow, .basalTempAutoNoDelivery: return "arrow.down.square.fill"
+        default:
+            return nil
+        }
+    }
+}

LoopKitUI/Views/Information Screens/BasalRatesInformationView.swift

@@ -37,7 +37,7 @@ public struct BasalRatesInformationView: View {
             Text(LocalizedString("Your Basal Rate of insulin is the number of units per hour that you want to use to cover your background insulin needs.", comment: "Information about basal rates"))
             Text(String(format: LocalizedString("%1$@ supports 1 to %2$@ rates per day.", comment: "Information about max number of basal rates (1: app name) (2: maximum schedule entry count)"), appName, String(describing: maximumScheduleEntryCount)))
             Text(LocalizedString("The schedule starts at midnight and cannot equal 0 U/day.", comment: "Information about basal rate scheduling"))
-        }
+        }.accessibilityIdentifier("text_BasalRatesInformation")
     }
 }
 

LoopKitUI/Views/Information Screens/DeliveryLimitsInformationView.swift

@@ -50,7 +50,7 @@ public struct DeliveryLimitsInformationView: View {
                 Text(LocalizedString("Some users choose a value 2, 3, or 4 times their highest scheduled basal rate.", comment: "Information about typical maximum basal rates"))
                 Text(LocalizedString("Work with your healthcare provider to choose a value that is higher than your highest scheduled basal rate, but as conservative or aggressive as you feel comfortable.", comment: "Disclaimer"))
             }
-        }
+        }.accessibilityIdentifier("text_MaximumBasalRateInformation")
     }
 
     private var maxBolusDescription: some View {
@@ -60,7 +60,7 @@ public struct DeliveryLimitsInformationView: View {
             VStack(alignment: .leading, spacing: 20) {
                     Text(String(format: LocalizedString("Maximum Bolus is the highest bolus amount that you will allow %1$@ to recommend at one time to cover carbs or bring down high glucose.", comment: "Information about maximum bolus (1: app name)"), appName))
             }
-        }
+        }.accessibilityIdentifier("text_MaximumBolusInformation")
     }
 }
 

LoopKitUI/Views/Information Screens/InsulinModelInformationView.swift

@@ -28,7 +28,7 @@ public struct InsulinModelInformationView: View {
                 VStack (alignment: .leading, spacing: 20) {
                     diaInfo
                     modelPeakInfo
-                }
+                }.accessibilityIdentifier("text_InsulinModelInformation")
             },
             onExit: onExit ?? { self.presentationMode.wrappedValue.dismiss() },
             mode: mode

LoopKitUI/Views/Information Screens/InsulinSensitivityInformationView.swift

@@ -38,6 +38,7 @@ public struct InsulinSensitivityInformationView: View {
             Text(LocalizedString("You can add different insulin sensitivities for different times of day by using the ➕.", comment: "Description of how to add a ratio"))
         }
         .accentColor(.secondary)
+        .accessibilityIdentifier("text_InsulinSensitivitiesInformation")
     }
 }
 

LoopKitUI/Views/Settings Editors/DeliveryLimitsEditor.swift

@@ -189,7 +189,7 @@ public struct DeliveryLimitsEditor: View {
                     }
                 ),
                 leadingValueContent: {
-                    Text(DeliveryLimits.Setting.maximumBasalRate.title)
+                    Text(DeliveryLimits.Setting.maximumBasalRate.title).accessibilityIdentifier("text_MaximumBasalRateLimit")
                 },
                 trailingValueContent: {
                     GuardrailConstrainedQuantityView(
@@ -239,7 +239,7 @@ public struct DeliveryLimitsEditor: View {
                     }
                 ),
                 leadingValueContent: {
-                    Text(DeliveryLimits.Setting.maximumBolus.title)
+                    Text(DeliveryLimits.Setting.maximumBolus.title).accessibilityIdentifier("text_MaximumBolusLimit")
                 },
                 trailingValueContent: {
                     GuardrailConstrainedQuantityView(

LoopKitUI/Views/Settings Editors/InsulinModelSelection.swift

@@ -160,6 +160,7 @@ public struct InsulinModelSelection: View {
                     )
                     .padding(.vertical, 4)
                     .contentShape(Rectangle())
+                    .accessibilityIdentifier("item_RapidActingAdults")
                 }
 
                 SectionDivider()
@@ -170,6 +171,7 @@ public struct InsulinModelSelection: View {
                 )
                 .padding(.vertical, 4)
                 .padding(.bottom, 4)
+                .accessibilityIdentifier("item_RapidActingChildren")
             }
             .buttonStyle(PlainButtonStyle()) // Disable row highlighting on selection
         }

LoopKitUI/Views/Settings Editors/TherapySettingsView.swift

@@ -363,6 +363,7 @@ extension TherapySettingsView {
                             .font(.body)
                             .padding(.top, 5)
                             .fixedSize(horizontal: false, vertical: true)
+                            .accessibilityIdentifier("text_InsulinModelTitle")
                         Text(insulinModelPreset.subtitle)
                             .font(.footnote)
                             .foregroundColor(.secondary)

MockKit/UnfinalizedDose.swift

@@ -37,7 +37,7 @@ public struct UnfinalizedDose: RawRepresentable, Equatable, CustomStringConverti
     public var units: Double
     var scheduledUnits: Double?     // Tracks the scheduled units, as boluses may be canceled before finishing, at which point units would reflect actual delivered volume.
     var scheduledTempRate: Double?  // Tracks the original temp rate, as during finalization the units are discretized to pump pulses, changing the actual rate
-    let startTime: Date
+    public let startTime: Date
     var duration: TimeInterval
     let insulinType: InsulinType?
     let automatic: Bool?

MockKitUI/ViewModel/MockPumpManagerSettingsViewModel.swift

@@ -8,6 +8,7 @@
 
 import SwiftUI
 import LoopKit
+import LoopKitUI
 import MockKit
 
 class MockPumpManagerSettingsViewModel: ObservableObject {
@@ -75,6 +76,24 @@ class MockPumpManagerSettingsViewModel: ObservableObject {
     }
 
     @Published private(set) var basalDeliveryRate: Double?
+    
+    @Published private(set) var basalDeliveryRateDate: Date?
+    var basalDeliveryRateDateString: String? {
+        guard let basalDeliveryRateDate else { return nil }
+        return Self.shortTimeFormatter.string(from: basalDeliveryRateDate)
+    }
+    
+    @Published private(set) var basalDisplayState: BasalDisplayState
+    var basalDisplayStateString: String {
+        switch basalDisplayState {
+        case .basalScheduled:
+            return LocalizedString("Scheduled\nbasal", comment: "Label for scheduled basal")
+        case .basalTempAutoAbove:
+            return LocalizedString("More than\nscheduled", comment: "Label for when temp basal is above the scheduled basal")
+        default:
+            return LocalizedString("Less than\nscheduled", comment: "Label for when temp basal is below the scheduled basal")
+        }
+    }
 
     @Published private(set) var presentDeliveryWarning: Bool?
 
@@ -99,9 +118,12 @@ class MockPumpManagerSettingsViewModel: ObservableObject {
     init(pumpManager: MockPumpManager) {
         self.pumpManager = pumpManager
 
+        let now = Date()
         isDeliverySuspended = pumpManager.status.basalDeliveryState?.isSuspended == true
         basalDeliveryState = pumpManager.status.basalDeliveryState
-        basalDeliveryRate = pumpManager.state.basalDeliveryRate(at: Date())
+        basalDeliveryRate = pumpManager.state.basalDeliveryRate(at: now)
+        basalDeliveryRateDate = now
+        basalDisplayState = pumpManager.state.basalDisplayState(at: now) ?? .basalScheduled
         setSuspenededAtString()
 
         pumpManager.addStateObserver(self, queue: .main)
@@ -148,8 +170,11 @@ class MockPumpManagerSettingsViewModel: ObservableObject {
 extension MockPumpManagerSettingsViewModel: MockPumpManagerStateObserver {
     func mockPumpManager(_ manager: MockKit.MockPumpManager, didUpdate state: MockKit.MockPumpManagerState) {
         guard !transitioningSuspendResumeInsulinDelivery else { return }
-        basalDeliveryRate = state.basalDeliveryRate(at: Date())
+        let now = Date()
+        basalDeliveryRateDate = now
+        basalDeliveryRate = state.basalDeliveryRate(at: now)
         basalDeliveryState = manager.status.basalDeliveryState
+        basalDisplayState = state.basalDisplayState(at: now) ?? basalDisplayState
     }
 
     func mockPumpManager(_ manager: MockKit.MockPumpManager, didUpdate status: LoopKit.PumpManagerStatus, oldStatus: LoopKit.PumpManagerStatus) {
@@ -172,4 +197,35 @@ extension MockPumpManagerState {
             return nil
         }
     }
+    
+    func basalDisplayState(at now: Date) -> BasalDisplayState? {
+        guard let scheduledBasalRate = basalRateSchedule?.value(at: now),
+              let currentBasalRate = basalDeliveryRate(at: now)
+        else {
+            return nil
+        }
+        
+        if currentBasalRate == scheduledBasalRate {
+            return .basalScheduled
+        } else if currentBasalRate == 0 {
+            return .basalTempAutoNoDelivery
+        } else if currentBasalRate < scheduledBasalRate {
+            return .basalTempAutoBelow
+        } else {
+            return .basalTempAutoAbove
+        }
+    }
+    
+    func basalDeliveryStartDate(at now: Date) -> Date? {
+        switch suspendState {
+        case .resumed:
+            if let tempBasal = unfinalizedTempBasal, !tempBasal.isFinished(at: now) {
+                return tempBasal.startTime
+            } else {
+                return basalRateSchedule?.startDate(at: now)
+            }
+        case .suspended:
+            return nil
+        }
+    }
 }

MockKitUI/Views/InsulinStatusView.swift

@@ -9,14 +9,15 @@
 import SwiftUI
 import LoopAlgorithm
 import LoopKit
+import LoopKitUI
 
 struct InsulinStatusView: View {
     @Environment(\.guidanceColors) var guidanceColors
     @Environment(\.insulinTintColor) var insulinTintColor
 
     @ObservedObject var viewModel: MockPumpManagerSettingsViewModel
 
-    private let subViewSpacing: CGFloat = 14
+    private let subViewSpacing: CGFloat = 16
 
     var body: some View {
         HStack(alignment: .top, spacing: 0) {
@@ -48,7 +49,7 @@ struct InsulinStatusView: View {
     }
 
     private var deliveryStatusSpacing: CGFloat {
-        return subViewSpacing
+        return subViewSpacing - 8
     }
 
     var deliveryStatus: some View {
@@ -58,8 +59,10 @@ struct InsulinStatusView: View {
                 .fixedSize(horizontal: false, vertical: true)
             if viewModel.isDeliverySuspended {
                 insulinSuspended
-            } else if let basalRate = viewModel.basalDeliveryRate {
-                basalRateView(basalRate)
+            } else if let basalRate = viewModel.basalDeliveryRate,
+                      let date = viewModel.basalDeliveryRateDate
+            {
+                basalRateView(basalRate, at: date)
             } else {
                 noDelivery
             }
@@ -79,34 +82,31 @@ struct InsulinStatusView: View {
         }
     }
 
-    private func basalRateView(_ basalRate: Double) -> some View {
+    private func basalRateView(_ basalRate: Double, at date: Date) -> some View {
         HStack(alignment: .center) {
             VStack(alignment: .leading) {
-                HStack(alignment: .lastTextBaseline, spacing: 3) {
-                    let unit = LoopUnit.internationalUnitsPerHour
-                    let quantity = LoopQuantity(unit: unit, doubleValue: basalRate)
+                HStack(spacing: 3) {
                     if viewModel.presentDeliveryWarning == true {
                         Image(systemName: "exclamationmark.circle.fill")
                             .foregroundColor(guidanceColors.warning)
                             .font(.system(size: 28))
                             .fixedSize()
                     }
-                    Text(basalRateFormatter.string(from: quantity, includeUnit: false) ?? "")
-                        .font(.system(size: 28))
+                    if let basalStateImageName = viewModel.basalDisplayState.imageName {
+                        Image(systemName: basalStateImageName)
+                            .font(.largeTitle)
+                            .foregroundColor(.accentColor)
+                    }
+                    Text(viewModel.basalDisplayStateString)
+                        .lineSpacing(1)
+                        .font(.callout)
                         .fontWeight(.heavy)
-                        .fixedSize()
-                    Text(basalRateFormatter.localizedUnitStringWithPlurality(forQuantity: quantity))
-                        .foregroundColor(.secondary)
                 }
-                Group {
-                    if viewModel.isScheduledBasal {
-                        Text("Scheduled\(String.nonBreakingSpace)Basal")
-                    } else if viewModel.isTempBasal {
-                        Text("Temporary\(String.nonBreakingSpace)Basal")
-                    }
+                if let basalDeliveryRateDateString = viewModel.basalDeliveryRateDateString {
+                    Text("at \(basalDeliveryRateDateString)")
+                        .font(.footnote)
+                        .foregroundColor(.accentColor)
                 }
-                .font(.footnote)
-                .foregroundColor(.accentColor)
             }
         }
     }