Merge pull request #2312 from LoopKit/update_tidepool-merge

Update Loop tidepool-merge with improvements from dev

Author: marionbarker

Common/Models/BuildDetails.swift

@@ -16,8 +16,8 @@ class BuildDetails {
 
     init() {
         guard let url = Bundle.main.url(forResource: "BuildDetails", withExtension: ".plist"),
-           let data = try? Data(contentsOf: url),
-           let parsed = try? PropertyListSerialization.propertyList(from: data, format: nil) as? [String: Any] else
+              let data = try? Data(contentsOf: url),
+              let parsed = try? PropertyListSerialization.propertyList(from: data, format: nil) as? [String: Any] else
         {
             dict = [:]
             return

Loop/Managers/SupportManager.swift

@@ -220,7 +220,7 @@ extension SupportManager: SupportUIDelegate {
     }
 
     private var branchNameIfNotReleaseBranch: String? {
-        return BuildDetails.default.gitBranch.filter { branch in
+        return BuildDetails.default.workspaceGitBranch.filter { branch in
             return branch != "" &&
                 branch != "main" &&
                 branch != "master" &&

Loop/Views/BolusEntryView.swift

@@ -360,7 +360,7 @@ struct BolusEntryView: View {
                 case .saveWithoutBolusing:
                     return Text("Save without Bolusing", comment: "Button text to save carbs and/or manual glucose entry without a bolus")
                 case .saveAndDeliver:
-                    return Text("Save and Deliver", comment: "Button text to save carbs and/or manual glucose entry and deliver a bolus")
+                    return Text("Save Carbs & Deliver", comment: "Button text to save carbs and/or manual glucose entry and deliver a bolus")
                 case .enterBolus:
                     return Text("Enter Bolus", comment: "Button text to begin entering a bolus")
                 case .deliver:

Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift

@@ -44,9 +44,6 @@ public struct GlucoseBasedApplicationFactorSelectionView: View {
                 }
             }
             .padding()
-            .onChange(of: isGlucoseBasedApplicationFactorEnabled) { newValue in
-                UserDefaults.standard.glucoseBasedApplicationFactorEnabled = newValue
-            }
         }
         .navigationBarTitleDisplayMode(.inline)
     }

Loop/Views/IntegralRetrospectiveCorrectionSelectionView.swift

@@ -27,9 +27,6 @@ public struct IntegralRetrospectiveCorrectionSelectionView: View {
                 Divider()
 
                 Toggle(NSLocalizedString("Enable Integral Retrospective Correction", comment: "Title for Integral Retrospective Correction toggle"), isOn: $isIntegralRetrospectiveCorrectionEnabled)
-                    .onChange(of: isIntegralRetrospectiveCorrectionEnabled) { newValue in
-                        UserDefaults.standard.integralRetrospectiveCorrectionEnabled = newValue
-                    }
                     .padding(.top, 20)
             }
             .padding()

Loop/Views/SettingsView+algorithmExperimentsSection.swift

@@ -39,8 +39,8 @@ public struct ExperimentRow: View {
 }
 
 public struct ExperimentsSettingsView: View {
-    @State private var isGlucoseBasedApplicationFactorEnabled = UserDefaults.standard.glucoseBasedApplicationFactorEnabled
-    @State private var isIntegralRetrospectiveCorrectionEnabled = UserDefaults.standard.integralRetrospectiveCorrectionEnabled
+    @AppStorage(UserDefaults.Key.GlucoseBasedApplicationFactorEnabled.rawValue) private var isGlucoseBasedApplicationFactorEnabled = false
+    @AppStorage(UserDefaults.Key.IntegralRetrospectiveCorrectionEnabled.rawValue) private var isIntegralRetrospectiveCorrectionEnabled = false
     var automaticDosingStrategy: AutomaticDosingStrategy
 
     public var body: some View {
@@ -80,7 +80,7 @@ public struct ExperimentsSettingsView: View {
 
 
 extension UserDefaults {
-    private enum Key: String {
+    fileprivate enum Key: String {
         case GlucoseBasedApplicationFactorEnabled = "com.loopkit.algorithmExperiments.glucoseBasedApplicationFactorEnabled"
         case IntegralRetrospectiveCorrectionEnabled = "com.loopkit.algorithmExperiments.integralRetrospectiveCorrectionEnabled"
     }

Loop/Views/SimpleBolusView.swift

@@ -256,7 +256,7 @@ struct SimpleBolusView: View {
                 case .saveWithoutBolusing:
                     return Text("Save without Bolusing", comment: "Button text to save carbs and/or manual glucose entry without a bolus")
                 case .saveAndDeliver:
-                    return Text("Save and Deliver", comment: "Button text to save carbs and/or manual glucose entry and deliver a bolus")
+                    return Text("Save Carbs & Deliver", comment: "Button text to save carbs and/or manual glucose entry and deliver a bolus")
                 case .enterBolus:
                     return Text("Enter Bolus", comment: "Button text to begin entering a bolus")
                 case .deliver:

Version.xcconfig

@@ -6,9 +6,11 @@
 //  Copyright © 2020 LoopKit Authors. All rights reserved.
 //
 
-// Version [DEFAULT]
-LOOP_MARKETING_VERSION = 3.5.0
-CURRENT_PROJECT_VERSION = 57
+// Version
+//   [for DIY Loop] configure the version number in LoopWorkspace
+LOOP_MARKETING_VERSION = 1.0
+CURRENT_PROJECT_VERSION = 1
 
-// Optional override
+// Optional override (enables override of version)
+#include? "../VersionOverride.xcconfig"
 #include? "VersionOverride.xcconfig"

WatchApp Extension/View Models/CarbAndBolusFlowViewModel.swift

@@ -117,7 +117,7 @@ final class CarbAndBolusFlowViewModel: ObservableObject {
             date: lastEntryDate,
             quantity: HKQuantity(unit: .gram(), doubleValue: Double(grams)),
             startDate: carbEntryDate,
-            foodType: nil,
+            foodType: carbAbsorptionTime.emoji,
             absorptionTime: absorptionTime(for: carbAbsorptionTime)
         )