Updates to suspend threshold from design review (#76)

* Implement suspend threshold guardrails

* Update project.pbxproj

* Tweak suspend threshold description

* Updates from design review

Author: mpangburn

Loop/Views/SuspendThresholdEditor.swift

@@ -13,7 +13,7 @@ import LoopKitUI
 
 
 struct SuspendThresholdEditor: View {
-    @State private var value = HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 80)
+    @State private var value: HKQuantity
     @State private var isEditing = false
     @State private var showingConfirmationAlert = false
 
@@ -50,8 +50,8 @@ struct SuspendThresholdEditor: View {
                 // https://bugs.swift.org/browse/SR-11628
                 if true {
                     Card {
-                        SuspendThresholdPicker(value: $value, unit: unit, isEditing: $isEditing)
                         SuspendThresholdDescription()
+                        SuspendThresholdPicker(value: $value, unit: unit, isEditing: $isEditing)
                     }
                 }
             },
@@ -89,7 +89,7 @@ struct SuspendThresholdEditor: View {
     private func confirmationAlert() -> Alert {
         Alert(
             title: Text("Save Suspend Threshold?", comment: "Alert title for confirming a suspend threshold outside the recommended range"),
-            message: Text("The suspend threshold you have entered is outside of what we recommend.", comment: "Alert message for confirming a suspend threshold outside the recommended range"),
+            message: Text("The suspend threshold you have entered is outside of what Tidepool generally recommends.", comment: "Alert message for confirming a suspend threshold outside the recommended range"),
             primaryButton: .cancel(Text("Go Back")),
             secondaryButton: .default(
                 Text("Continue"),
@@ -105,7 +105,7 @@ struct SuspendThresholdEditor: View {
 }
 
 struct SuspendThresholdDescription: View {
-    let text = Text("When your glucose is below or predicted to go below this value, the app will recommend a basal rate of 0 U/h and will not recommend a bolus.", comment: "Suspend threshold description")
+    let text = Text("When your glucose is predicted to go below this value, the app will recommend a basal rate of 0 U/h and will not recommend a bolus.", comment: "Suspend threshold description")
 
     var body: some View {
         SettingDescription(text: text)
@@ -121,14 +121,10 @@ struct SuspendThresholdGuardrailWarning: View {
 
     private var title: Text {
         switch safetyClassificationThreshold {
-        case .minimum:
-            return Text("Lowest Suspend Threshold", comment: "Title text for the lowest suspend threshold warning")
-        case .belowRecommended:
+        case .minimum, .belowRecommended:
             return Text("Low Suspend Threshold", comment: "Title text for the low suspend threshold warning")
-        case .aboveRecommended:
+        case .aboveRecommended, .maximum:
             return Text("High Suspend Threshold", comment: "Title text for the high suspend threshold warning")
-        case .maximum:
-            return Text("Highest Suspend Threshold", comment: "Title text for the highest suspend threshold warning")
         }
     }
 }

Loop/Views/SuspendThresholdPicker.swift

@@ -17,37 +17,13 @@ struct SuspendThresholdPicker: View {
     var unit: HKUnit
     @Binding var isEditing: Bool
 
-    private var formatter: NumberFormatter
-
-    init(value: Binding<HKQuantity>, unit: HKUnit, isEditing: Binding<Bool>) {
-        self._value = value
-        self.unit = unit
-        self._isEditing = isEditing
-        self.formatter = {
-            let quantityFormatter = QuantityFormatter()
-            quantityFormatter.setPreferredNumberFormatter(for: unit)
-            return quantityFormatter.numberFormatter
-        }()
-    }
-
     var body: some View {
         VStack {
             HStack {
                 Spacer()
-
-                if Guardrail.suspendThreshold.classification(for: value) != .withinRecommendedRange {
-                    Image(systemName: "exclamationmark.triangle.fill")
-                        .foregroundColor(accentColor)
-                        .transition(.springInScaleOut)
-                }
-
-                Text(formatter.string(from: value.doubleValue(for: unit)) ?? "\(value.doubleValue(for: unit))")
-                    .foregroundColor(accentColor)
-                    .animation(nil)
-
-                Text(unit.shortLocalizedUnitString())
-                    .foregroundColor(.gray)
+                GuardrailConstrainedQuantityView(value: value, unit: unit, guardrail: .suspendThreshold, isEditing: isEditing)
             }
+            .contentShape(Rectangle())
             .onTapGesture {
                 withAnimation {
                     self.isEditing.toggle()
@@ -61,27 +37,10 @@ struct SuspendThresholdPicker: View {
             }
         }
     }
-
-    private var accentColor: Color {
-        switch Guardrail.suspendThreshold.classification(for: value) {
-        case .withinRecommendedRange:
-            return isEditing ? .accentColor : .primary
-        case .outsideRecommendedRange(let threshold):
-            switch threshold {
-            case .minimum, .maximum:
-                return .severeWarning
-            case .belowRecommended, .aboveRecommended:
-                return .warning
-            }
-        }
-    }
 }
 
 fileprivate extension AnyTransition {
-    static let expandFromTop = move(edge: .top).combined(with: .opacity).combined(with: .scale(scale: 0, anchor: .top))
-
-    static let springInScaleOut = asymmetric(
-        insertion: AnyTransition.scale.animation(.spring(dampingFraction: 0.5)),
-        removal: AnyTransition.scale.combined(with: .opacity)
-    )
+    static let expandFromTop = move(edge: .top)
+        .combined(with: .opacity)
+        .combined(with: .scale(scale: 0, anchor: .top))
 }