Merge pull request #392 from LoopKit/complications

ps2 · web-flow · commit 514ce93e19c4 · 2017-03-05T21:42:32.000-06:00
Fixing truncated utilitarian small complication
diff --git a/Loop/gallery.ckcomplication/11076976-F7D6-460C-845C-10C8A7003F0D.json b/Loop/gallery.ckcomplication/11076976-F7D6-460C-845C-10C8A7003F0D.json
@@ -18,10 +18,8 @@
         "text" : "75"
       },
       {
-        "class" : "CLKRelativeDateTextProvider",
-        "relativeDateStyle" : 0,
-        "calendarUnits" : 64,
-        "date" : 509858751.802992
+        "class" : "CLKTimeTextProvider",
+        "date" : 510206747.733748
       }
     ],
     "class" : "CLKLocalizableCompoundTextProvider",
diff --git a/Loop/gallery.ckcomplication/28C71A33-1C97-4A92-8677-4FE8644380DF.json b/Loop/gallery.ckcomplication/28C71A33-1C97-4A92-8677-4FE8644380DF.json
@@ -16,6 +16,6 @@
     "class" : "CLKRelativeDateTextProvider",
     "relativeDateStyle" : 0,
     "calendarUnits" : 64,
-    "date" : 509858751.805835
+    "date" : 510206747.738849
   }
 }
diff --git a/Loop/gallery.ckcomplication/2E750127-9918-4653-8B91-FC0AB09DF91F.json b/Loop/gallery.ckcomplication/2E750127-9918-4653-8B91-FC0AB09DF91F.json
@@ -11,7 +11,7 @@
     "class" : "CLKRelativeDateTextProvider",
     "relativeDateStyle" : 0,
     "calendarUnits" : 64,
