watchOS 3 support

Loop/gallery.ckcomplication/A307227B-6EFF-4242-A538-2C9AC617E041.json

@@ -0,0 +1,15 @@
+{
+  "class" : "CLKComplicationTemplateModularSmallStackText",
+  "highlightLine2" : false,
+  "line2TextProvider" : {
+    "class" : "CLKLocalizableSimpleTextProvider",
+    "text" : "mg\/dL"
+  },
+  "line1TextProvider" : {
+    "shortText" : "--",
+    "class" : "CLKSimpleTextProvider",
+    "text" : "--",
+    "accessibilityLabel" : "No glucose value available"
+  },
+  "version" : 30000
+}

Loop/gallery.ckcomplication/Base.lproj/ckcomplication.strings

@@ -0,0 +1,10 @@
+/* 
+  ckcomplication.strings
+  Loop
+
+  Created by Nate Racklyeft on 9/18/16.
+  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+*/
+
+/* The complication template example unit string */
+"mg/dL" = "mg/dL"

Loop/gallery.ckcomplication/complicationManifest.json

@@ -0,0 +1,6 @@
+{
+  "supported complication families" : {
+    "0" : "A307227B-6EFF-4242-A538-2C9AC617E041.json"
+  },
+  "client ID" : "com.loudnate.Loop.watchkitapp.watchkitextension"
+}

WatchApp Extension/Base.lproj/ckcomplication.strings

@@ -0,0 +1,10 @@
+/* 
+  ckcomplication.strings
+  Loop
+
+  Created by Nate Racklyeft on 9/18/16.
+  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+*/
+
+/* The complication template example unit string */
+"mg/dL" = "mg/dL"

WatchApp Extension/ComplicationController.swift

@@ -7,6 +7,7 @@
 //
 
 import ClockKit
+import WatchKit
 
 
 final class ComplicationController: NSObject, CLKComplicationDataSource {
@@ -18,15 +19,15 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     }
 
     func getTimelineStartDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) {
-        if let date = DeviceDataManager.sharedManager.lastContextData?.glucoseDate {
+        if let date = ExtensionDelegate.shared().lastContext?.glucoseDate {
             handler(date as Date)
         } else {
             handler(nil)
         }
     }
 
     func getTimelineEndDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) {
-        if let date = DeviceDataManager.sharedManager.lastContextData?.glucoseDate {
+        if let date = ExtensionDelegate.shared().lastContext?.glucoseDate {
             handler(date as Date)
         } else {
             handler(nil)
@@ -45,7 +46,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
 
         switch complication.family {
         case .modularSmall:
-            if let context = DeviceDataManager.sharedManager.lastContextData,
+            if let context = ExtensionDelegate.shared().lastContext,
                 let glucose = context.glucose,
                 let unit = context.preferredGlucoseUnit,
                 let glucoseString = formatter.string(from: NSNumber(value: glucose.doubleValue(for: unit))),
@@ -68,7 +69,7 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
 
     func getTimelineEntries(for complication: CLKComplication, after date: Date, limit: Int, withHandler handler: (@escaping ([CLKComplicationTimelineEntry]?) -> Void)) {
         // Call the handler with the timeline entries after to the given date
-        if let context = DeviceDataManager.sharedManager.lastContextData,
+        if let context = ExtensionDelegate.shared().lastContext,
             let glucose = context.glucose,
             let unit = context.preferredGlucoseUnit,
             let glucoseString = formatter.string(from: NSNumber(value: glucose.doubleValue(for: unit))),
@@ -81,35 +82,19 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         }
     }
 
-    func requestedUpdateDidBegin() {
-        DeviceDataManager.sharedManager.updateComplicationDataIfNeeded()
-    }
-
-    func requestedUpdateBudgetExhausted() {
-        // TODO: os_log_info in iOS 10
-    }
-
-    // MARK: - Update Scheduling
-
-    func getNextRequestedUpdateDate(handler: @escaping (Date?) -> Void) {
-        // Call the handler with the date when you would next like to be given the opportunity to update your complication content
-        handler(Date(timeIntervalSinceNow: TimeInterval(2 * 60 * 60)))
-    }
-
     // MARK: - Placeholder Templates
-    
-    func getPlaceholderTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) {
+
+    func getLocalizableSampleTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) {
         switch complication.family {
         case .modularSmall:
             let template = CLKComplicationTemplateModularSmallStackText()
 
             template.line1TextProvider = CLKSimpleTextProvider(text: "--", shortText: "--", accessibilityLabel: "No glucose value available")
-            template.line2TextProvider = CLKSimpleTextProvider(text: "mg/dL")
+            template.line2TextProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileTextKey: "mg/dL")
 
             handler(template)
         default:
             handler(nil)
         }
     }
-
 }

