From 84d49c45ff57830603c4f0e4909bd7944adc7c7a Mon Sep 17 00:00:00 2001
From: Nathan Racklyeft <loudnate@gmail.com>
Date: Tue, 27 Sep 2016 17:26:12 -0700
Subject: [PATCH 1/2] Improving VoiceOver accessibility for the HUD and Bolus
 screens

---
 Loop/AppDelegate.swift                        |  2 +-
 Loop/Base.lproj/Main.storyboard               | 18 +++++---
 Loop/Managers/DeviceDataManager.swift         |  8 ++--
 Loop/Managers/DoseMath.swift                  |  4 +-
 Loop/Managers/LoopDataManager.swift           |  2 +-
 Loop/Managers/NotificationManager.swift       |  2 +-
 Loop/Managers/WatchDataManager.swift          |  2 +-
 .../BolusViewController.swift                 | 31 +++++++++----
 .../StatusTableViewController.swift           | 45 ++++++++++++++-----
 Loop/Views/BasalRateHUDView.swift             | 19 ++++++--
 Loop/Views/BatteryLevelHUDView.swift          |  3 ++
 Loop/Views/GlucoseHUDView.swift               | 18 ++++++--
 Loop/Views/LoopCompletionHUDView.swift        | 11 ++++-
 Loop/Views/ReservoirVolumeHUDView.swift       | 23 ++++------
 .../StatusInterfaceController.swift           |  2 +-
 WatchApp Extension/Models/GlucoseTrend.swift  | 23 +++++++++-
 16 files changed, 155 insertions(+), 58 deletions(-)

