Merge pull request #4 from elnjensen/dev-watch-sk-ej

Fix override range display, mmol/L limits

Author: Bharat Mediratta

WatchApp Extension/Scenes/GlucoseChartScene.swift

@@ -61,10 +61,11 @@ struct Scaler {
         return CGPoint(x: CGFloat(x.timeIntervalSince(startDate)) * xScale, y: CGFloat(y - glucoseMin) * yScale)
     }
 
-    func rect(for range: WatchDatedRange) -> CGRect {
+    // By default enforce a minimum height so that the range is visible
+    func rect(for range: WatchDatedRange, minHeight: CGFloat = 2) -> CGRect {
         let a = point(range.startDate, range.minValue)
         let b = point(range.endDate, range.maxValue)
-        let size = CGSize(width: b.x - a.x, height: b.y - a.y)
+        let size = CGSize(width: b.x - a.x, height: max(b.y - a.y, minHeight))
         return CGRect(origin: CGPoint(x: a.x + size.width / 2, y: a.y + size.height / 2), size: size)
     }
 }
@@ -74,15 +75,15 @@ extension HKUnit {
         if unitString == "mg/dL" {
             return [150.0, 200.0, 250.0, 300.0, 350.0, 400.0]
         } else {
-            return [8.3,   11.1,  13.9,  16.6,  19.4,  22.2]
+            return [8.0, 11.0, 14.0, 17.0, 20.0, 23.0]
         }
     }
 
     var lowWatermark: Double {
         if unitString == "mg/dL" {
             return 50.0
         } else {
-            return 2.8
+            return 3.0
         }
     }
 }
@@ -242,23 +243,23 @@ class GlucoseChartScene: SKScene {
 
         targetRanges?.forEach { range in
             let sprite = getSprite(forHash: range.hashValue)
-            sprite.color = UIColor.rangeColor.withAlphaComponent(temporaryOverride != nil ? 0.2 : 0.4)
+            sprite.color = UIColor.rangeColor.withAlphaComponent(temporaryOverride != nil ? 0.4 : 0.6)
             sprite.move(to: scaler.rect(for: range), animated: animated)
             inactiveNodes.removeValue(forKey: range.hashValue)
         }
 
         // Make temporary overrides visually match what we do in the Loop app. This means that we have
         // one darker box which represents the duration of the override, but we have a second lighter box which
         // extends to the end of the visible window.
-        if let range = temporaryOverride {
+        if let range = temporaryOverride, range.endDate > Date() {
             let sprite1 = getSprite(forHash: range.hashValue)
-            sprite1.color = UIColor.rangeColor.withAlphaComponent(0.2)
+            sprite1.color = UIColor.rangeColor.withAlphaComponent(0.6)
             sprite1.move(to: scaler.rect(for: range), animated: animated)
             inactiveNodes.removeValue(forKey: range.hashValue)
 
             let extendedRange = WatchDatedRange(startDate: range.startDate, endDate: Date() + window, minValue: range.minValue, maxValue: range.maxValue)
             let sprite2 = getSprite(forHash: extendedRange.hashValue)
-            sprite2.color = UIColor.rangeColor.withAlphaComponent(0.2)
+            sprite2.color = UIColor.rangeColor.withAlphaComponent(0.4)
             sprite2.move(to: scaler.rect(for: extendedRange), animated: animated)
             inactiveNodes.removeValue(forKey: extendedRange.hashValue)
         }

WatchApp/Assets.xcassets/Graph menu icons/1-hour-graph-38mm.imageset/1-hour-graph-38mm.png

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "filename" : "1-hour-graph-38mm.png",
+      "screen-width" : "<=145",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "1-hour-graph-42mm.png",
+      "screen-width" : ">145",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

WatchApp/Assets.xcassets/Graph menu icons/1-hour-graph-38mm.imageset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "filename" : "2-hour-graph-38mm.png",
+      "screen-width" : "<=145",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "2-hour-graph-42mm.png",
+      "screen-width" : ">145",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

WatchApp/Assets.xcassets/Graph menu icons/1-hour-graph-42mm.imageset/1-hour-graph-42mm.png

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "watch",
+      "filename" : "3-hour-graph-38mm.png",
+      "screen-width" : "<=145",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "watch",
+      "filename" : "3-hour-graph-42mm.png",
+      "screen-width" : ">145",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

WatchApp/Assets.xcassets/Graph menu icons/1-hour-graph-42mm.imageset/Contents.json

@@ -389,23 +389,17 @@
                     </items>
                     <menu key="menu" id="Da1-jh-2yL">
                         <items>
-                            <menuItem title="1 hour" image="1-hour-graph-38mm" id="vL1-NA-WZ1">
-                                <variation key="device=watch38mm" image="1-hour-graph-38mm"/>
-                                <variation key="device=watch42mm" image="1-hour-graph-42mm"/>
+                            <menuItem title="1 hour" image="1-hour-graph" id="vL1-NA-WZ1">
                                 <connections>
                                     <action selector="setChartWindow1Hour" destination="v5b-sO-bb8" id="yp1-H2-0e5"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="2 hours" image="2-hour-graph-38mm" id="dPh-7b-Tfv">
-                                <variation key="device=watch38mm" image="2-hour-graph-38mm"/>
-                                <variation key="device=watch42mm" image="2-hour-graph-42mm"/>
+                            <menuItem title="2 hours" image="2-hour-graph" id="dPh-7b-Tfv">
                                 <connections>
                                     <action selector="setChartWindow2Hours" destination="v5b-sO-bb8" id="IQe-Uh-AOb"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="3 hours" image="3-hour-graph-38mm" id="fR1-7h-SNe">
-                                <variation key="device=watch38mm" image="3-hour-graph-38mm"/>
-                                <variation key="device=watch42mm" image="3-hour-graph-42mm"/>
+                            <menuItem title="3 hours" image="3-hour-graph" id="fR1-7h-SNe">
                                 <connections>
                                     <action selector="setChartWindow3Hours" destination="v5b-sO-bb8" id="HhZ-89-5Yp"/>
                                 </connections>