WatchApp Extension/Controllers/AddCarbsInterfaceController.swift

@@ -7,7 +7,7 @@
 //
 
 import WatchKit
-import Foundation
+import WatchConnectivity
 
 
 final class AddCarbsInterfaceController: WKInterfaceController, IdentifiableClass {
@@ -98,7 +98,23 @@ final class AddCarbsInterfaceController: WKInterfaceController, IdentifiableClas
         if carbValue > 0 {
             let entry = CarbEntryUserInfo(value: Double(carbValue), absorptionTimeType: absorptionTime, startDate: Date())
 
-            DeviceDataManager.sharedManager.sendCarbEntry(entry)
+            do {
+                try WCSession.default().sendCarbEntryMessage(entry,
+                    replyHandler: { (suggestion) in
+                        WKExtension.shared().rootInterfaceController?.presentController(withName: BolusInterfaceController.className, context: suggestion)
+                    },
+                    errorHandler: { (error) in
+                        ExtensionDelegate.shared().present(error)
+                    }
+                )
+            } catch {
+                presentAlert(withTitle: NSLocalizedString("Send Failed", comment: "The title of the alert controller displayed after a carb entry send attempt fails"),
+                    message: NSLocalizedString("Make sure your iPhone is nearby and try again", comment: "The recovery message displayed after a carb entry send attempt fails"),
+                    preferredStyle: .alert,
+                    actions: [WKAlertAction.dismissAction()]
+                )
+                return
+            }
         }
 
         dismiss()

WatchApp Extension/Controllers/BolusInterfaceController.swift

@@ -8,6 +8,7 @@
 
 import WatchKit
 import Foundation
+import WatchConnectivity
 
 
 final class BolusInterfaceController: WKInterfaceController, IdentifiableClass {
@@ -130,16 +131,19 @@ final class BolusInterfaceController: WKInterfaceController, IdentifiableClass {
     @IBAction func deliver() {
         if bolusValue > 0 {
             let bolus = SetBolusUserInfo(value: bolusValue, startDate: Date())
+
             do {
-                try DeviceDataManager.sharedManager.sendSetBolus(bolus)
-            } catch DeviceDataManagerError.reachabilityError {
-                presentAlert(withTitle: NSLocalizedString("Bolus Failed", comment: "The title of the alert controller displayed after a bolus attempt fails"),
+                try WCSession.default().sendBolusMessage(bolus) { (error) in
+                    ExtensionDelegate.shared().present(error)
+                }
+            } catch {
+                presentAlert(
+                    withTitle: NSLocalizedString("Bolus Failed", comment: "The title of the alert controller displayed after a bolus attempt fails"),
                     message: NSLocalizedString("Make sure your iPhone is nearby and try again", comment: "The recovery message displayed after a bolus attempt fails"),
                     preferredStyle: .alert,
                     actions: [WKAlertAction.dismissAction()]
                 )
                 return
-            } catch {
             }
         }
 

WatchApp Extension/Controllers/ContextUpdatable.swift

@@ -0,0 +1,14 @@
+//
+//  ContextUpdatable.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 9/19/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import Foundation
+
+
+protocol ContextUpdatable {
+    func update(with context: WatchContext?)
+}

WatchApp Extension/Controllers/NotificationController.swift

@@ -30,10 +30,8 @@ final class NotificationController: WKUserNotificationInterfaceController {
         super.didDeactivate()
     }
 
-    /*
     override func didReceive(_ notification: UNNotification, withCompletion completionHandler: @escaping (WKUserNotificationInterfaceType) -> Void) {
         completionHandler(.default)
     }
-    */
 
 }