Merge complications changes back into dev (they were accidentally mer…

…ged to master)

Loop/Managers/StatusExtensionDataManager.swift

@@ -109,6 +109,7 @@ extension StatusExtensionDataManager: CustomDebugStringConvertible {
     var debugDescription: String {
         return [
             "## StatusExtensionDataManager",
+            "appGroupName: \(Bundle.main.appGroupSuiteName)",
             "statusExtensionContext: \(String(reflecting: defaults?.statusExtensionContext))"
         ].joined(separator: "\n")
     }

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

@@ -7,4 +7,10 @@
 */
 
 /* The complication template example unit string */
-"mg/dL" = "mg/dL"
+"120↘︎" = "120↘︎";
+
+/* Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Time) */
+"UtilitarianSmallFlat" = "%1@ %2@";
+
+/* Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Eventual Glucose) (3: Time) */
+"UtilitarianLargeFlat" = "%1@%2@ %3@";

Loop/gallery.ckcomplication/complicationManifest.json

@@ -1,6 +1,10 @@
 {
   "supported complication families" : {
-    "0" : "A307227B-6EFF-4242-A538-2C9AC617E041.json"
+    "3" : "CFB33AC2-7CD0-43A0-804F-F9A0EEC37480.json",
+    "6" : "E87B02EB-57B2-4E9D-B371-E0BA2DD55C19.json",
+    "4" : "B922BD0B-9601-45C9-B84D-ECB9C8235322.json",
+    "0" : "69B78E1F-415D-4E9E-8E56-E486517658FC.json",
+    "7" : "AB5AF86D-FF8F-493B-A738-4BB590C8A45E.json"
   },
   "client ID" : "com.loudnate.Loop.watchkitapp.watchkitextension"
 }

README.md

@@ -92,7 +92,9 @@ Bluetooth LE communication with Minimed pumps is enabled by the [RileyLink](http
 
 [Sign up for the Loop Users announcement list](https://groups.google.com/forum/#!forum/loop-ios-users) to stay informed of critical issues that may arise.
 
-[Please visit the Wiki for a "Guide to Loop" setup, installation, FAQs, and use.](https://github.com/LoopKit/Loop/wiki)
+Please use the [Guide to Loop](https://github.com/LoopKit/Loop/wiki/Guide) for building, installation, and configuration instructions.
+
+For FAQs and other tips, refer to the [Wiki](https://github.com/LoopKit/Loop/wiki)
 
 (Note: there is also a tab for the Wiki at the top of this page)
 

WatchApp Extension/Base.lproj/ckcomplication.strings

@@ -7,4 +7,10 @@
 */
 
 /* The complication template example unit string */
-"mg/dL" = "mg/dL"
+"120↘︎" = "120↘︎";
+
+/* Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Time) */
+"UtilitarianSmallFlat" = "%1@ %2@";
+
+/* Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Eventual Glucose) (3: Time) */
+"UtilitarianLargeFlat" = "%1@%2@ %3@";

WatchApp Extension/ComplicationController.swift

@@ -43,21 +43,14 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     private lazy var formatter = NumberFormatter()
 
     func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: (@escaping (CLKComplicationTimelineEntry?) -> Void)) {
-
-        switch complication.family {
-        case .modularSmall:
-            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))),
-                let date = context.glucoseDate, date.timeIntervalSinceNow.minutes >= -15,
-                let template = CLKComplicationTemplateModularSmallStackText(line1: glucoseString, date: date)
-            {
-                handler(CLKComplicationTimelineEntry(date: date, complicationTemplate: template))
-            } else {
-                handler(nil)
-            }
-        default:
+        if  let context = ExtensionDelegate.shared().lastContext,
+            let glucoseDate = context.glucoseDate,
+            glucoseDate.timeIntervalSinceNow.minutes >= -15,
+            let template = CLKComplicationTemplate.templateForFamily(complication.family, from: context)
+        {
+            template.tintColor = UIColor.tintColor
+            handler(CLKComplicationTimelineEntry(date: glucoseDate, complicationTemplate: template))
+        } else {
             handler(nil)
         }
     }
@@ -69,13 +62,12 @@ 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 = ExtensionDelegate.shared().lastContext,
-            let glucose = context.glucose,
-            let unit = context.preferredGlucoseUnit,
-            let glucoseString = formatter.string(from: NSNumber(value: glucose.doubleValue(for: unit))),
-            let glucoseDate = context.glucoseDate, glucoseDate.timeIntervalSince(date) > 0,
-            let template = CLKComplicationTemplateModularSmallStackText(line1: glucoseString, date: glucoseDate)
+        if  let context = ExtensionDelegate.shared().lastContext,
+            let glucoseDate = context.glucoseDate,
+            glucoseDate.timeIntervalSince(date) > 0,
+            let template = CLKComplicationTemplate.templateForFamily(complication.family, from: context)
         {
+            template.tintColor = UIColor.tintColor
             handler([CLKComplicationTimelineEntry(date: glucoseDate, complicationTemplate: template)])
         } else {
             handler(nil)
@@ -85,16 +77,41 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     // MARK: - Placeholder Templates
 
     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.localizableTextProvider(withStringsFileTextKey: "mg/dL")
+        let template: CLKComplicationTemplate?
+
+        let glucoseText = CLKSimpleTextProvider.localizableTextProvider(withStringsFileTextKey: "120↘︎", shortTextKey: "120")
+        let timeText = CLKTimeTextProvider(date: Date())
 
-            handler(template)
+        switch complication.family {
+        case .modularSmall:
+            let modularSmall = CLKComplicationTemplateModularSmallStackText()
+            modularSmall.line1TextProvider = glucoseText
+            modularSmall.line2TextProvider = timeText
+            template = modularSmall
+        case .circularSmall:
+            let circularSmall = CLKComplicationTemplateCircularSmallSimpleText()
+            circularSmall.textProvider = glucoseText
+            template = circularSmall
+        case .extraLarge:
+            let extraLarge = CLKComplicationTemplateExtraLargeStackText()
+            extraLarge.line1TextProvider = glucoseText
+            extraLarge.line2TextProvider = timeText
+            template = extraLarge
+        case .utilitarianSmallFlat:
+            let utilitarianSmallFlat = CLKComplicationTemplateUtilitarianSmallFlat()
+            utilitarianSmallFlat.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianSmallFlat", textProviders: [glucoseText, timeText])
+            template = utilitarianSmallFlat
+        case .utilitarianLarge:
+            let utilitarianLarge = CLKComplicationTemplateUtilitarianLargeFlat()
+            let eventualGlucoseText = CLKSimpleTextProvider.localizableTextProvider(withStringsFileTextKey: "75")
+            utilitarianLarge.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianLargeFlat", textProviders: [glucoseText, eventualGlucoseText, timeText])
+            template = utilitarianLarge
         default:
-            handler(nil)
+            template = nil
         }
+
+        template?.tintColor = UIColor.tintColor
+        handler(template)
     }
 }

WatchApp Extension/Extensions/CLKComplicationTemplate.swift

@@ -10,17 +10,69 @@ import ClockKit
 import Foundation
 
 
-extension CLKComplicationTemplateModularSmallStackText {
+extension CLKComplicationTemplate {
 
-    convenience init?(line1: String?, date: Date?) {
-        guard let line1 = line1, let date = date else {
+    static func templateForFamily(_ family: CLKComplicationFamily, from context: WatchContext) -> CLKComplicationTemplate? {
+
+        guard let glucose = context.glucose,
+            let unit = context.preferredGlucoseUnit
+        else {
             return nil
         }
 
-        self.init()
+        let formatter = NumberFormatter.glucoseFormatter(for: unit)
 
-        line1TextProvider = CLKSimpleTextProvider(text: line1)
-        line2TextProvider = CLKTimeTextProvider(date: date)
-    }
+        guard let glucoseString = formatter.string(from: NSNumber(value: glucose.doubleValue(for: unit))),
+            let date = context.glucoseDate else
+        {
+            return nil
+        }
+
+        var glucoseStrings = [glucoseString]
+        var accessibilityStrings = [glucoseString]
+        var eventualGlucoseText: CLKSimpleTextProvider?
+
+        if let trend = context.glucoseTrend {
+            glucoseStrings.append(trend.symbol)
+            accessibilityStrings.append(trend.localizedDescription)
+        }
 
+        if  let eventualGlucose = context.eventualGlucose,
+            let eventualGlucoseString = formatter.string(from: NSNumber(value: eventualGlucose.doubleValue(for: unit)))
+        {
+            eventualGlucoseText = CLKSimpleTextProvider(text: eventualGlucoseString)
+        }
+
+        let glucoseText = CLKSimpleTextProvider(text: glucoseStrings.joined(), shortText: glucoseString, accessibilityLabel: accessibilityStrings.joined(separator: ", "))
+        let timeText = CLKTimeTextProvider(date: date)
+
+        switch family {
+        case .modularSmall:
+            let template = CLKComplicationTemplateModularSmallStackText()
+            template.line1TextProvider = glucoseText
+            template.line2TextProvider = timeText
+            return template
+        case .circularSmall:
+            let template = CLKComplicationTemplateCircularSmallSimpleText()
+            template.textProvider = glucoseText
+            return template
+        case .extraLarge:
+            let template = CLKComplicationTemplateExtraLargeStackText()
+            template.line1TextProvider = glucoseText
+            template.line2TextProvider = timeText
+            return template
+        case .utilitarianSmallFlat:
+            let template = CLKComplicationTemplateUtilitarianSmallFlat()
+            template.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianSmallFlat", textProviders: [glucoseText, timeText])
+            return template
+        case .utilitarianLarge:
+            let template = CLKComplicationTemplateUtilitarianLargeFlat()
+            let providers: [CLKTextProvider?] = [glucoseText, eventualGlucoseText, timeText]
+
+            template.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianLargeFlat", textProviders: providers.flatMap({ $0 }))
+            return template
+        default:
+            return nil
+        }
+    }
 }

WatchApp Extension/Info.plist

@@ -27,6 +27,10 @@
 	<key>CLKComplicationSupportedFamilies</key>
 	<array>
 		<string>CLKComplicationFamilyModularSmall</string>
+		<string>CLKComplicationFamilyCircularSmall</string>
+		<string>CLKComplicationFamilyExtraLarge</string>
+		<string>CLKComplicationFamilyUtilitarianSmallFlat</string>
+		<string>CLKComplicationFamilyUtilitarianLarge</string>
 	</array>
 	<key>NSExtension</key>
 	<dict>