diff --git a/Loop/AppDelegate.swift b/Loop/AppDelegate.swift
index 990268eb00..c0610119a1 100644
--- a/Loop/AppDelegate.swift
+++ b/Loop/AppDelegate.swift
@@ -82,7 +82,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
                 dataManager.enactBolus(units) { (error) in
                     if error != nil {
-                        NotificationManager.sendBolusFailureNotificationForAmount(units, atDate: startDate)
+                        NotificationManager.sendBolusFailureNotificationForAmount(units, atStartDate: startDate)
                     }
 
                     completionHandler()
diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index bb17bbf850..7268a6fb07 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -289,7 +289,7 @@
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <accessibility key="accessibilityConfiguration">
-                                                <accessibilityTraits key="traits" summaryElement="YES"/>
+                                                <accessibilityTraits key="traits" none="YES"/>
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
@@ -333,8 +333,7 @@
                                                 </label>
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration">
-                                                <accessibilityTraits key="traits" summaryElement="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Glucose">
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
@@ -378,7 +377,7 @@
                                                 </view>
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration">
+                                            <accessibility key="accessibilityConfiguration" label="Net Basal Rate">
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
@@ -434,7 +433,7 @@
                                                 </label>
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration">
+                                            <accessibility key="accessibilityConfiguration" label="Reservoir Volume">
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
@@ -483,7 +482,7 @@
                                                 </view>
                                             </subviews>
                                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <accessibility key="accessibilityConfiguration">
+                                            <accessibility key="accessibilityConfiguration" label="Battery Level">
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
@@ -637,6 +636,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="U" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVz-dr-xLU">
+                                                    <accessibility key="accessibilityConfiguration" label="Units"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -660,6 +660,10 @@
                                                 <constraint firstItem="mVz-dr-xLU" firstAttribute="leading" secondItem="5QS-Yf-Pua" secondAttribute="trailing" constant="8" symbolic="YES" id="z7E-fc-REL"/>
                                             </constraints>
                                         </tableViewCellContentView>
+                                        <accessibility key="accessibilityConfiguration">
+                                            <accessibilityTraits key="traits" none="YES"/>
+                                            <bool key="isElement" value="YES"/>
+                                        </accessibility>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="us0-UE-Wqz">
                                         <rect key="frame" x="0.0" y="143" width="375" height="44"/>
@@ -674,6 +678,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0.0" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7LT-50-ZzK">
+                                                    <accessibility key="accessibilityConfiguration" label="Bolus Amount"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="120" id="hZ2-Aq-FHT"/>
                                                     </constraints>
@@ -684,6 +689,7 @@
                                                     </connections>
                                                 </textField>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="U" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BR0-dr-Fj2">
+                                                    <accessibility key="accessibilityConfiguration" label="Units"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index a5182582f2..673bb7496a 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -207,7 +207,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
 
         // Sentry packets are sent in groups of 3, 5s apart. Wait 11s before allowing the loop data to continue to avoid conflicting comms.
         DispatchQueue.global(qos: DispatchQoS.QoSClass.utility).asyncAfter(deadline: DispatchTime.now() + Double(Int64(11 * NSEC_PER_SEC)) / Double(NSEC_PER_SEC)) {
-            self.updateReservoirVolume(status.reservoirRemainingUnits, atDate: pumpDate, withTimeLeft: TimeInterval(minutes: Double(status.reservoirRemainingMinutes)))
+            self.updateReservoirVolume(status.reservoirRemainingUnits, at: pumpDate, withTimeLeft: TimeInterval(minutes: Double(status.reservoirRemainingMinutes)))
         }
 
         // Check for an empty battery. Sentry packets are still broadcast for a few hours after this value reaches 0.
@@ -223,7 +223,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
      - parameter date:     The date the reservoir was read
      - parameter timeLeft: The approximate time before the reservoir is empty
      */
-    private func updateReservoirVolume(_ units: Double, atDate date: Date, withTimeLeft timeLeft: TimeInterval?) {
+    private func updateReservoirVolume(_ units: Double, at date: Date, withTimeLeft timeLeft: TimeInterval?) {
         doseStore.addReservoirValue(units, atDate: date) { (newValue, previousValue, areStoredValuesContinuous, error) -> Void in
             if let error = error {
                 self.logger.addError(error, fromSource: "DoseStore")
@@ -347,7 +347,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
                 let nsPumpStatus: NightscoutUploadKit.PumpStatus?
                 switch result {
                 case .success(let (status, date)):
-                    self.updateReservoirVolume(status.reservoir, atDate: date, withTimeLeft: nil)
+                    self.updateReservoirVolume(status.reservoir, at: date, withTimeLeft: nil)
                     let battery = BatteryStatus(voltage: status.batteryVolts, status: BatteryIndicator(batteryStatus: status.batteryStatus))
                     nsPumpStatus = NightscoutUploadKit.PumpStatus(clock: date, pumpID: status.pumpID, iob: nil, battery: battery, suspended: status.suspended, bolusing: status.bolusing, reservoir: status.reservoir)
                 case .failure(let error):
@@ -388,7 +388,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate, Transmitter
                     self.logger.addError(error, fromSource: "Bolus")
                     completion(LoopError.communicationError)
                 } else {
-                    self.loopManager.recordBolus(units, atDate: Date())
+                    self.loopManager.recordBolus(units, at: Date())
                     completion(nil)
                 }
             }
diff --git a/Loop/Managers/DoseMath.swift b/Loop/Managers/DoseMath.swift
index 2e2d7b769b..63aff3b247 100644
--- a/Loop/Managers/DoseMath.swift
+++ b/Loop/Managers/DoseMath.swift
@@ -177,6 +177,8 @@ struct DoseMath {
             doseUnits -= max(0, remainingUnits)
         }
 
-        return max(0, doseUnits)
+        doseUnits = round(doseUnits * 40) / 40
+
+        return min(maxBolus, max(0, doseUnits))
     }
 }
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
index dd93b9ed1e..56c2491ff5 100644
--- a/Loop/Managers/LoopDataManager.swift
+++ b/Loop/Managers/LoopDataManager.swift
@@ -657,7 +657,7 @@ final class LoopDataManager {
      - parameter units: The amount of insulin
      - parameter date:  The date the bolus was set
      */
-    func recordBolus(_ units: Double, atDate date: Date) {
+    func recordBolus(_ units: Double, at date: Date) {
         dataAccessQueue.async {
             self.lastBolus = (units: units, date: date)
             self.notify(forChange: .bolus)
diff --git a/Loop/Managers/NotificationManager.swift b/Loop/Managers/NotificationManager.swift
index f881356d2f..47c729385c 100644
--- a/Loop/Managers/NotificationManager.swift
+++ b/Loop/Managers/NotificationManager.swift
@@ -55,7 +55,7 @@ struct NotificationManager {
 
     // MARK: - Notifications
 
-    static func sendBolusFailureNotificationForAmount(_ units: Double, atDate startDate: Date) {
+    static func sendBolusFailureNotificationForAmount(_ units: Double, atStartDate startDate: Date) {
         let notification = UILocalNotification()
 
         notification.alertTitle = NSLocalizedString("Bolus", comment: "The notification title for a bolus failure")
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
index 2a144434ae..7ab5d36f82 100644
--- a/Loop/Managers/WatchDataManager.swift
+++ b/Loop/Managers/WatchDataManager.swift
@@ -162,7 +162,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
             if let bolus = SetBolusUserInfo(rawValue: message as SetBolusUserInfo.RawValue) {
                 self.deviceDataManager.enactBolus(bolus.value) { (error) in
                     if error != nil {
-                        NotificationManager.sendBolusFailureNotificationForAmount(bolus.value, atDate: bolus.startDate)
+                        NotificationManager.sendBolusFailureNotificationForAmount(bolus.value, atStartDate: bolus.startDate)
                     } else {
                         AnalyticsManager.sharedManager.didSetBolusFromWatch(bolus.value)
                     }
diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
index f96e57daa5..3e25295582 100644
--- a/Loop/View Controllers/BolusViewController.swift	
+++ b/Loop/View Controllers/BolusViewController.swift	
@@ -16,6 +16,11 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
+        let spellOutFormatter = NumberFormatter()
+        spellOutFormatter.numberStyle = .spellOut
+
+        bolusAmountTextField.accessibilityHint = String(format: NSLocalizedString("Recommended Bolus: %@ Units", comment: "Accessibility hint describing recommended bolus units"), spellOutFormatter.string(from: NSNumber(value: recommendedBolus)) ?? "0")
+
         bolusAmountTextField.becomeFirstResponder()
 
         AnalyticsManager.sharedManager.didDisplayBolusScreen()
@@ -27,6 +32,8 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
         }
     }
 
+    var maxBolus: Double = 25
+
     private(set) var bolus: Double?
 
     @IBOutlet weak var recommendedBolusAmountLabel: UILabel? {
@@ -42,27 +49,35 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
     @IBAction func authenticateBolus(_ sender: Any) {
         bolusAmountTextField.resignFirstResponder()
 
+        guard let text = bolusAmountTextField?.text, let bolus = decimalFormatter.number(from: text)?.doubleValue,
+            let amountString = decimalFormatter.string(from: NSNumber(value: bolus)) else {
+            return
+        }
+
+        guard bolus <= maxBolus else {
+            presentAlertController(withTitle: NSLocalizedString("Maximum Bolus", comment: "The title of the alert describing a maximum bolus validation error"), message: String(format: NSLocalizedString("The maximum bolus amount is %@ Units", comment: "Body of the alert describing a maximum bolus validation error. (1: The localized max bolus value)"), maxBolus))
+            return
+        }
+
         let context = LAContext()
 
         if context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil) {
             context.evaluatePolicy(.deviceOwnerAuthentication,
-                                   localizedReason: NSLocalizedString("Please authenticate to bolus", comment: "The message displayed during a device authentication prompt for bolus specification"),
+                                   localizedReason: String(format: NSLocalizedString("Authenticate to Bolus %@ Units", comment: "The message displayed during a device authentication prompt for bolus specification"), amountString),
                                    reply: { (success, error) in
                 if success {
-                    self.setBolusAndClose(sender)
+                    self.setBolusAndClose(bolus)
                 }
             })
         } else {
-            setBolusAndClose(sender)
+            setBolusAndClose(bolus)
         }
     }
 
-    private func setBolusAndClose(_ sender: Any) {
-        if let text = bolusAmountTextField?.text, let bolus = decimalFormatter.number(from: text)?.doubleValue {
-            self.bolus = bolus
+    private func setBolusAndClose(_ bolus: Double) {
+        self.bolus = bolus
 
-            self.performSegue(withIdentifier: "close", sender: sender)
-        }
+        self.performSegue(withIdentifier: "close", sender: nil)
     }
 
     private lazy var decimalFormatter: NumberFormatter = {
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index a2708d19ff..f75085e46c 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -231,8 +231,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                     reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(capacity))))
                 }
 
-                reservoirVolumeHUD.reservoirVolume = reservoir.unitVolume
-                reservoirVolumeHUD.lastUpdated = reservoir.startDate
+                reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate)
             }
 
             if let status = dataManager.latestPumpStatusFromMySentry {
@@ -337,7 +336,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             }
 
             DispatchQueue.main.async {
-                self.basalRateHUD.setNetBasalRate(netBasalRate, percent: netBasalPercent, atDate: basalStartDate)
+                self.basalRateHUD.setNetBasalRate(netBasalRate, percent: netBasalPercent, at: basalStartDate)
             }
         }
     }
@@ -569,6 +568,10 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             vc.doseStore = dataManager.doseStore
             vc.hidesBottomBarWhenPushed = true
         case let vc as BolusViewController:
+            if let maxBolus = self.dataManager.maximumBolus {
+                vc.maxBolus = maxBolus
+            }
+
             if let bolus = sender as? Double {
                 vc.recommendedBolus = bolus
             } else {
@@ -576,7 +579,9 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                     if let error = error {
                         self.dataManager.logger.addError(error, fromSource: "Bolus")
                     } else if let bolus = units {
-                        vc.recommendedBolus = bolus
+                        DispatchQueue.main.async {
+                            vc.recommendedBolus = bolus
+                        }
                     }
                 }
             }
@@ -621,7 +626,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                 let startDate = Date()
                 dataManager.enactBolus(bolus) { (error) in
                     if error != nil {
-                        NotificationManager.sendBolusFailureNotificationForAmount(bolus, atDate: startDate)
+                        NotificationManager.sendBolusFailureNotificationForAmount(bolus, atStartDate: startDate)
                     }
                 }
             }
@@ -635,7 +640,14 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     private func createWorkoutButtonItem(selected: Bool) -> UIBarButtonItem {
         let item = UIBarButtonItem(image: UIImage.workoutImage(selected: selected), style: .plain, target: self, action: #selector(toggleWorkoutMode(_:)))
         item.accessibilityLabel = NSLocalizedString("Workout Mode", comment: "The label of the workout mode toggle button")
-        item.accessibilityHint = selected ? NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled") : NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
+
+        if selected {
+            item.accessibilityTraits = item.accessibilityTraits | UIAccessibilityTraitSelected
+            item.accessibilityHint = NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled")
+        } else {
+            item.accessibilityHint = NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
+        }
+
         item.tintColor = UIColor.glucoseTintColor
 
         return item
@@ -661,15 +673,26 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         didSet {
             let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openCGMApp(_:)))
             glucoseHUD.addGestureRecognizer(tapGestureRecognizer)
+
+            if cgmAppURL != nil {
+                glucoseHUD.accessibilityHint = NSLocalizedString("Launches CGM app", comment: "Glucose HUD accessibility hint")
+            }
         }
     }
 
