Generalize service implementations (#26)

* Generalize service implementations

- Implement general ServicesManager and service serialization/restoration
- Move GlucoseThreshold and TempBasalRecommendation to LoopKit
- Move NightscoutUploader to NightscoutService
- Move Amplitude, Loggly, and Nightscout service implementations to respective repos
- Implement generalized LoggingServicesManager, AnalyticsServicesManager, and RemoteDataServicesManager to connect to specific services
- Refactor Analytics singleton to injectable implementation
- Remove unused MLabService KeyChain extension
- Refactor SettingsTableViewController to generalize service setup

Author: darinkrauss

Common/Extensions/UserDefaults+Services.swift

@@ -0,0 +1,26 @@
+//
+//  UserDefaults+Services.swift
+//  Loop
+//
+//  Created by Darin Krauss on 5/20/19.
+//  Copyright © 2019 LoopKit Authors. All rights reserved.
+//
+
+import LoopKit
+
+extension UserDefaults {
+
+    private enum Key: String {
+        case servicesState = "com.loopkit.Loop.ServicesState"
+    }
+
+    var servicesState: [Service.RawStateValue] {
+        get {
+            return array(forKey: Key.servicesState.rawValue) as? [[String: Any]] ?? []
+        }
+        set {
+            set(newValue, forKey: Key.servicesState.rawValue)
+        }
+    }
+
+}

Loop.xcodeproj/project.pbxproj

@@ -8,28 +8,37 @@
 
 import UIKit
 import Intents
+import LoopCore
 import LoopKit
 import UserNotifications
 
 @UIApplicationMain
 final class AppDelegate: UIResponder, UIApplicationDelegate {
 
-    private lazy var log = DiagnosticLogger.shared.forCategory("AppDelegate")
+    private lazy var log = DiagnosticLog(category: "AppDelegate")
 
-    var window: UIWindow?
+    private lazy var servicesManager = ServicesManager()
+
+    private lazy var analyticsServicesManager = AnalyticsServicesManager(servicesManager: servicesManager)
+
+    private lazy var loggingServicesManager = LoggingServicesManager(servicesManager: servicesManager)
 
-    private(set) lazy var deviceManager = DeviceDataManager()
+    private lazy var deviceManager = DeviceDataManager(servicesManager: servicesManager, analyticsServicesManager: analyticsServicesManager)
+
+    var window: UIWindow?
 
     private var rootViewController: RootNavigationController! {
         return window?.rootViewController as? RootNavigationController
     }
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        SharedLoggingService.instance = loggingServicesManager
+
         NotificationManager.authorize(delegate: self)
 
         log.info(#function)
 
-        AnalyticsManager.shared.application(application, didFinishLaunchingWithOptions: launchOptions)
+        analyticsServicesManager.application(application, didFinishLaunchingWithOptions: launchOptions)
 
         rootViewController.rootViewController.deviceManager = deviceManager
 
@@ -58,7 +67,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
         if #available(iOS 12.0, *) {
             if userActivity.activityType == NewCarbEntryIntent.className {
-                log.default("Restoring \(userActivity.activityType) intent")
+                log.default("Restoring %{public}@ intent", userActivity.activityType)
                 rootViewController.restoreUserActivityState(.forNewCarbEntry())
                 return true
             }
@@ -67,7 +76,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         switch userActivity.activityType {
         case NSUserActivity.newCarbEntryActivityType,
              NSUserActivity.viewLoopStatusActivityType:
-            log.default("Restoring \(userActivity.activityType) activity")
+            log.default("Restoring %{public}@ activity", userActivity.activityType)
             restorationHandler([rootViewController])
             return true
         default:
@@ -85,7 +94,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
                 let startDate = response.notification.request.content.userInfo[NotificationManager.UserInfoKey.bolusStartDate.rawValue] as? Date,
                 startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5)
             {
-                AnalyticsManager.shared.didRetryBolus()
+                analyticsServicesManager.didRetryBolus()
 
                 deviceManager.enactBolus(units: units, at: startDate) { (_) in
                     completionHandler()

Loop/AppDelegate.swift

@@ -73,21 +73,21 @@
 /* Title text for button to set up a new pump */
 "Add Pump" = "Add Pump";
 
+/* Title text for button to set up a service */
+"Add Service" = "Add Service";
+
+/* Button title to delete a service */
+"Delete Service" = "Delete Service";
+
+/* Confirmation message for deleting a service */
+"Are you sure you want to delete this service?" = "Are you sure you want to delete this service?";
+
 /* The title of the section containing algorithm settings */
 "Algorithm Settings" = "Algorithm Settings";
 
-/* The title of the Amplitude service */
-"Amplitude" = "Amplitude";
-
 /* Subtitle of Rapid-Acting – Children preset */
 "An adjustment to the adult model based on empirical effects in children." = "An adjustment to the adult model based on empirical effects in children.";
 
-/* The title of the amplitude API key credential */
-"API Key" = "API Key";
-
-/* The title of the nightscout API secret credential */
-"API Secret" = "API Secret";
-
 /* Format fragment for a specific time */
 "at %@" = "at %@";
 
@@ -155,9 +155,6 @@
 /* Message when offering bolus recommendation even though bg is below range. (1: glucose value) */
 "Current glucose of %1$@ is below correction range." = " Current glucose of %1$@ is below correction range.";
 
-/* The title of the Loggly customer token credential */
-"Customer Token" = "Customer Token";
-
 /* The short unit display string for decibles */
 "dB" = "dB";
 
@@ -215,9 +212,6 @@
 /* Title of the prediction input effect for glucose momentum */
 "Glucose Momentum" = "Glucose Momentum";
 
-/* The placeholder text for the nightscout site URL credential */
-"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";
-
 /* The title of a target alert action specifying an indefinitely long workout targets duration */
 "Indefinitely" = "Indefinitely";
 
@@ -256,9 +250,6 @@
 /* The loading message for the diagnostic report screen */
 "Loading..." = "Loading...";
 
-/* The title of the loggly service */
-"Loggly" = "Loggly";
-
 /* The notification title for a loop failure */
 "Loop Failure" = "Loop Failure";
 
@@ -280,9 +271,6 @@
 /* Sensor state description for the non-valid state */
 "Needs Attention" = "Needs Attention";
 
-/* The title of the Nightscout service */
-"Nightscout" = "Nightscout";
-
 /* The error message displayed for device connection errors. */
 "No connected devices, or failure during device connection" = "No connected devices, or failure during device connection";
 
@@ -349,9 +337,6 @@
 /* Format fragment for a start time */
 "since %@" = "since %@";
 
-/* The title of the nightscout site URL credential */
-"Site URL" = "Site URL";
-
 /* The title text for the Medtronic sensor switch cell */
 "Sof-Sensor / Enlite" = "Sof-Sensor / Enlite";
 

Loop/Base.lproj/Localizable.strings

@@ -0,0 +1,17 @@
+//
+//  DiagnosticLog+Subsystem.swift
+//  Loop
+//
+//  Created by Darin Krauss on 6/12/19.
+//  Copyright © 2019 LoopKit Authors. All rights reserved.
+//
+
+import LoopKit
+
+extension DiagnosticLog {
+
+    convenience init(category: String) {
+        self.init(subsystem: "com.loopkit.Loop", category: category)
+    }
+
+}

Loop/Extensions/DiagnosticLog+Subsystem.swift

@@ -125,6 +125,30 @@ extension UIAlertController {
         }
     }
 
+    /// Initializes an action sheet-styled controller for selecting a service UI.
+    ///
+    /// - Parameters:
+    ///   - serviceUITypes: An array of service UI types.
+    ///   - selectionHandler: A closure to execute when a service UI is selected.
+    ///   - service: The selected service UI type.
+    internal convenience init(serviceUITypes: [ServiceUI.Type], selectionHandler: @escaping (_ serviceUIType: ServiceUI.Type) -> Void) {
+        self.init(
+            title: NSLocalizedString("Add Service", comment: "Action sheet title selecting service"),
+            message: nil,
+            preferredStyle: .actionSheet
+        )
+
+        for serviceUIType in serviceUITypes {
+            addAction(UIAlertAction(
+                title: serviceUIType.localizedTitle,
+                style: .default,
+                handler: { (_) in
+                    selectionHandler(serviceUIType)
+                }
+            ))
+        }
+    }
+
     internal func addCancelAction(handler: ((UIAlertAction) -> Void)? = nil) {
         let cancel = NSLocalizedString("Cancel", comment: "The title of the cancel action in an action sheet")
         addAction(UIAlertAction(title: cancel, style: .cancel, handler: handler))