Bring in fixes from DIY for bolus entry, and also fix safe area layout issue (LoopKit#836)

Author: ps2

Loop/View Controllers/StatusTableViewController.swift

@@ -425,6 +425,11 @@ final class StatusTableViewController: LoopChartsTableViewController {
 
     override func reloadData(animated: Bool = false) async {
         dispatchPrecondition(condition: .onQueue(.main))
+
+        guard view.window != nil else {
+            return
+        }
+        
         // This should be kept up to date immediately
         hudView?.loopCompletionHUD.lastLoopCompleted = loopManager.lastLoopCompleted
         hudView?.loopCompletionHUD.mostRecentGlucoseDataDate = loopManager.mostRecentGlucoseDataDate

Loop/Views/BolusEntryView.swift

@@ -18,17 +18,21 @@ struct BolusEntryView: View {
     @EnvironmentObject private var displayGlucosePreference: DisplayGlucosePreference
     @Environment(\.dismissAction) var dismiss
     @Environment(\.appName) var appName
-    
+    @Environment(\.dynamicTypeSize) private var dynamicTypeSize
+
     @ObservedObject var viewModel: BolusEntryViewModel
 
     @State private var enteredBolusString = ""
-    @State private var shouldBolusEntryBecomeFirstResponder = false
 
     @State private var isInteractingWithChart = false
-    @State private var isKeyboardVisible = false
-    @State private var pickerShouldExpand = false
     @State private var editedBolusAmount = false
 
+    @FocusState private var bolusFieldFocused: Bool
+
+    private var accessoryClearance: CGFloat {
+        dynamicTypeSize.isAccessibilitySize ? 72 : 52
+    }
+
     var body: some View {
         VStack(spacing: 0) {
             List {
@@ -37,21 +41,11 @@ struct BolusEntryView: View {
             }
             .padding(.top, -28)
             .insetGroupedListStyle()
-            
-            self.actionArea
-                .frame(height: self.isKeyboardVisible || shouldBolusEntryBecomeFirstResponder ? 0 : nil)
-                .opacity(self.isKeyboardVisible || shouldBolusEntryBecomeFirstResponder ? 0 : 1)
-        }
-        .onKeyboardStateChange { state in
-            self.isKeyboardVisible = state.height > 0
-            
-            if state.height == 0 {
-                // Ensure tapping 'Enter Bolus' can make the text field the first responder again
-                self.shouldBolusEntryBecomeFirstResponder = false
+            if !bolusFieldFocused {
+                actionArea
             }
+
         }
-        .keyboardAware()
-        .edgesIgnoringSafeArea(self.isKeyboardVisible ? [] : .bottom)
         .navigationBarTitle(self.title)
         .supportedInterfaceOrientations(.portrait)
         .alert(item: self.$viewModel.activeAlert, content: self.alert(for:))
@@ -71,6 +65,7 @@ struct BolusEntryView: View {
                 enteredBolusStringBinding.wrappedValue = "0"
             }
         }
+        .edgesIgnoringSafeArea(self.bolusFieldFocused ? [] : .bottom)
         .task {
             await self.viewModel.generateRecommendationAndStartObserving()
         }
@@ -283,18 +278,31 @@ struct BolusEntryView: View {
             Text("Bolus", comment: "Label for bolus entry row on bolus screen")
             Spacer()
             HStack(alignment: .firstTextBaseline) {
-                DismissibleKeyboardTextField(
-                    text: enteredBolusStringBinding,
-                    placeholder: viewModel.formatBolusAmount(0.0),
-                    font: .preferredFont(forTextStyle: .title1),
-                    textColor: .loopAccent,
-                    textAlignment: .right,
-                    keyboardType: .decimalPad,
-                    shouldBecomeFirstResponder: shouldBolusEntryBecomeFirstResponder,
-                    maxLength: 5,
-                    doneButtonColor: .loopAccent,
-                    textFieldDidBeginEditing: didBeginEditing
-                )
+                TextField(viewModel.formatBolusAmount(0.0), text: enteredBolusStringBinding)
+                    .keyboardType(.decimalPad)
+                    .textInputAutocapitalization(.never)
+                    .disableAutocorrection(true)
+                    .font(.title)
+                    .multilineTextAlignment(.trailing)
+                    .foregroundColor(.loopAccent)
+                    .focused($bolusFieldFocused)
+                    .onChange(of: bolusFieldFocused) { oldValue, focused in
+                        if focused {
+                            didBeginEditing()
+                        }
+                    }
+                    .onChange(of: enteredBolusString) { oldValue, newValue in
+                        if newValue.count > 5 {
+                            enteredBolusString = String(newValue.prefix(5))
+                            viewModel.updateEnteredBolus(enteredBolusString)
+                        }
+                    }
+                    .toolbar {
+                        ToolbarItemGroup(placement: .keyboard) {
+                            Spacer()
+                            Button("Done") { bolusFieldFocused = false }
+                        }
+                    }
                 bolusUnitsLabel
             }
             .accessibilityIdentifier("textField_Bolus")
@@ -328,7 +336,6 @@ struct BolusEntryView: View {
                 enterManualGlucoseButton
                     .transition(AnyTransition.opacity.combined(with: .move(edge: .bottom)))
             }
-
             actionButton
         }
         .padding(.bottom) // FIXME: unnecessary on iPhone 8 size devices
@@ -385,7 +392,7 @@ struct BolusEntryView: View {
         Button<Text>(
             action: {
                 if self.viewModel.actionButtonAction == .enterBolus {
-                    self.shouldBolusEntryBecomeFirstResponder = true
+                    self.bolusFieldFocused = true
                 } else {
                     Task {
                         if await self.viewModel.didPressActionButton() {

Loop/Views/ManualEntryDoseView.swift

@@ -15,44 +15,30 @@ import LoopUI
 
 
 struct ManualEntryDoseView: View {
+    @Environment(\.dynamicTypeSize) private var dynamicTypeSize
+
     @ObservedObject var viewModel: ManualEntryDoseViewModel
 
     @State private var enteredBolusString = ""
-    @State private var shouldBolusEntryBecomeFirstResponder = false
-
     @State private var isInteractingWithChart = false
-    @State private var isKeyboardVisible = false
+    @FocusState private var bolusFieldFocused: Bool
 
     @Environment(\.dismissAction) var dismiss
 
+    private var accessoryClearance: CGFloat {
+        dynamicTypeSize.isAccessibilitySize ? 72 : 52
+    }
+
     var body: some View {
         GeometryReader { geometry in
             VStack(spacing: 0) {
                 List {
                     self.chartSection
                     self.summarySection
                 }
-                // As of iOS 13, we can't programmatically scroll to the Bolus entry text field.  This ugly hack scoots the
-                // list up instead, so the summarySection is visible and the keyboard shows when you tap "Enter Bolus".
-                // Unfortunately, after entry, the field scoots back down and remains hidden.  So this is not a great solution.
-                // TODO: Fix this in Xcode 12 when we're building for iOS 14.
-                .padding(.top, self.shouldAutoScroll(basedOn: geometry) ? -200 : -28)
                 .insetGroupedListStyle()
 
-                self.actionArea
-                    .frame(height: self.isKeyboardVisible ? 0 : nil)
-                    .opacity(self.isKeyboardVisible ? 0 : 1)
             }
-            .onKeyboardStateChange { state in
-                self.isKeyboardVisible = state.height > 0
-                
-                if state.height == 0 {
-                    // Ensure tapping 'Enter Bolus' can make the text field the first responder again
-                    self.shouldBolusEntryBecomeFirstResponder = false
-                }
-            }
-            .keyboardAware()
-            .edgesIgnoringSafeArea(self.isKeyboardVisible ? [] : .bottom)
             .navigationBarTitle(self.title)
             .supportedInterfaceOrientations(.portrait)
         }
@@ -62,12 +48,6 @@ struct ManualEntryDoseView: View {
         return Text("Log Dose", comment: "Title for dose logging screen")
     }
 
-    private func shouldAutoScroll(basedOn geometry: GeometryProxy) -> Bool {
-        // Taking a guess of 640 to cover iPhone SE, iPod Touch, and other smaller devices.
-        // Devices such as the iPhone 11 Pro Max do not need to auto-scroll.
-        shouldBolusEntryBecomeFirstResponder && geometry.size.height < 640
-    }
-    
     private var chartSection: some View {
         Section {
             VStack(spacing: 8) {
@@ -189,17 +169,25 @@ struct ManualEntryDoseView: View {
             Text("Bolus", comment: "Label for bolus entry row on bolus screen")
             Spacer()
             HStack(alignment: .firstTextBaseline) {
-                DismissibleKeyboardTextField(
-                    text: typedBolusEntry,
-                    placeholder: Self.doseAmountFormatter.string(from: 0.0)!,
-                    font: .preferredFont(forTextStyle: .title1),
-                    textColor: .loopAccent,
-                    textAlignment: .right,
-                    keyboardType: .decimalPad,
-                    shouldBecomeFirstResponder: shouldBolusEntryBecomeFirstResponder,
-                    maxLength: 5,
-                    doneButtonColor: .loopAccent
-                )
+                TextField(Self.doseAmountFormatter.string(from: 0.0)!, text: typedBolusEntry)
+                    .keyboardType(.decimalPad)
+                    .textInputAutocapitalization(.never)
+                    .disableAutocorrection(true)
+                    .font(.title)
+                    .multilineTextAlignment(.trailing)
+                    .foregroundColor(.loopAccent)
+                    .focused($bolusFieldFocused)
+                    .onChange(of: enteredBolusString) { oldValue, newValue in
+                        if newValue.count > 5 {
+                            enteredBolusString = String(newValue.prefix(5))
+                        }
+                    }
+                    .toolbar {
+                        ToolbarItemGroup(placement: .keyboard) {
+                            Spacer()
+                            Button("Done") { bolusFieldFocused = false }
+                        }
+                    }
                 bolusUnitsLabel
             }
         }
@@ -258,7 +246,7 @@ struct ManualEntryDoseView: View {
     }
 }
 
-extension InsulinType: Labeled {
+extension InsulinType: @retroactive Labeled {
     public var label: String {
         return title
     }

LoopUI/Views/DeviceStatusHUDView.swift

@@ -31,8 +31,8 @@ import LoopKitUI
             // round the edges of the progress view
             progressView.layer.cornerRadius = 2
             progressView.clipsToBounds = true
-            progressView.layer.sublayers![1].cornerRadius = 2
-            progressView.subviews[1].clipsToBounds = true
+            progressView.layer.sublayers!.last!.cornerRadius = 2
+            progressView.subviews.last!.clipsToBounds = true
         }
     }