-    "date" : 509858751.798859
+    "date" : 510206747.724802
   },
   "version" : 30000,
   "line1TextProvider" : {
diff --git a/Loop/gallery.ckcomplication/30ACFC76-BFF3-4761-9345-5C169460F920.json b/Loop/gallery.ckcomplication/30ACFC76-BFF3-4761-9345-5C169460F920.json
diff --git a/Loop/gallery.ckcomplication/38411872-4973-48F3-AC34-504D40170A49.json b/Loop/gallery.ckcomplication/38411872-4973-48F3-AC34-504D40170A49.json
diff --git a/Loop/gallery.ckcomplication/59939B64-2F84-4438-8860-91BB63BE827B.json b/Loop/gallery.ckcomplication/59939B64-2F84-4438-8860-91BB63BE827B.json
@@ -0,0 +1,15 @@
+{
+  "tintColor" : {
+    "green" : 0.5843138,
+    "red" : 1,
+    "alpha" : 1,
+    "blue" : 0
+  },
+  "class" : "CLKComplicationTemplateUtilitarianSmallFlat",
+  "textProvider" : {
+    "shortText" : "120",
+    "class" : "CLKLocalizableSimpleTextProvider",
+    "text" : "120↘︎"
+  },
+  "version" : 30000
+}
diff --git a/Loop/gallery.ckcomplication/688917AC-E1E4-4B66-9B44-6EE17F1D19DB.json b/Loop/gallery.ckcomplication/688917AC-E1E4-4B66-9B44-6EE17F1D19DB.json
@@ -0,0 +1,15 @@
+{
+  "tintColor" : {
+    "green" : 0.5843138,
+    "red" : 1,
+    "alpha" : 1,
+    "blue" : 0
+  },
+  "class" : "CLKComplicationTemplateUtilitarianSmallFlat",
+  "textProvider" : {
+    "shortText" : "120",
+    "class" : "CLKLocalizableSimpleTextProvider",
+    "text" : "120↘︎"
+  },
+  "version" : 30000
+}
diff --git a/Loop/gallery.ckcomplication/7F6C7226-52B7-406D-ACD2-7AB92587CBB4.json b/Loop/gallery.ckcomplication/7F6C7226-52B7-406D-ACD2-7AB92587CBB4.json
diff --git a/Loop/gallery.ckcomplication/AF8DC7FB-6148-4322-BE40-6D6DD3C963A9.json b/Loop/gallery.ckcomplication/AF8DC7FB-6148-4322-BE40-6D6DD3C963A9.json
@@ -11,7 +11,7 @@
     "class" : "CLKRelativeDateTextProvider",
     "relativeDateStyle" : 0,
     "calendarUnits" : 64,
-    "date" : 509858751.81526
+    "date" : 510206747.748279
   },
   "version" : 30000,
   "line1TextProvider" : {
diff --git a/Loop/gallery.ckcomplication/Base.lproj/ckcomplication.strings b/Loop/gallery.ckcomplication/Base.lproj/ckcomplication.strings
@@ -9,8 +9,5 @@
 /* The complication template example unit string */
 "120↘︎" = "120↘︎";
 
-/* Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Time) */
-"UtilitarianSmallFlat" = "%@ %@";
-
 /* Utilitarian large flat format string (1: Glucose & Trend symbol) (2: Eventual Glucose) (3: Time) */
 "UtilitarianLargeFlat" = "%@%@ %@";
diff --git a/Loop/gallery.ckcomplication/complicationManifest.json b/Loop/gallery.ckcomplication/complicationManifest.json
@@ -1,12 +1,12 @@
 {
   "supported complication families" : {
-    "7" : "B1F1D9E8-541F-414D-AF5D-780D6B993FD9.json",
-    "3" : "28F6F412-3A28-4CF6-A184-F6345627D8C8.json",
-    "4" : "50FD3B5F-03E3-486D-A506-21DC4A3B4857.json",
-    "0" : "5506FC7B-C7BA-439A-8075-7B1C5DE1114A.json",
-    "1" : "3902026C-B841-4642-AD7B-1CA80FAC447D.json",
-    "6" : "30ACFC76-BFF3-4761-9345-5C169460F920.json",
-    "2" : "7F6C7226-52B7-406D-ACD2-7AB92587CBB4.json"
+    "7" : "AF8DC7FB-6148-4322-BE40-6D6DD3C963A9.json",
+    "3" : "11076976-F7D6-460C-845C-10C8A7003F0D.json",
+    "4" : "38411872-4973-48F3-AC34-504D40170A49.json",
+    "0" : "2E750127-9918-4653-8B91-FC0AB09DF91F.json",
+    "1" : "28C71A33-1C97-4A92-8677-4FE8644380DF.json",
+    "6" : "688917AC-E1E4-4B66-9B44-6EE17F1D19DB.json",
+    "2" : "59939B64-2F84-4438-8860-91BB63BE827B.json"
   },
   "client ID" : "com.loudnate.Loop.watchkitapp.watchkitextension"
 }
diff --git a/WatchApp Extension/Base.lproj/ckcomplication.strings b/WatchApp Extension/Base.lproj/ckcomplication.strings
@@ -9,8 +9,5 @@
 /* The complication template example unit string */
 "120↘︎" = "120↘︎";
 
-/* Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Time) */
-"UtilitarianSmallFlat" = "%@ %@";
-
 /* Utilitarian large flat format string (1: Glucose & Trend symbol) (2: Eventual Glucose) (3: Time) */
 "UtilitarianLargeFlat" = "%@%@ %@";
diff --git a/WatchApp Extension/ComplicationController.swift b/WatchApp Extension/ComplicationController.swift
@@ -105,12 +105,12 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
             template = extraLarge
         case .utilitarianSmall, .utilitarianSmallFlat:
             let utilitarianSmallFlat = CLKComplicationTemplateUtilitarianSmallFlat()
-            utilitarianSmallFlat.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianSmallFlat", textProviders: [glucoseText, timeText])
+            utilitarianSmallFlat.textProvider = glucoseText
             template = utilitarianSmallFlat
         case .utilitarianLarge:
             let utilitarianLarge = CLKComplicationTemplateUtilitarianLargeFlat()
             let eventualGlucoseText = CLKSimpleTextProvider.localizableTextProvider(withStringsFileTextKey: "75")
-            utilitarianLarge.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianLargeFlat", textProviders: [glucoseText, eventualGlucoseText, timeText])
+            utilitarianLarge.textProvider = CLKSimpleTextProvider.localizableTextProvider(withStringsFileFormatKey: "UtilitarianLargeFlat", textProviders: [glucoseText, eventualGlucoseText, CLKTimeTextProvider(date: Date())])
             template = utilitarianLarge
         }
 
