Refactor HUD views into LoopUI framework (#284) (#330)

* Rough cut at moving HUD views into their own framework.

* Move view code into the HUDViewKit framework directory

* Remove HUDViewKit

* Add GlucoseTrend and NSTimeInterval directly to WatchApp Extension so that it doesn't have to pull in HUDViewKit

* Get all targets to compile with HUDViewKit

1. Make HKUnit extension internal and included it directly into all
   necessary targets to avoid a conflict with the same extension in
   LoopKit

2. Publicize any necessary HUDViewKit vars, funcs

3. Store the Int raw value for GlucoseTrend in WatchContext and create
   a computed property that returns it as a GlucoseTrend object to avoid
   the conflict where both Loop and WatchApp Extension have their own
   separate concept of GlucoseTrend.

* Rename HUDViewKit to LoopUI

* partway through moving layout

* WIP

* Resize stack view to fill container view

* Embed LoopUI framework

* Use NibLoadable for HUDView

Author: Bharat Mediratta

Loop Status Extension/Base.lproj/MainInterface.storyboard

@@ -9,6 +9,7 @@
 
 import Foundation
 import HealthKit
+import LoopUI
 
 struct ReservoirContext {
     let startDate: Date

Loop Status Extension/StatusExtensionContext.swift

@@ -6,20 +6,47 @@
 //  Copyright © 2016 LoopKit Authors. All rights reserved.
 //
 
-import UIKit
-import NotificationCenter
-import HealthKit
 import CoreData
+import HealthKit
+import LoopUI
+import NotificationCenter
+import UIKit
 
 class StatusViewController: UIViewController, NCWidgetProviding {
-    
-    @IBOutlet weak var loopCompletionHUD: LoopCompletionHUDView!
-    @IBOutlet weak var glucoseHUD: GlucoseHUDView!
-    @IBOutlet weak var basalRateHUD: BasalRateHUDView!
-    @IBOutlet weak var reservoirVolumeHUD: ReservoirVolumeHUDView!
-    @IBOutlet weak var batteryHUD: BatteryLevelHUDView!
+
+    @IBOutlet weak var hudView: HUDView!
     @IBOutlet weak var subtitleLabel: UILabel!
-    
+
+    var loopCompletionHUD: LoopCompletionHUDView! {
+        get {
+            return hudView.loopCompletionHUD
+        }
+    }
+
+    var glucoseHUD: GlucoseHUDView! {
+        get {
+            return hudView.glucoseHUD
+        }
+    }
+
+    var basalRateHUD: BasalRateHUDView! {
+        get {
+            return hudView.basalRateHUD
+        }
+    }
+
+    var reservoirVolumeHUD: ReservoirVolumeHUDView! {
+        get {
+            return hudView.reservoirVolumeHUD
+        }
+    }
+
+    var batteryHUD: BatteryLevelHUDView! {
+        get {
+            return hudView.batteryHUD
+        }
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
         subtitleLabel.alpha = 0

Loop Status Extension/StatusViewController.swift

@@ -14,6 +14,7 @@ import GlucoseKit
 import HealthKit
 import InsulinKit
 import LoopKit
+import LoopUI
 import MinimedKit
 import NightscoutUploadKit
 import RileyLinkKit

Loop.xcodeproj/project.pbxproj

@@ -118,7 +118,7 @@ final class WatchDataManager: NSObject, WCSessionDelegate {
                     context.maxBolus = maxBolus
 
                     if let trend = self.deviceDataManager.sensorInfo?.trendType {
-                        context.glucoseTrend = trend
+                        context.glucoseTrendRawValue = trend.rawValue
                     }
 
                     completionHandler(context)

Loop/Base.lproj/Main.storyboard

@@ -7,15 +7,16 @@
 //
 
 import Foundation
+import LoopUI
 import xDripG5
 
 
 extension Glucose: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         return state == .ok && status == .ok
     }
 
-    var stateDescription: String {
+    public var stateDescription: String {
         let status: String
         switch self.status {
         case .ok:
@@ -29,7 +30,7 @@ extension Glucose: SensorDisplayable {
         return String(format: "%1$@ %2$@", String(describing: state), status)
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: GlucoseTrend? {
         guard trend < Int(Int8.max) else {
             return nil
         }
@@ -52,7 +53,7 @@ extension Glucose: SensorDisplayable {
         }
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return true
     }
 }

Loop/Managers/DeviceDataManager.swift

@@ -10,6 +10,7 @@ import Foundation
 import G4ShareSpy
 import HealthKit
 import LoopKit
+import LoopUI
 
 
 extension GlucoseG4: GlucoseValue {
@@ -24,23 +25,23 @@ extension GlucoseG4: GlucoseValue {
 
 
 extension GlucoseG4: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         return glucose >= 20
     }
 
-    var stateDescription: String {
+    public var stateDescription: String {
         if isStateValid {
             return NSLocalizedString("OK", comment: "Sensor state description for the valid state")
         } else {
             return NSLocalizedString("Needs Attention", comment: "Sensor state description for the non-valid state")
         }
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: GlucoseTrend? {
         return GlucoseTrend(rawValue: Int(trend))
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return true
     }
 }

Loop/Managers/WatchDataManager.swift

@@ -7,11 +7,12 @@
 //
 
 import LoopKit
+import LoopUI
 import MinimedKit
 
 
 extension MySentryPumpStatusMessageBody: SensorDisplayable {
-    var isStateValid: Bool {
+    public var isStateValid: Bool {
         switch glucose {
         case .active, .off:
             return true
@@ -20,7 +21,7 @@ extension MySentryPumpStatusMessageBody: SensorDisplayable {
         }
     }
 
-    var trendType: GlucoseTrend? {
+    public var trendType: LoopUI.GlucoseTrend? {
         guard case .active = glucose else {
             return nil
         }
@@ -39,7 +40,7 @@ extension MySentryPumpStatusMessageBody: SensorDisplayable {
         }
     }
 
-    var isLocal: Bool {
+    public var isLocal: Bool {
         return true
     }