Skip to content

Alarm consistency #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marionbarker merged 2 commits into from
Jan 29, 2026
Merged

Alarm consistency #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
009aa40
Alarm text update
imbercal Jan 22, 2026
5bd50ec
Modify strings for consistency, add Phone where possible without rena…
marionbarker Jan 29, 2026
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
4 changes: 2 additions & 2 deletions LoopFollow/Alarm/AlarmEditing/Editors/BatteryDropAlarmEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ struct BatteryDropAlarmEditor: View {
AlarmGeneralSection(alarm: $alarm)

AlarmStepperSection(
header: "Battery Drop",
footer: "This alerts you if the battery drops by this much or more.",
header: "Phone Battery Drop",
footer: "This alerts you if the phone battery drops by this much or more.",
title: "Drop Amount",
range: 5 ... 100,
step: 5,
Expand Down
8 changes: 4 additions & 4 deletions LoopFollow/Alarm/AlarmEditing/Editors/COBAlarmEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ struct COBAlarmEditor: View {
var body: some View {
Group {
InfoBanner(
text: "Alerts when Carbs-on-Board exceeds the amount you set below.",
text: "Alerts when Carbs-on-Board is at or above the amount you set below.",
alarmType: alarm.type
)

AlarmGeneralSection(alarm: $alarm)

AlarmStepperSection(
header: "Carbs on Board Limit",
footer: "Alert when carbs-on-board is above this number.",
title: "Above",
header: "Carbs-on-Board Limit",
footer: "Alert when Carbs-on-Board is at or above this number.",
title: "At or Above",
range: 1 ... 200,
step: 1,
unitLabel: "g",
Expand Down
8 changes: 4 additions & 4 deletions LoopFollow/Alarm/AlarmEditing/Editors/MissedBolusAlarmEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ struct MissedBolusAlarmEditor: View {

AlarmStepperSection(
header: "Ignore small boluses",
footer: "Boluses below this size are ignored.",
title: "Ignore below",
footer: "Boluses at or below this size are ignored.",
title: "At or Below",
range: 0.05 ... 2,
step: 0.05,
unitLabel: "Units",
Expand All @@ -51,8 +51,8 @@ struct MissedBolusAlarmEditor: View {

AlarmStepperSection(
header: "Ignore small carbs",
footer: "Carb entries below this amount will not trigger the alarm.",
title: "Below",
footer: "Carb entries at or below this amount will not trigger the alarm.",
title: "At or Below",
range: 0 ... 15,
step: 1,
unitLabel: "Grams",
Expand Down
6 changes: 3 additions & 3 deletions LoopFollow/Alarm/AlarmEditing/Editors/PhoneBatteryAlarmEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ struct PhoneBatteryAlarmEditor: View {
AlarmGeneralSection(alarm: $alarm)

AlarmStepperSection(
header: "Battery Level",
footer: "This alerts you when the battery drops below this level.",
title: "Battery Below",
header: "Phone Battery Level",
footer: "This alerts you when the phone battery drops to or below this level.",
title: "At or Below",
range: 0 ... 100,
step: 5,
unitLabel: "%",
Expand Down
4 changes: 2 additions & 2 deletions LoopFollow/Alarm/AlarmEditing/Editors/PumpBatteryAlarmEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ struct PumpBatteryAlarmEditor: View {

AlarmStepperSection(
header: "Pump Battery Level",
footer: "This alerts you when the pump battery drops below this level.",
title: "Battery Below",
footer: "This alerts you when the pump battery drops to or below this level.",
title: "At or Below",
range: 0 ... 100,
step: 5,
unitLabel: "%",
Expand Down
4 changes: 2 additions & 2 deletions LoopFollow/Alarm/AlarmEditing/Editors/RecBolusAlarmEditor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ struct RecBolusAlarmEditor: View {

AlarmStepperSection(
header: "Threshold",
footer: "Alert when recommended bolus is above this value.",
title: "More than",
footer: "Alert when recommended bolus is at or above this value.",
title: "At or Above",
range: 0.1 ... 50,
step: 0.1,
unitLabel: "Units",
Expand Down