From d34e55a29e666a775de66b496581a3cf42f38b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bj=C3=B6rkert?= Date: Fri, 6 Nov 2026 21:03:28 +0100 Subject: [PATCH] Make the Loop lollipop absorption time a setting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 🍭 button in Loop remote carbs uses an absorption time from Remote Settings, 30 min by default, so it can match Loop built with the 2hlollipop customization. The setting is included in the remote settings export. --- .../Remote/LoopAPNS/LoopAPNSCarbsView.swift | 8 +++++-- .../Remote/Settings/RemoteSettingsView.swift | 22 +++++++++++++++++++ .../ImportExport/ExportableSettings.swift | 5 +++++ LoopFollow/Storage/Storage.swift | 1 + 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift b/LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift index 1392e697e..f235fbdf6 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 @State private var carbsAmount = HKQuantity(unit: .gram(), doubleValue: 0.0) @State private var absorptionHours = 3 @State private var absorptionMinutes = 0 @@ -28,9 +29,12 @@ struct LoopAPNSCarbsView: View { private let maxFutureHours = 1 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 otpTimer = Timer.publish(every: 1, on: .main, in: .common).autoconnect() @FocusState private var carbsFieldIsFocused: Bool @@ -191,7 +195,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 c3146108c..9ddf8a807 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 @State private var showAlert: Bool = false @State private var alertType: AlertType? = nil @@ -90,6 +91,19 @@ struct RemoteSettingsView: View { } } + if viewModel.remoteType == .loopAPNS { + Section( + header: Text("Meal Settings"), + 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.") + ) { + 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) + } + } + } + } + // MARK: - Guardrails Section (shown for both TRC and Loop) if viewModel.remoteType == .trc || viewModel.remoteType == .loopAPNS { @@ -380,6 +394,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 3571d8cfb..010c4a704 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 device: String static func fromCurrentStorage() -> RemoteSettingsExport { @@ -262,6 +263,7 @@ struct RemoteSettingsExport: Codable { mealWithFatProtein: storage.mealWithFatProtein.value, productionEnvironment: storage.productionEnvironment.value, loopAPNSQrCodeURL: storage.loopAPNSQrCodeURL.value, + loopLollipopAbsorptionMinutes: storage.loopLollipopAbsorptionMinutes.value, device: storage.device.value ) } @@ -283,6 +285,9 @@ struct RemoteSettingsExport: Codable { storage.mealWithFatProtein.value = mealWithFatProtein storage.productionEnvironment.value = productionEnvironment storage.loopAPNSQrCodeURL.value = loopAPNSQrCodeURL + if let loopLollipopAbsorptionMinutes { + storage.loopLollipopAbsorptionMinutes.value = loopLollipopAbsorptionMinutes + } // Set device temporarily from import (will be overridden by Nightscout connection) if !device.isEmpty { diff --git a/LoopFollow/Storage/Storage.swift b/LoopFollow/Storage/Storage.swift index 4f533740a..773c96db3 100644 --- a/LoopFollow/Storage/Storage.swift +++ b/LoopFollow/Storage/Storage.swift @@ -257,6 +257,7 @@ class Storage { var treatmentsPosition = StorageValue(key: "treatmentsPosition", defaultValue: .menu) var loopAPNSQrCodeURL = StorageValue(key: "loopAPNSQrCodeURL", defaultValue: "") + var loopLollipopAbsorptionMinutes = StorageValue(key: "loopLollipopAbsorptionMinutes", defaultValue: 30) var bolusIncrement = SecureStorageValue(key: "bolusIncrement", defaultValue: HKQuantity(unit: .internationalUnit(), doubleValue: 0.05)) var bolusIncrementDetected = StorageValue(key: "bolusIncrementDetected", defaultValue: false)