Merge pull request #1949 from LoopKit/dev

Release 3.2

Author: ps2

Common/FeatureFlags.swift

@@ -26,7 +26,7 @@ struct FeatureFlagConfiguration: Decodable {
     let observeHealthKitCarbSamplesFromOtherApps: Bool
     let observeHealthKitDoseSamplesFromOtherApps: Bool
     let observeHealthKitGlucoseSamplesFromOtherApps: Bool
-    let remoteOverridesEnabled: Bool
+    let remoteCommandsEnabled: Bool
     let predictedGlucoseChartClampEnabled: Bool
     let scenariosEnabled: Bool
     let sensitivityOverridesEnabled: Bool
@@ -37,6 +37,7 @@ struct FeatureFlagConfiguration: Decodable {
     let usePositiveMomentumAndRCForManualBoluses: Bool
     let dynamicCarbAbsorptionEnabled: Bool
     let adultChildInsulinModelSelectionEnabled: Bool
+    let profileExpirationSettingsViewEnabled: Bool
 
 
     fileprivate init() {
@@ -160,10 +161,10 @@ struct FeatureFlagConfiguration: Decodable {
         #endif
 
         // Swift compiler config is inverse, since the default state is enabled.
-        #if REMOTE_OVERRIDES_DISABLED
-        self.remoteOverridesEnabled = false
+        #if REMOTE_COMMANDS_DISABLED || REMOTE_OVERRIDES_DISABLED //REMOTE_OVERRIDES_DISABLED: backwards compatibility of Loop 3 & prior
+        self.remoteCommandsEnabled = false
         #else
-        self.remoteOverridesEnabled = true
+        self.remoteCommandsEnabled = true
         #endif
 
         #if SCENARIOS_ENABLED
@@ -212,6 +213,13 @@ struct FeatureFlagConfiguration: Decodable {
         #endif
 
         self.dynamicCarbAbsorptionEnabled = true
+
+        // ProfileExpirationSettingsView is inverse, since the default state is enabled.
+        #if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
+        self.profileExpirationSettingsViewEnabled = false
+        #else
+        self.profileExpirationSettingsViewEnabled = true
+        #endif
     }
 }
 
@@ -232,7 +240,7 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* observeHealthKitDoseSamplesFromOtherApps: \(observeHealthKitDoseSamplesFromOtherApps)",
             "* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
             "* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
-            "* remoteOverridesEnabled: \(remoteOverridesEnabled)",
+            "* remoteCommandsEnabled: \(remoteCommandsEnabled)",
             "* scenariosEnabled: \(scenariosEnabled)",
             "* sensitivityOverridesEnabled: \(sensitivityOverridesEnabled)",
             "* showEventualBloodGlucoseOnWatchEnabled: \(showEventualBloodGlucoseOnWatchEnabled)",
@@ -244,7 +252,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
             "* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
             "* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
-            "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)"
+            "* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
+            "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)"
         ].joined(separator: "\n")
     }
 }

Common/ar.lproj/Intents.strings

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