Jonas Björkert 1 год назад
Родитель
Сommit
c3b7925a5f

+ 4 - 7
LoopFollow/Alarm/AlarmEditing/Editors/BatteryAlarmEditor.swift

@@ -10,8 +10,7 @@ struct BatteryAlarmEditor: View {
     var body: some View {
         Form {
             InfoBanner(
-                text: "Alerts when the phone battery drops below the "
-                    + "percentage you set below.",
+                text: "This warns you when the phone’s battery gets low, based on the percentage you choose.",
                 alarmType: alarm.type
             )
 
@@ -19,8 +18,8 @@ struct BatteryAlarmEditor: View {
 
             AlarmStepperSection(
                 header: "Battery Level",
-                footer: "Alert when remaining charge is equal to or below this.",
-                title: "Level ≤",
+                footer: "This alerts you when the battery drops below this level.",
+                title: "Battery Below",
                 range: 0 ... 100,
                 step: 5,
                 unitLabel: "%",
@@ -32,9 +31,7 @@ struct BatteryAlarmEditor: View {
 
             AlarmActiveSection(alarm: $alarm)
             AlarmAudioSection(alarm: $alarm)
-            AlarmSnoozeSection(alarm: $alarm,
-                               range: 1 ... 24,
-                               step: 1)
+            AlarmSnoozeSection(alarm: $alarm, range: 1 ... 24, step: 1)
         }
         .navigationTitle(alarm.type.rawValue)
     }

+ 7 - 7
LoopFollow/Alarm/AlarmEditing/Editors/BatteryDropAlarmEditor.swift

@@ -10,17 +10,16 @@ struct BatteryDropAlarmEditor: View {
     var body: some View {
         Form {
             InfoBanner(
-                text: "Alerts when the phone battery falls by a specified "
-                    + "percentage within a set time window.",
+                text: "This warns you if your phone’s battery drops quickly, based on the percentage and time you set.",
                 alarmType: alarm.type
             )
 
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmStepperSection(
-                header: "Drop Amount",
-                footer: "Trigger when charge falls by at least this much.",
-                title: "Δ %",
+                header: "Battery Drop",
+                footer: "This alerts you if the battery drops by this much or more.",
+                title: "Drop Amount",
                 range: 5 ... 100,
                 step: 5,
                 unitLabel: "%",
@@ -31,11 +30,12 @@ struct BatteryDropAlarmEditor: View {
             )
 
             AlarmStepperSection(
-                header: "Time Window",
+                header: "Over This Time",
                 footer: "How far back to look for that drop.",
-                title: "Minutes",
+                title: "Time Window",
                 range: 5 ... 30,
                 step: 5,
+                unitLabel: "min",
                 value: Binding(
                     get: { Double(alarm.monitoringWindow ?? 15) },
                     set: { alarm.monitoringWindow = Int($0) }

+ 3 - 2
LoopFollow/Alarm/AlarmEditing/Editors/BuildExpireAlarmEditor.swift

@@ -11,13 +11,14 @@ struct BuildExpireAlarmEditor: View {
         Form {
             InfoBanner(
                 text: "Sends a reminder before the looping-app build you’re following reaches its "
-                    + "TestFlight or Xcode expiry date. Currently only works for Trio 0.4 and later."
+                    + "TestFlight or Xcode expiry date. Works with Trio 0.4 and later."
             )
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmStepperSection(
+                header: "Notice Period",
                 footer: "Choose how many days of notice you’d like before the build becomes unusable.",
-                title: "Expires In",
+                title: "Days of notice",
                 range: 1 ... 14,
                 step: 1,
                 unitLabel: alarm.type.snoozeTimeUnit.label,

+ 3 - 3
LoopFollow/Alarm/AlarmEditing/Editors/COBAlarmEditor.swift

@@ -17,9 +17,9 @@ struct COBAlarmEditor: View {
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmStepperSection(
-                header: "Threshold",
-                footer: "Alert when COB ≥ this many grams.",
-                title: "COB",
+                header: "Carbs on Board Limit",
+                footer: "Alert when carbs-on-board is above this number.",
+                title: "Above",
                 range: 1 ... 200,
                 step: 1,
                 unitLabel: "g",

+ 3 - 3
LoopFollow/Alarm/AlarmEditing/Editors/FastDropAlarmEditor.swift

@@ -18,8 +18,8 @@ struct FastDropAlarmEditor: View {
 
             AlarmBGSection(
                 header: "Rate of Fall",
-                footer: "How much the bg must fall to count as a “fast” drop.",
-                title: "Drop per reading",
+                footer: "This is how much the glucose must drop to be considered a fast drop.",
+                title: "Falls by",
                 range: 3 ... 20,
                 value: Binding(
                     get: { alarm.delta ?? 18 },
@@ -31,7 +31,7 @@ struct FastDropAlarmEditor: View {
             AlarmStepperSection(
                 header: "Consecutive Drops",
                 footer: "Number of drops—each meeting the rate above—required before an alert fires.",
-                title: "Drops in a row",
+                title: "Number of Drops",
                 range: 1 ... 3,
                 step: 1,
                 value: Binding(

+ 2 - 2
LoopFollow/Alarm/AlarmEditing/Editors/FastRiseAlarmEditor.swift

@@ -20,8 +20,8 @@ struct FastRiseAlarmEditor: View {
 
             AlarmBGSection(
                 header: "Rate of Rise",
-                footer: "How much the BG must rise to count as a “fast” rise.",
-                title: "Rise per reading",
+                footer: "This is how much the glucose must rise to be considered a fast rise.",
+                title: "Rises by",
                 range: 3 ... 20,
                 value: Binding(
                     get: { alarm.delta ?? 3 },

+ 3 - 3
LoopFollow/Alarm/AlarmEditing/Editors/HighBgAlarmEditor.swift

@@ -10,15 +10,15 @@ struct HighBgAlarmEditor: View {
     var body: some View {
         Form {
             InfoBanner(
-                text: "Alerts when your CGM glucose stays above the limit "
+                text: "Alerts when glucose stays above the limit "
                     + "you set below. Use Persistent if you want to ignore brief spikes."
             )
 
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmBGSection(
-                header: "Threshold",
-                footer: "The alarm becomes eligible once any reading is ≥ this value.",
+                header: "High Glucose Limit",
+                footer: "The alert becomes eligible once any reading is at or above this value.",
                 title: "BG",
                 range: 120 ... 350,
                 value: Binding(

+ 11 - 18
LoopFollow/Alarm/AlarmEditing/Editors/IOBAlarmEditor.swift

@@ -2,13 +2,6 @@
 // IOBAlarmEditor.swift
 // Created by Jonas Björkert on 2025-05-19.
 
-//
-//  IOBAlarmEditor.swift
-//  LoopFollow
-//
-//  Created by Jonas Björkert on 2025-05-17.
-//
-
 import SwiftUI
 
 struct IOBAlarmEditor: View {
@@ -24,52 +17,52 @@ struct IOBAlarmEditor: View {
 
             AlarmGeneralSection(alarm: $alarm)
 
-            // ── individual bolus size ──
             AlarmStepperSection(
-                header: "Bolus Size",
-                footer: "Only boluses equal to or larger than this are counted.",
-                title: "Bolus ≥",
+                header: "Boluses Size Limit",
+                footer: "This counts only boluses larger than this size.",
+                title: "Above",
                 range: 0.1 ... 20,
                 step: 0.1,
+                unitLabel: "Units",
                 value: Binding(
                     get: { alarm.delta ?? 1.0 },
                     set: { alarm.delta = $0 }
                 )
             )
 
-            // ── number of boluses ──
             AlarmStepperSection(
                 header: "Bolus Count",
                 footer: "Number of qualifying boluses needed to trigger.",
-                title: "Count",
+                title: "Count",
                 range: 1 ... 10,
                 step: 1,
+                unitLabel: "Boluses",
                 value: Binding(
                     get: { Double(alarm.monitoringWindow ?? 2) },
                     set: { alarm.monitoringWindow = Int($0) }
                 )
             )
 
-            // ── look-back window ──
             AlarmStepperSection(
                 header: "Time Window",
                 footer: "How far back to look for those boluses.",
-                title: "Minutes",
+                title: "Time",
                 range: 5 ... 120,
                 step: 5,
+                unitLabel: "min",
                 value: Binding(
                     get: { Double(alarm.predictiveMinutes ?? 30) },
                     set: { alarm.predictiveMinutes = Int($0) }
                 )
             )
 
-            // ── absolute IOB limit ──
             AlarmStepperSection(
-                header: "Total IOB",
+                header: "Insulin On Board",
                 footer: "Alert if current IOB or total boluses reach this.",
-                title: "IOB ",
+                title: "IOB Above",
                 range: 1 ... 20,
                 step: 0.5,
+                unitLabel: "Units",
                 value: Binding(
                     get: { alarm.threshold ?? 6 },
                     set: { alarm.threshold = $0 }

+ 3 - 4
LoopFollow/Alarm/AlarmEditing/Editors/LowBgAlarmEditor.swift

@@ -9,14 +9,13 @@ struct LowBgAlarmEditor: View {
 
     var body: some View {
         Form {
-            InfoBanner(text: "Alerts when your current CGM value — "
-                + "or any predicted value within the look-ahead window — "
-                + "falls at or below the threshold you set.")
+            InfoBanner(text: "This warns you if the glucose is too low now or might be soon, based on predictions. Note: predictions is currently not available for Trio.")
 
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmBGSection(
-                header: "Threshold",
+                header: "Low Limit",
+                footer: "Alert when any reading or prediction is at or below this value.",
                 title: "BG",
                 range: 40 ... 150,
                 value: Binding(

+ 13 - 9
LoopFollow/Alarm/AlarmEditing/Editors/MissedBolusAlarmEditor.swift

@@ -22,9 +22,10 @@ struct MissedBolusAlarmEditor: View {
                 header: "Delay",
                 footer: "Minutes to wait after the carb entry before checking " +
                     "for a bolus.",
-                title: "Minutes",
+                title: "Delay",
                 range: 5 ... 60,
                 step: 5,
+                unitLabel: "min",
                 value: Binding(
                     get: { Double(alarm.monitoringWindow ?? 15) },
                     set: { alarm.monitoringWindow = Int($0) }
@@ -33,11 +34,12 @@ struct MissedBolusAlarmEditor: View {
 
             AlarmStepperSection(
                 header: "Pre-bolus",
-                footer: "Count boluses given up to this many minutes *before* " +
+                footer: "Count boluses given up to this many minutes before " +
                     "the carb entry as valid.",
-                title: "Minutes",
+                title: "Pre-Bolus Time",
                 range: 0 ... 45,
                 step: 5,
+                unitLabel: "min",
                 value: Binding(
                     get: { Double(alarm.predictiveMinutes ?? 15) },
                     set: { alarm.predictiveMinutes = Int($0) }
@@ -46,10 +48,11 @@ struct MissedBolusAlarmEditor: View {
 
             AlarmStepperSection(
                 header: "Ignore small boluses",
-                footer: "Boluses  this size are ignored.",
-                title: "Units",
+                footer: "Boluses below this size are ignored.",
+                title: "Ignore below",
                 range: 0.05 ... 2,
                 step: 0.05,
+                unitLabel: "Units",
                 value: Binding(
                     get: { alarm.delta ?? 0.1 },
                     set: { alarm.delta = $0 }
@@ -58,10 +61,11 @@ struct MissedBolusAlarmEditor: View {
 
             AlarmStepperSection(
                 header: "Ignore small carbs",
-                footer: "Carb entries  this amount will not trigger the alarm.",
-                title: "Grams",
+                footer: "Carb entries below this amount will not trigger the alarm.",
+                title: "Below",
                 range: 0 ... 15,
                 step: 1,
+                unitLabel: "Grams",
                 value: Binding(
                     get: { alarm.threshold ?? 4 },
                     set: { alarm.threshold = $0 }
@@ -70,9 +74,9 @@ struct MissedBolusAlarmEditor: View {
 
             AlarmBGLimitSection(
                 header: "Ignore low BG",
-                footer: "Only alert if the current BG is *above* this value.",
+                footer: "Only alert if the current BG is above this value.",
                 toggleText: "Use BG Limit",
-                pickerTitle: "Alert when BG ≥",
+                pickerTitle: "Above",
                 range: 40 ... 140,
                 value: $alarm.aboveBG
             )

+ 2 - 1
LoopFollow/Alarm/AlarmEditing/Editors/MissedReadingEditor.swift

@@ -9,11 +9,12 @@ struct MissedReadingEditor: View {
 
     var body: some View {
         Form {
-            InfoBanner(text: "The app notifies you when no CGM reading has been received for the time you choose below.", alarmType: alarm.type)
+            InfoBanner(text: "This warns you if the glucose monitor stops sending readings for too long..", alarmType: alarm.type)
 
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmStepperSection(
+                header: "Reading Delay",
                 footer: "Choose how long the app should wait before alerting.",
                 title: "No reading for",
                 range: 11 ... 121,

+ 5 - 13
LoopFollow/Alarm/AlarmEditing/Editors/PumpChangeAlarmEditor.swift

@@ -2,13 +2,6 @@
 // PumpChangeAlarmEditor.swift
 // Created by Jonas Björkert on 2025-05-17.
 
-//
-//  PumpChangeAlarmEditor.swift
-//  LoopFollow
-//
-//  Created by Jonas Björkert on 2025-05-17.
-//
-
 import SwiftUI
 
 struct PumpChangeAlarmEditor: View {
@@ -17,9 +10,9 @@ struct PumpChangeAlarmEditor: View {
     var body: some View {
         Form {
             InfoBanner(
-                text: "Alerts once when your pump / cannula is within the time "
+                text: "Alerts when the pump / cannula is within the time "
                     + "window you choose below (relative to the 3-day change "
-                    + "limit).  After it fires once it disables itself.",
+                    + "limit).",
                 alarmType: alarm.type
             )
 
@@ -27,12 +20,11 @@ struct PumpChangeAlarmEditor: View {
 
             AlarmStepperSection(
                 header: "Advance Notice",
-                footer: "How many hours before the 3-day limit the alert "
-                    + "should fire.  Set to 12 hours, for example, to get a "
-                    + "reminder half a day in advance.",
-                title: "Warn hours",
+                footer: "How many hours before the 3-day limit you’d like a reminder.",
+                title: "Warning Time",
                 range: 1 ... 24,
                 step: 1,
+                unitLabel: "Hours",
                 value: Binding(
                     get: { alarm.threshold ?? 12 },
                     set: { alarm.threshold = $0 }

+ 3 - 10
LoopFollow/Alarm/AlarmEditing/Editors/PumpVolumeAlarmEditor.swift

@@ -2,13 +2,6 @@
 // PumpVolumeAlarmEditor.swift
 // Created by Jonas Björkert on 2025-05-17.
 
-//
-//  PumpVolumeAlarmEditor.swift
-//  LoopFollow
-//
-//  Created by Jonas Björkert on 2025-05-17.
-//
-
 import SwiftUI
 
 struct PumpVolumeAlarmEditor: View {
@@ -17,8 +10,7 @@ struct PumpVolumeAlarmEditor: View {
     var body: some View {
         Form {
             InfoBanner(
-                text: "Alerts when the pump reservoir falls to or below the "
-                    + "unit level you set below.",
+                text: "This warns you when the insulin pump is running low on insulin.",
                 alarmType: alarm.type
             )
 
@@ -28,9 +20,10 @@ struct PumpVolumeAlarmEditor: View {
                 header: "Trigger Level",
                 footer: "An alert fires once the reservoir is at this value "
                     + "or lower.",
-                title: "Units ≤",
+                title: "Reservoir Below",
                 range: 1 ... 50,
                 step: 1,
+                unitLabel: "Units",
                 value: Binding(
                     get: { alarm.threshold ?? 20 },
                     set: { alarm.threshold = $0 }

+ 3 - 2
LoopFollow/Alarm/AlarmEditing/Editors/RecBolusAlarmEditor.swift

@@ -19,10 +19,11 @@ struct RecBolusAlarmEditor: View {
 
             AlarmStepperSection(
                 header: "Threshold",
-                footer: "Alert when recommended bolus  this value.",
-                title: "Units",
+                footer: "Alert when recommended bolus is above this value.",
+                title: "More than",
                 range: 0.1 ... 50,
                 step: 0.1,
+                unitLabel: "Units",
                 value: Binding(
                     get: { alarm.threshold ?? 1.0 },
                     set: { alarm.threshold = $0 }

+ 2 - 2
LoopFollow/Alarm/AlarmEditing/Editors/SensorAgeAlarmEditor.swift

@@ -17,10 +17,10 @@ struct SensorAgeAlarmEditor: View {
             AlarmGeneralSection(alarm: $alarm)
 
             AlarmStepperSection(
-                header: "Advance warning",
+                header: "Early Reminder",
                 footer: "Number of hours before the 10-day mark that the alert " +
                     "will fire.",
-                title: "Hours",
+                title: "Reminder Time",
                 range: 1 ... 24,
                 step: 1,
                 unitLabel: "hours",

+ 2 - 2
LoopFollow/Alarm/AlarmEditing/Editors/TemporaryAlarmEditor.swift

@@ -23,7 +23,7 @@ struct TemporaryAlarmEditor: View {
                 header: "Low Limit",
                 footer: "Alert if BG is equal to or below this value.",
                 toggleText: "Enable low limit",
-                pickerTitle: "≤ BG",
+                pickerTitle: "Below",
                 range: bgRange,
                 value: $alarm.belowBG
             )
@@ -32,7 +32,7 @@ struct TemporaryAlarmEditor: View {
                 header: "High Limit",
                 footer: "Alert if BG is equal to or above this value.",
                 toggleText: "Enable high limit",
-                pickerTitle: "≥ BG",
+                pickerTitle: "Above",
                 range: bgRange,
                 value: $alarm.aboveBG
             )