-    @objc private func openCGMApp(_: Any) {
-        if let URL = URL(string: "dexcomcgm://"), UIApplication.shared.canOpenURL(URL) {
-            UIApplication.shared.openURL(URL)
+    private var cgmAppURL: URL? {
+        if let url = URL(string: "dexcomcgm://"), UIApplication.shared.canOpenURL(url) {
+            return url
+        } else if let url = URL(string: "dexcomshare://"), UIApplication.shared.canOpenURL(url) {
+            return url
+        } else {
+            return nil
         }
-        else if let URL = URL(string: "dexcomshare://"), UIApplication.shared.canOpenURL(URL) {
-            UIApplication.shared.openURL(URL)
+    }
+
+    @objc private func openCGMApp(_: Any) {
+        if let url = cgmAppURL {
+            UIApplication.shared.openURL(url)
         }
     }
 
diff --git a/Loop/Views/BasalRateHUDView.swift b/Loop/Views/BasalRateHUDView.swift
index 56bdea4cd6..23fa1ded48 100644
--- a/Loop/Views/BasalRateHUDView.swift
+++ b/Loop/Views/BasalRateHUDView.swift
@@ -17,14 +17,25 @@ final class BasalRateHUDView: HUDView {
         didSet {
             basalRateLabel?.text = String(format: basalRateFormatString, "–")
             basalRateLabel?.textColor = .doseTintColor
+
+            accessibilityValue = NSLocalizedString("Unknown", comment: "Accessibility value for an unknown value")
         }
     }
 
-    private lazy var basalRateFormatString = NSLocalizedString("%@ U", comment: "The format string describing the basal rate. ")
+    private lazy var basalRateFormatString = NSLocalizedString("%@ U", comment: "The format string describing the basal rate.")
+
+    func setNetBasalRate(_ rate: Double, percent: Double, at date: Date) {
+        let time = timeFormatter.string(from: date)
+        caption?.text = time
+
+        if let rateString = decimalFormatter.string(from: NSNumber(value: rate)) {
+            basalRateLabel?.text = String(format: basalRateFormatString, rateString)
+            accessibilityValue = String(format: NSLocalizedString("%1$@ units per hour at %2$@", comment: "Accessibility format string describing the basal rate. (1: localized basal rate value)(2: last updated time)"), rateString, time)
+        } else {
+            basalRateLabel?.text = nil
+            accessibilityValue = nil
+        }
 
-    func setNetBasalRate(_ rate: Double, percent: Double, atDate date: Date) {
-        caption?.text = timeFormatter.string(from: date)
-        basalRateLabel?.text = String(format: basalRateFormatString, decimalFormatter.string(from: NSNumber(value: rate)) ?? "–")
         basalStateView.netBasalPercent = percent
     }
 
diff --git a/Loop/Views/BatteryLevelHUDView.swift b/Loop/Views/BatteryLevelHUDView.swift
index 585070100f..c90863fa0d 100644
--- a/Loop/Views/BatteryLevelHUDView.swift
+++ b/Loop/Views/BatteryLevelHUDView.swift
@@ -17,6 +17,8 @@ final class BatteryLevelHUDView: HUDView {
         super.awakeFromNib()
 
         tintColor = .unknownColor
+
+        accessibilityValue = NSLocalizedString("Unknown", comment: "Accessibility value for an unknown value")
     }
 
     private lazy var numberFormatter: NumberFormatter = {
@@ -31,6 +33,7 @@ final class BatteryLevelHUDView: HUDView {
         didSet {
             if let value = batteryLevel, let level = numberFormatter.string(from: NSNumber(value: value)) {
                 caption.text = level
+                accessibilityValue = level
             } else {
                 caption.text = nil
             }
diff --git a/Loop/Views/GlucoseHUDView.swift b/Loop/Views/GlucoseHUDView.swift
index f804045a50..3fecce9c80 100644
--- a/Loop/Views/GlucoseHUDView.swift
+++ b/Loop/Views/GlucoseHUDView.swift
@@ -38,18 +38,30 @@ final class GlucoseHUDView: HUDView {
     }
 
     func set(_ glucoseValue: GlucoseValue, for unit: HKUnit, from sensor: SensorDisplayable?) {
-        caption?.text = timeFormatter.string(from: glucoseValue.startDate)
+        var accessibilityStrings = [String]()
+
+        let time = timeFormatter.string(from: glucoseValue.startDate)
+        caption?.text = time
 
         let numberFormatter = NumberFormatter.glucoseFormatter(for: unit)
-        glucoseLabel.text = numberFormatter.string(from: NSNumber(value: glucoseValue.quantity.doubleValue(for: unit)))
+        if let valueString = numberFormatter.string(from: NSNumber(value: glucoseValue.quantity.doubleValue(for: unit))) {
+            glucoseLabel.text = valueString
+            accessibilityStrings.append(String(format: NSLocalizedString("%1$@ at %2$@", comment: "Accessbility format value describing glucose: (1: glucose number)(2: glucose time)"), valueString, time))
+        }
 
         var unitStrings = [unit.glucoseUnitDisplayString]
 
         if let trend = sensor?.trendType {
-            unitStrings.append(trend.description)
+            unitStrings.append(trend.symbol)
+            accessibilityStrings.append(trend.localizedDescription)
+        }
+
+        if sensor?.isStateValid == false {
+            accessibilityStrings.append(NSLocalizedString("Needs attention", comment: "Accessibility label component for glucose HUD describing an invalid state"))
         }
 
         unitLabel.text = unitStrings.joined(separator: " ")
+        accessibilityValue = accessibilityStrings.joined(separator: ", ")
 
         UIView.animate(withDuration: 0.25, animations: { 
             self.alertLabel.alpha = sensor?.isStateValid == true ? 0 : 1
diff --git a/Loop/Views/LoopCompletionHUDView.swift b/Loop/Views/LoopCompletionHUDView.swift
index fc312ec95f..dc2b3edb89 100644
--- a/Loop/Views/LoopCompletionHUDView.swift
+++ b/Loop/Views/LoopCompletionHUDView.swift
@@ -94,12 +94,21 @@ final class LoopCompletionHUDView: HUDView {
             }
 
             if let timeString = formatter.string(from: ago) {
-                caption.text = String(format: NSLocalizedString("%@ ago", comment: "The description of the time interval since the last completion date. The format string"), timeString)
+                caption.text = String(format: NSLocalizedString("%@ ago", comment: "Format string describing the time interval since the last completion date. (1: The localized date components"), timeString)
+                accessibilityLabel = String(format: NSLocalizedString("Loop ran %@ ago", comment: "Accessbility format label describing the time interval since the last completion date. (1: The localized date components)"), timeString)
             } else {
                 caption.text = "—"
+                accessibilityLabel = nil
             }
         } else {
             caption.text = "—"
+            accessibilityLabel = NSLocalizedString("Waiting for first run", comment: "Acessibility label describing completion HUD waiting for first run")
+        }
+
+        if dosingEnabled {
+            accessibilityHint = NSLocalizedString("Closed loop", comment: "Accessibility hint describing completion HUD for a closed loop")
+        } else {
+            accessibilityHint = NSLocalizedString("Open loop", comment: "Accessbility hint describing completion HUD for an open loop")
         }
     }
 
diff --git a/Loop/Views/ReservoirVolumeHUDView.swift b/Loop/Views/ReservoirVolumeHUDView.swift
index 90ae2a71b6..8504b987d6 100644
--- a/Loop/Views/ReservoirVolumeHUDView.swift
+++ b/Loop/Views/ReservoirVolumeHUDView.swift
@@ -19,6 +19,8 @@ final class ReservoirVolumeHUDView: HUDView {
 
         tintColor = .unknownColor
         volumeLabel.isHidden = true
+
+        accessibilityValue = NSLocalizedString("Unknown", comment: "Accessibility value for an unknown value")
     }
 
     var reservoirLevel: Double? {
@@ -44,14 +46,6 @@ final class ReservoirVolumeHUDView: HUDView {
         }
     }
 
-    var lastUpdated: Date? {
-        didSet {
-            if let date = lastUpdated {
-                caption?.text = timeFormatter.string(from: date)
-            }
-        }
-    }
-
     private lazy var timeFormatter: DateFormatter = {
         let formatter = DateFormatter()
         formatter.dateStyle = .none
@@ -68,12 +62,13 @@ final class ReservoirVolumeHUDView: HUDView {
         return formatter
     }()
 
-    var reservoirVolume: Double? {
-        didSet {
-            if let volume = reservoirVolume, let units = numberFormatter.string(from: NSNumber(value: volume)) {
-                volumeLabel.text = String(format: NSLocalizedString("%@U", comment: "Format string for reservoir volume. (1: The localized volume)"), units)
-            }
+    func setReservoirVolume(volume: Double, at date: Date) {
+        if let units = numberFormatter.string(from: NSNumber(value: volume)) {
+            volumeLabel.text = String(format: NSLocalizedString("%@U", comment: "Format string for reservoir volume. (1: The localized volume)"), units)
+            let time = timeFormatter.string(from: date)
+            caption?.text = time
+
+            accessibilityValue = String(format: NSLocalizedString("%1$@ units remaining at %2$@", comment: "Accessibility format string for (1: localized volume)(2: time)"), units, time)
         }
     }
-
 }
diff --git a/WatchApp Extension/Controllers/StatusInterfaceController.swift b/WatchApp Extension/Controllers/StatusInterfaceController.swift
index 53aabb1f30..e2fc48d7fa 100644
--- a/WatchApp Extension/Controllers/StatusInterfaceController.swift	
+++ b/WatchApp Extension/Controllers/StatusInterfaceController.swift	
@@ -50,7 +50,7 @@ final class StatusInterfaceController: ContextInterfaceController {
         DispatchQueue.main.async {
             if let glucose = context?.glucose, let unit = context?.preferredGlucoseUnit {
                 let glucoseValue = glucose.doubleValue(for: unit)
-                let trend = context?.glucoseTrend?.description ?? ""
+                let trend = context?.glucoseTrend?.symbol ?? ""
 
                 self.glucoseLabel.setText((numberFormatter.string(from: NSNumber(value: glucoseValue)) ?? "") + trend)
                 self.glucoseLabel.setHidden(false)
diff --git a/WatchApp Extension/Models/GlucoseTrend.swift b/WatchApp Extension/Models/GlucoseTrend.swift
index c6bd05635c..a79e75afa7 100644
--- a/WatchApp Extension/Models/GlucoseTrend.swift	
+++ b/WatchApp Extension/Models/GlucoseTrend.swift	
@@ -6,6 +6,8 @@
 //  Copyright © 2016 Nathan Racklyeft. All rights reserved.
 //
 
+import Foundation
+
 
 enum GlucoseTrend: Int {
     case upUpUp       = 1
@@ -16,7 +18,7 @@ enum GlucoseTrend: Int {
     case downDown     = 6
     case downDownDown = 7
 
-    var description: String {
+    var symbol: String {
         switch self {
         case .upUpUp:
             return "⇈"
@@ -34,4 +36,23 @@ enum GlucoseTrend: Int {
             return "⇊"
         }
     }
+
+    var localizedDescription: String {
+        switch self {
+        case .upUpUp:
+            return NSLocalizedString("Rising very fast", comment: "Glucose trend up-up-up")
+        case .upUp:
+            return NSLocalizedString("Rising fast", comment: "Glucose trend up-up")
+        case .up:
+            return NSLocalizedString("Rising", comment: "Glucose trend up")
+        case .flat:
+            return NSLocalizedString("Flat", comment: "Glucose trend flat")
+        case .down:
+            return NSLocalizedString("Falling", comment: "Glucose trend down")
+        case .downDown:
+            return NSLocalizedString("Falling fast", comment: "Glucose trend down-down")
+        case .downDownDown:
+            return NSLocalizedString("Falling very fast", comment: "Glucose trend down-down-down")
+        }
+    }
 }

From e2646701fd750c7b41909f6d6f9a7c3c5bea215d Mon Sep 17 00:00:00 2001
From: Nathan Racklyeft <loudnate@gmail.com>
Date: Tue, 27 Sep 2016 22:07:54 -0700
Subject: [PATCH 2/2] Fixing a crash when displaying the max bolus error

Fixes #33
---
 Loop/View Controllers/BolusViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Loop/View Controllers/BolusViewController.swift b/Loop/View Controllers/BolusViewController.swift
index 3e25295582..634aa91eaf 100644
--- a/Loop/View Controllers/BolusViewController.swift	
+++ b/Loop/View Controllers/BolusViewController.swift	
@@ -55,7 +55,7 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
         }
 
         guard bolus <= maxBolus else {
-            presentAlertController(withTitle: NSLocalizedString("Maximum Bolus", comment: "The title of the alert describing a maximum bolus validation error"), message: String(format: NSLocalizedString("The maximum bolus amount is %@ Units", comment: "Body of the alert describing a maximum bolus validation error. (1: The localized max bolus value)"), maxBolus))
+            presentAlertController(withTitle: NSLocalizedString("Exceeds Maximum Bolus", comment: "The title of the alert describing a maximum bolus validation error"), message: String(format: NSLocalizedString("The maximum bolus amount is %@ Units", comment: "Body of the alert describing a maximum bolus validation error. (1: The localized max bolus value)"), decimalFormatter.string(from: NSNumber(value: maxBolus)) ?? ""))
             return
         }