Merge pull request #512 from tidepool-org/ps2/LOOP-4116/diy-sync

LOOP-4116

Author: ps2

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

Cartfile

@@ -11,3 +11,4 @@ github "LoopKit/LogglyService" "dev"
 github "LoopKit/MKRingProgressView" "appex-safe"
 github "dexman/Minizip" "master"
 github "instacart/TrueTime.swift"
+github "gestrich/NightscoutAPIClient" "dev"

Cartfile.resolved

@@ -12,3 +12,4 @@ github "i-schuetz/SwiftCharts" "0.6.5"
 github "instacart/TrueTime.swift" "5.1.0"
 github "ps2/NightscoutService" "f54ae00a3c362ccbcbac403b86bc6cd7320c9058"
 github "ps2/rileylink_ios" "0badcaca8c42a0a6cc430302a04133412cbbef58"
+github "gestrich/NightscoutAPIClient" "2a9dd24772db59c4aa528d1fb33e2c37a320fb13"

Common/Extensions/NSBundle.swift

@@ -85,6 +85,15 @@ extension Bundle {
         }
     }
 
+    // These strings are only configured if it is a workspace build
+    var workspaceGitRevision: String? {
+        return object(forInfoDictionaryKey: "com-loopkit-LoopWorkspace-git-revision") as? String
+    }
+
+    var workspaceGitBranch: String? {
+       return object(forInfoDictionaryKey: "com-loopkit-LoopWorkspace-git-branch") as? String
+   }
+
     var localCacheDuration: TimeInterval {
         guard let localCacheDurationDaysString = object(forInfoDictionaryKey: "LoopLocalCacheDurationDays") as? String,
             let localCacheDurationDays = Double(localCacheDurationDaysString) else {

Common/Extensions/OSLog.swift

@@ -8,6 +8,12 @@
 import os.log
 
 
+extension Logger {
+    init(category: String) {
+        self.init(subsystem: "com.loopkit.Loop", category: category)
+    }
+}
+
 extension OSLog {
     convenience init(category: String) {
         self.init(subsystem: "com.loopkit.Loop", category: category)

Common/Extensions/UserDefaults+CGM.swift

@@ -16,12 +16,16 @@ struct FeatureFlagConfiguration: Decodable {
     let criticalAlertsEnabled: Bool
     let entryDeletionEnabled: Bool
     let fiaspInsulinModelEnabled: Bool
+    let lyumjevInsulinModelEnabled: Bool
+    let afrezzaInsulinModelEnabled: Bool
     let includeServicesInSettingsEnabled: Bool
     let manualDoseEntryEnabled: Bool
     let insulinDeliveryReservoirViewEnabled: Bool
     let mockTherapySettingsEnabled: Bool
     let nonlinearCarbModelEnabled: Bool
-    let observeHealthKitSamplesFromOtherApps: Bool
+    let observeHealthKitCarbSamplesFromOtherApps: Bool
+    let observeHealthKitDoseSamplesFromOtherApps: Bool
+    let observeHealthKitGlucoseSamplesFromOtherApps: Bool
     let remoteOverridesEnabled: Bool
     let predictedGlucoseChartClampEnabled: Bool
     let scenariosEnabled: Bool
@@ -71,6 +75,20 @@ struct FeatureFlagConfiguration: Decodable {
         #else
         self.fiaspInsulinModelEnabled = true
         #endif
+
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if LYUMJEV_INSULIN_MODEL_DISABLED
+        self.lyumjevInsulinModelEnabled = false
+        #else
+        self.lyumjevInsulinModelEnabled = true
+        #endif
+
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if AFREZZA_INSULIN_MODEL_DISABLED
+        self.afrezzaInsulinModelEnabled = false
+        #else
+        self.afrezzaInsulinModelEnabled = true
+        #endif
 
         // Swift compiler config is inverse, since the default state is enabled.
         #if INCLUDE_SERVICES_IN_SETTINGS_DISABLED
@@ -93,7 +111,6 @@ struct FeatureFlagConfiguration: Decodable {
         self.insulinDeliveryReservoirViewEnabled = true
         #endif
 
-        // Swift compiler config is inverse, since the default state is enabled.
         #if MOCK_THERAPY_SETTINGS_ENABLED
         self.mockTherapySettingsEnabled = true
         #else
@@ -107,13 +124,31 @@ struct FeatureFlagConfiguration: Decodable {
         self.nonlinearCarbModelEnabled = true
         #endif
 
+        #if OBSERVE_HEALTH_KIT_CARB_SAMPLES_FROM_OTHER_APPS_ENABLED
+        self.observeHealthKitCarbSamplesFromOtherApps = true
+        #else
+        self.observeHealthKitCarbSamplesFromOtherApps = false
+        #endif
+        
         // Swift compiler config is inverse, since the default state is enabled.
         #if OBSERVE_HEALTH_KIT_SAMPLES_FROM_OTHER_APPS_DISABLED
-        self.observeHealthKitSamplesFromOtherApps = false
+        self.observeHealthKitDoseSamplesFromOtherApps = false
+        self.observeHealthKitGlucoseSamplesFromOtherApps = false
         #else
-        self.observeHealthKitSamplesFromOtherApps = true
+        self.observeHealthKitDoseSamplesFromOtherApps = true
+        self.observeHealthKitGlucoseSamplesFromOtherApps = true
+        #endif
+
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if OBSERVE_HEALTH_KIT_DOSE_SAMPLES_FROM_OTHER_APPS_DISABLED
+        self.observeHealthKitDoseSamplesFromOtherApps = false
         #endif
 
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if OBSERVE_HEALTH_KIT_GLUCOSE_SAMPLES_FROM_OTHER_APPS_DISABLED
+        self.observeHealthKitGlucoseSamplesFromOtherApps = false
+        #endif
+        
         #if PREDICTED_GLUCOSE_CHART_CLAMP_ENABLED
         self.predictedGlucoseChartClampEnabled = true
         #else
@@ -169,10 +204,14 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* criticalAlertsEnabled: \(criticalAlertsEnabled)",
             "* entryDeletionEnabled: \(entryDeletionEnabled)",
             "* fiaspInsulinModelEnabled: \(fiaspInsulinModelEnabled)",
+            "* lyumjevInsulinModelEnabled: \(lyumjevInsulinModelEnabled)",
+            "* afrezzaInsulinModelEnabled: \(afrezzaInsulinModelEnabled)",
             "* includeServicesInSettingsEnabled: \(includeServicesInSettingsEnabled)",
             "* mockTherapySettingsEnabled: \(mockTherapySettingsEnabled)",
             "* nonlinearCarbModelEnabled: \(nonlinearCarbModelEnabled)",
-            "* observeHealthKitSamplesFromOtherApps: \(observeHealthKitSamplesFromOtherApps)",
+            "* observeHealthKitCarbSamplesFromOtherApps: \(observeHealthKitCarbSamplesFromOtherApps)",
+            "* observeHealthKitDoseSamplesFromOtherApps: \(observeHealthKitDoseSamplesFromOtherApps)",
+            "* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
             "* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
             "* remoteOverridesEnabled: \(remoteOverridesEnabled)",
             "* scenariosEnabled: \(scenariosEnabled)",
@@ -190,30 +229,26 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
 
 extension FeatureFlagConfiguration {
     var allowDebugFeatures: Bool {
-        if debugEnabled {
-            return true
-        }
-        if UserDefaults.appGroup?.allowDebugFeatures ?? false {
-            return true
-        }
         #if ALLOW_DEBUG_FEATURES_ENABLED
         return true
         #else
-        return false
+        if UserDefaults.appGroup?.allowDebugFeatures ?? false {
+            return true
+        } else {
+            return false
+        }
         #endif
     }
 
     var allowSimulators: Bool {
-        if debugEnabled {
-            return true
-        }
-        if UserDefaults.appGroup?.allowSimulators ?? false {
-            return true
-        }
         #if ALLOW_SIMULATORS_ENABLED
         return true
         #else
-        return false
+        if UserDefaults.appGroup?.allowSimulators ?? false {
+            return true
+        } else {
+            return false
+        }
         #endif
     }
 }

Common/Extensions/UserDefaults+Services.swift

@@ -26,7 +26,10 @@ var availableStaticPumpManagers: [PumpManagerDescriptor] {
 }
 
 extension PumpManager {
-    var rawValue: [String: Any] {
+
+    typealias RawValue = [String: Any]
+    
+    var rawValue: RawValue {
         return [
             "managerIdentifier": self.managerIdentifier,
             "state": self.rawState

Common/FeatureFlags.swift

@@ -0,0 +1,24 @@
+"80eo5o" = "Add Carb Entry";
+
+"9KhaIS" = "I've set the preset";
+
+"I4OZy8" = "Enable Override Preset";
+
+"OcNxIj" = "Add Carb Entry";
+
+"XNNmtH" = "Enable preset in Loop";
+
+"ZZ3mtM" = "Enable an override preset in Loop";
+
+"b085BW" = "I wasn't able to set the preset.";
+
+"lYMuWV" = "Override Name";
+
+"nDKAmn" = "What's the name of the override you'd like to set?";
+
+"oLQSsJ" = "Enable '${overrideName}' Override Preset";
+
+"yBzwCL" = "Override Selection";
+
+"yc02Yq" = "Add a carb entry to Loop";
+