diff --git a/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift b/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift index 2e8cac6f7..7da8408f3 100644 --- a/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift +++ b/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift @@ -9,6 +9,7 @@ struct LoopAPNSCarbsView: View { @Environment(\.presentationMode) var presentationMode @ObservedObject private var quickPickMeals = QuickPickMealsManager.shared + @ObservedObject private var lollipopAbsorptionMinutes = Storage.shared.loopLollipopAbsorptionMinutes @ObservedObject private var maxFutureCarbHours = Storage.shared.loopMaxFutureCarbHours @State private var carbsAmount = HKQuantity(unit: .gram(), doubleValue: 0.0) @State private var absorptionHours = 3 @@ -28,9 +29,12 @@ struct LoopAPNSCarbsView: View { private let maxPastHours = 12 private let minAllowedAbsorptionTime = 0.5 private let maxAllowedAbsorptionTime = 8.0 - private let lollipopStandardAbsorption: AbsorptionPreset = (0, 30) private let tacoStandardAbsorption: AbsorptionPreset = (3, 0) private let pizzaStandardAbsorption: AbsorptionPreset = (5, 0) + private var lollipopAbsorption: AbsorptionPreset { + (lollipopAbsorptionMinutes.value / 60, lollipopAbsorptionMinutes.value % 60) + } + private var maxFutureHours: Int { maxFutureCarbHours.value } @@ -195,7 +199,7 @@ struct LoopAPNSCarbsView: View { HStack(spacing: 10) { Button(action: { foodType = "🍭" - setAbsorptionTime(hours: lollipopStandardAbsorption.hours, minutes: lollipopStandardAbsorption.minutes) + setAbsorptionTime(hours: lollipopAbsorption.hours, minutes: lollipopAbsorption.minutes) }) { Text("🍭") .font(.title3) diff --git a/LoopFollow/Remote/Settings/RemoteSettingsView.swift b/LoopFollow/Remote/Settings/RemoteSettingsView.swift index 44a03cdae..9e71fdf76 100644 --- a/LoopFollow/Remote/Settings/RemoteSettingsView.swift +++ b/LoopFollow/Remote/Settings/RemoteSettingsView.swift @@ -10,6 +10,7 @@ struct RemoteSettingsView: View { @ObservedObject private var device = Storage.shared.device @ObservedObject var bolusIncrement = Storage.shared.bolusIncrement @ObservedObject private var watchRemoteCommands = Storage.shared.watchRemoteCommands + @ObservedObject private var loopLollipopAbsorptionMinutes = Storage.shared.loopLollipopAbsorptionMinutes @ObservedObject private var loopMaxFutureCarbHours = Storage.shared.loopMaxFutureCarbHours @State private var showAlert: Bool = false @@ -94,8 +95,13 @@ struct RemoteSettingsView: View { if viewModel.remoteType == .loopAPNS { Section( header: Text("Meal Settings"), - footer: Text("How far ahead carbs can be entered. Loop accepts up to 1 hr; use 4 hr if Loop is built with the future_carbs_4h customization.") + footer: Text("Absorption time set by the 🍭 button when entering carbs. Loop's own default is 30 min; use 2 hr if Loop is built with the 2hlollipop customization.\n\nHow far ahead carbs can be entered. Loop accepts up to 1 hr; use 4 hr if Loop is built with the future_carbs_4h customization.") ) { + Picker("🍭 Absorption Time", selection: $loopLollipopAbsorptionMinutes.value) { + ForEach(Array(stride(from: 30, through: 180, by: 30)), id: \.self) { minutes in + Text(Self.absorptionText(minutes: minutes)).tag(minutes) + } + } Picker("Max Future Carbs", selection: $loopMaxFutureCarbHours.value) { ForEach(1 ... 4, id: \.self) { hours in Text("\(hours) hr").tag(hours) @@ -394,6 +400,14 @@ struct RemoteSettingsView: View { .foregroundColor(isEnabled ? .primary : .gray) } + private static func absorptionText(minutes: Int) -> String { + let hours = minutes / 60 + let remainder = minutes % 60 + if hours == 0 { return "\(remainder) min" } + if remainder == 0 { return "\(hours) hr" } + return "\(hours) hr \(remainder) min" + } + // MARK: - Validation Error Handler private func handleValidationError(_ message: String) { diff --git a/LoopFollow/Settings/ImportExport/ExportableSettings.swift b/LoopFollow/Settings/ImportExport/ExportableSettings.swift index 1150a6831..c3389197d 100644 --- a/LoopFollow/Settings/ImportExport/ExportableSettings.swift +++ b/LoopFollow/Settings/ImportExport/ExportableSettings.swift @@ -242,6 +242,7 @@ struct RemoteSettingsExport: Codable { let mealWithFatProtein: Bool let productionEnvironment: Bool let loopAPNSQrCodeURL: String + let loopLollipopAbsorptionMinutes: Int? let loopMaxFutureCarbHours: Int? let device: String @@ -263,6 +264,7 @@ struct RemoteSettingsExport: Codable { mealWithFatProtein: storage.mealWithFatProtein.value, productionEnvironment: storage.productionEnvironment.value, loopAPNSQrCodeURL: storage.loopAPNSQrCodeURL.value, + loopLollipopAbsorptionMinutes: storage.loopLollipopAbsorptionMinutes.value, loopMaxFutureCarbHours: storage.loopMaxFutureCarbHours.value, device: storage.device.value ) @@ -285,6 +287,9 @@ struct RemoteSettingsExport: Codable { storage.mealWithFatProtein.value = mealWithFatProtein storage.productionEnvironment.value = productionEnvironment storage.loopAPNSQrCodeURL.value = loopAPNSQrCodeURL + if let loopLollipopAbsorptionMinutes { + storage.loopLollipopAbsorptionMinutes.value = loopLollipopAbsorptionMinutes + } if let loopMaxFutureCarbHours { storage.loopMaxFutureCarbHours.value = loopMaxFutureCarbHours } diff --git a/LoopFollow/Storage/Storage.swift b/LoopFollow/Storage/Storage.swift index 641c5d583..78adb8f39 100644 --- a/LoopFollow/Storage/Storage.swift +++ b/LoopFollow/Storage/Storage.swift @@ -265,6 +265,7 @@ class Storage { var treatmentsPosition = StorageValue(key: "treatmentsPosition", defaultValue: .menu) var loopAPNSQrCodeURL = StorageValue(key: "loopAPNSQrCodeURL", defaultValue: "") + var loopLollipopAbsorptionMinutes = StorageValue(key: "loopLollipopAbsorptionMinutes", defaultValue: 30) var loopMaxFutureCarbHours = StorageValue(key: "loopMaxFutureCarbHours", defaultValue: 1) var bolusIncrement = SecureStorageValue(key: "bolusIncrement", defaultValue: HKQuantity(unit: .internationalUnit(), doubleValue: 0.05))