Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions LoopFollow/Remote/LoopAPNS/LoopAPNSCarbsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down Expand Up @@ -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)
Expand Down
16 changes: 15 additions & 1 deletion LoopFollow/Remote/Settings/RemoteSettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 5 additions & 0 deletions LoopFollow/Settings/ImportExport/ExportableSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
)
Expand All @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions LoopFollow/Storage/Storage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ class Storage {
var treatmentsPosition = StorageValue<TabPosition>(key: "treatmentsPosition", defaultValue: .menu)

var loopAPNSQrCodeURL = StorageValue<String>(key: "loopAPNSQrCodeURL", defaultValue: "")
var loopLollipopAbsorptionMinutes = StorageValue<Int>(key: "loopLollipopAbsorptionMinutes", defaultValue: 30)
var loopMaxFutureCarbHours = StorageValue<Int>(key: "loopMaxFutureCarbHours", defaultValue: 1)

var bolusIncrement = SecureStorageValue<HKQuantity>(key: "bolusIncrement", defaultValue: HKQuantity(unit: .internationalUnit(), doubleValue: 0.05))
Expand Down