diff --git a/WatchApp Extension/Extensions/CLKComplicationTemplate.swift b/WatchApp Extension/Extensions/CLKComplicationTemplate.swift
@@ -28,15 +28,14 @@ extension CLKComplicationTemplate {
             return nil
         }
 
-        var glucoseStrings = [glucoseString]
+        let glucoseAndTrend = "\(glucoseString)\(context.glucoseTrend?.symbol ?? " ")"
         var accessibilityStrings = [glucoseString]
 
         if let trend = context.glucoseTrend {
-            glucoseStrings.append(trend.symbol)
             accessibilityStrings.append(trend.localizedDescription)
         }
 
-        let glucoseAndTrendText = CLKSimpleTextProvider(text: glucoseStrings.joined(), shortText: glucoseString, accessibilityLabel: accessibilityStrings.joined(separator: ", "))
+        let glucoseAndTrendText = CLKSimpleTextProvider(text: glucoseAndTrend, shortText: glucoseString, accessibilityLabel: accessibilityStrings.joined(separator: ", "))
         let timeText = CLKRelativeDateTextProvider(date: date, style: .natural, units: .minute)
 
         let timeFormatter = DateFormatter()
@@ -65,13 +64,7 @@ extension CLKComplicationTemplate {
             return template
         case .utilitarianSmall, .utilitarianSmallFlat:
             let template = CLKComplicationTemplateUtilitarianSmallFlat()
-            let format = NSLocalizedString("UtilitarianSmallFlat", tableName: "ckcomplication", comment: "Utilitarian small flat format string (1: Glucose & Trend symbol) (2: Time)")
-
-            template.textProvider = CLKSimpleTextProvider(text: String(format: format, arguments: [
-                    glucoseString,
-                    timeFormatter.string(from: date)
-                ]
-            ))
+            template.textProvider = CLKSimpleTextProvider(text: glucoseString)
 
             return template
         case .utilitarianLarge:
@@ -86,7 +79,7 @@ extension CLKComplicationTemplate {
             let format = NSLocalizedString("UtilitarianLargeFlat", tableName: "ckcomplication", comment: "Utilitarian large flat format string (1: Glucose & Trend symbol) (2: Eventual Glucose) (3: Time)")
 
             template.textProvider = CLKSimpleTextProvider(text: String(format: format, arguments: [
-                    glucoseStrings.joined(),
+                    glucoseAndTrend,
                     eventualGlucoseText,
                     timeFormatter.string(from: date)
                 ]

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,8 @@`
`18`	`18`	`"text" : "75"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`		`- "class" : "CLKRelativeDateTextProvider",`
`22`		`- "relativeDateStyle" : 0,`
`23`		`- "calendarUnits" : 64,`
`24`		`- "date" : 509858751.802992`
	`21`	`+ "class" : "CLKTimeTextProvider",`
	`22`	`+ "date" : 510206747.733748`
`25`	`23`	`}`
`26`	`24`	`],`
`27`	`25`	`"class" : "CLKLocalizableCompoundTextProvider",`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`"class" : "CLKRelativeDateTextProvider",`
`17`	`17`	`"relativeDateStyle" : 0,`
`18`	`18`	`"calendarUnits" : 64,`
`19`		`- "date" : 509858751.805835`
	`19`	`+ "date" : 510206747.738849`
`20`	`20`	`}`
`21`	`21`	`}`