Просмотр исходного кода

Merge pull request #4 from AndreasStokholm/settings-update

tmhastings 1 год назад
Родитель
Сommit
353a8868bd

+ 1 - 1
FreeAPS/Sources/Modules/GlucoseNotificationSettings/View/GlucoseNotificationSettingsRootView.swift

@@ -247,7 +247,7 @@ extension GlucoseNotificationSettings {
                             action: {
                                 hintLabel = "Low and High Glucose Alarm Limits"
                                 selectedVerboseHint =
-                                    AnyView(VStack(spacing: 10) {
+                                    AnyView(VStack(alignment: .leading, spacing: 10) {
                                         Text("Low Default: 70 mg/dL").bold()
                                         Text("High Default: 180 mg/dL").bold()
                                         VStack(alignment: .leading, spacing: 10) {

+ 2 - 2
FreeAPS/Sources/Modules/NightscoutConfig/View/NightscoutConfigRootView.swift

@@ -115,11 +115,11 @@ extension NightscoutConfig {
                                         hintLabel = "Import Settings from Nightscout"
                                         selectedVerboseHint =
                                             AnyView(
-                                                VStack(spacing: 10) {
+                                                VStack(alignment: .leading, spacing: 10) {
                                                     Text(
                                                         "This will overwrite the following Trio therapy settings:"
                                                     )
-                                                    VStack {
+                                                    VStack(alignment: .leading) {
                                                         Text("• Basal Rates")
                                                         Text("• Insulin Sensitivities")
                                                         Text("• Carb Ratios")

+ 1 - 1
FreeAPS/Sources/Modules/RemoteControlConfig/View/RemoteControlConfig.swift

@@ -52,7 +52,7 @@ extension RemoteControlConfig {
                     type: .boolean,
                     label: "Enable Remote Control",
                     miniHint: "Allow Trio to receive instructions, such as boluses and temp targets, from Loop Follow remotely.",
-                    verboseHint: VStack(spacing: 10) {
+                    verboseHint: VStack(alignment: .leading, spacing: 10) {
                         Text("Default: OFF").bold()
                         Text(
                             "When Remote Control is enabled, you can send boluses, overrides, temporary targets, carbs, and other commands to Trio via push notifications."

+ 4 - 4
FreeAPS/Sources/Modules/SMBSettings/View/SMBSettingsRootView.swift

@@ -251,11 +251,9 @@ extension SMBSettings {
                     label: NSLocalizedString("Max SMB Basal Minutes", comment: "Max SMB Basal Minutes"),
                     miniHint: "Limits the size of a single Super Micro Bolus (SMB) dose.",
                     verboseHint: VStack(spacing: 10) {
-                        VStack(alignment: .leading, spacing: 1) {
+                        VStack(alignment: .leading, spacing: 10) {
                             Text("Default: 30 minutes").bold()
                             Text("(50% current basal rate)").bold()
-                        }
-                        VStack(alignment: .leading, spacing: 10) {
                             Text(
                                 "This is a limit on the size of a single SMB. One SMB can only be as large as this many minutes of your current profile basal rate."
                             )
@@ -263,12 +261,14 @@ extension SMBSettings {
                                 "To calculate the maximum SMB allowed based on this setting, use the following formula:"
                             )
                         }
-                        VStack(alignment: .center, spacing: 5) {
+
+                        VStack(alignment: .center, spacing: 10) {
                             Text(
                                 "(𝒳 = Max SMB Basal Minutes)"
                             )
                             Text("(𝒳 ÷ 60) × current basal rate")
                         }
+
                         VStack(alignment: .leading, spacing: 10) {
                             Text(
                                 "Warning: Increasing this value above 90 minutes may impact Trio's ability to effectively zero temp and prevent lows."

+ 2 - 2
FreeAPS/Sources/Modules/TargetBehavoir/View/TargetBehavoirRootView.swift

@@ -118,7 +118,7 @@ extension TargetBehavoir {
                     type: .boolean,
                     label: NSLocalizedString("Sensitivity Raises Target", comment: "Sensitivity Raises Target"),
                     miniHint: "Automatically raise target glucose if sensitivity is detected.",
-                    verboseHint: VStack(spacing: 10) {
+                    verboseHint: VStack(alignment: .leading, spacing: 10) {
                         Text("Default: OFF").bold()
                         Text("Automatically increase target glucose if it detects an increase in sensitivity.")
                     }
@@ -139,7 +139,7 @@ extension TargetBehavoir {
                     type: .boolean,
                     label: NSLocalizedString("Resistance Lowers Target", comment: "Resistance Lowers Target"),
                     miniHint: "Automatically lower target glucose if resistance is detected.",
-                    verboseHint: VStack(spacing: 10) {
+                    verboseHint: VStack(alignment: .leading, spacing: 10) {
                         Text("Default: OFF").bold()
                         Text(
                             "Enabling this feature causes Trio to automatically reduce the targeted glucose if it detects a decrease in sensitivity (resistance)."

+ 6 - 6
FreeAPS/Sources/Modules/UserInterfaceSettings/View/UserInterfaceSettingsRootView.swift

@@ -81,11 +81,11 @@ extension UserInterfaceSettings {
                                         hintLabel = "Color Scheme Preference"
                                         selectedVerboseHint =
                                             AnyView(
-                                                VStack(spacing: 10) {
+                                                VStack(alignment: .leading, spacing: 10) {
                                                     Text(
                                                         "Set the app color scheme using the following options:"
                                                     )
-                                                    VStack {
+                                                    VStack(alignment: .leading, spacing: 10) {
                                                         Text(
                                                             "System Default: Follows the phone's current color scheme setting at that time"
                                                         )
@@ -207,7 +207,7 @@ extension UserInterfaceSettings {
                     type: .boolean,
                     label: "Show Low and High Thresholds",
                     miniHint: "Display the Low and High glucose thresholds set below.",
-                    verboseHint: VStack(spacing: 10) {
+                    verboseHint: VStack(alignment: .leading, spacing: 10) {
                         Text("This setting displays the upper and lower values for your glucose target range.")
                         Text("This range is for display and statistical purposes only and does not influence insulin dosing.")
                     }
@@ -299,7 +299,7 @@ extension UserInterfaceSettings {
                                         hintLabel = "Low and High Thresholds"
                                         selectedVerboseHint =
                                             AnyView(
-                                                VStack(spacing: 10) {
+                                                VStack(alignment: .leading, spacing: 10) {
                                                     Text(
                                                         "Default values are based on internationally accepted Time in Range values of \(state.units == .mgdL ? "70" : 70.formattedAsMmol ?? "70")-\(state.units == .mgdL ? "180" : 180.formattedAsMmol ?? "180") \(state.units.rawValue)."
                                                     )
@@ -347,7 +347,7 @@ extension UserInterfaceSettings {
                                     hintLabel = "Forecast Display Type"
                                     selectedVerboseHint =
                                         AnyView(
-                                            VStack(spacing: 10) {
+                                            VStack(alignment: .leading, spacing: 10) {
                                                 Text(
                                                     "This setting allows you to choose between the following two options for the glucose forecast:"
                                                 )
@@ -395,7 +395,7 @@ extension UserInterfaceSettings {
                                     hintLabel = "Total Insulin Display Type"
                                     selectedVerboseHint =
                                         AnyView(
-                                            VStack(spacing: 10) {
+                                            VStack(alignment: .leading, spacing: 10) {
                                                 Text(
                                                     "Choose between Total Daily Dose (TDD) or Total Insulin in Scope (TINS) to be displayed above the main glucose graph."
                                                 )