Merge pull request #2044 from LoopKit/tidepool-sync

Tidepool sync

Author: ps2

.gitignore

@@ -77,9 +77,12 @@ VersionOverride.xcconfig
 
 Loop/DerivedAssets.xcassets/*
 WatchApp/DerivedAssets.xcassets/*
+Loop\ Widget\ Extension/DerivedAssets.xcassets/*
 # ...except, keep Contents.json
 !Loop/DerivedAssets.xcassets/Contents.json
 !WatchApp/DerivedAssets.xcassets/Contents.json
+!Loop\ Widget\ Extension/DerivedAssets.xcassets/Contents.json
 
 Loop/DerivedAssetsOverride.xcassets
 WatchApp/DerivedAssetsOverride.xcassets
+Loop\ Widget\ Extension/DerivedAssetsOverride.xcassets

Common/FeatureFlags.swift

@@ -266,7 +266,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
             "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
             "* missedMealNotifications: \(missedMealNotifications)",
-            "* allowAlgorithmExperiments: \(allowAlgorithmExperiments)"
+            "* allowAlgorithmExperiments: \(allowAlgorithmExperiments)",
+            "* allowExperimentalFeatures: \(allowExperimentalFeatures)"
         ].joined(separator: "\n")
     }
 }
@@ -290,6 +291,20 @@ extension FeatureFlagConfiguration {
         #endif
     }
 
+    var allowExperimentalFeatures: Bool {
+        #if EXPERIMENTAL_FEATURES_ENABLED
+        return true
+        #elseif EXPERIMENTAL_FEATURES_ENABLED_CONDITIONALLY
+        if debugEnabled {
+            return true
+        } else {
+            return UserDefaults.appGroup?.allowExperimentalFeatures ?? false
+        }
+        #else
+        return false
+        #endif
+    }
+    
     var allowSimulators: Bool {
         #if SIMULATORS_ENABLED
         return true

Common/Models/StatusExtensionContext.swift

@@ -160,8 +160,8 @@ extension GlucoseDisplayableContext: RawRepresentable {
             trendType = nil
         }
 
-        if let trendRateUnit = rawValue["trendRateUnit"] as? String, let trendRateValue = rawValue["trendRateValue"] as? Double {
-            trendRate = HKQuantity(unit: HKUnit(from: trendRateUnit), doubleValue: trendRateValue)
+        if let trendRateValue = rawValue["trendRateValue"] as? Double {
+            trendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: trendRateValue)
         } else {
             trendRate = nil
         }
@@ -181,7 +181,6 @@ extension GlucoseDisplayableContext: RawRepresentable {
         ]
         raw["trendType"] = trendType?.rawValue
         if let trendRate = trendRate {
-            raw["trendRateUnit"] = HKUnit.milligramsPerDeciliterPerMinute.unitString
             raw["trendRateValue"] = trendRate.doubleValue(for: HKUnit.milligramsPerDeciliterPerMinute)
         }
         raw["glucoseRangeCategory"] = glucoseRangeCategory?.rawValue

Common/Models/WatchContext.swift

@@ -75,8 +75,8 @@ final class WatchContext: RawRepresentable {
         if let rawGlucoseTrend = rawValue["gt"] as? GlucoseTrend.RawValue {
             glucoseTrend = GlucoseTrend(rawValue: rawGlucoseTrend)
         }
-        if let glucoseTrendRateUnitString = rawValue["gtru"] as? String, let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
-            glucoseTrendRate = HKQuantity(unit: HKUnit(from: glucoseTrendRateUnitString), doubleValue: glucoseTrendRateValue)
+        if let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
+            glucoseTrendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: glucoseTrendRateValue)
         }
         glucoseDate = rawValue["gd"] as? Date
         glucoseIsDisplayOnly = rawValue["gdo"] as? Bool