SwiftlyNoah · Joerg-Schoemer · Apr 13, 2023 · May 1, 2023 · May 1, 2023 · Aug 17, 2023
diff --git a/Common/Models/PumpManager.swift b/Common/Models/PumpManager.swift
@@ -12,13 +12,13 @@ import MockKit
 import MockKitUI
 
 let staticPumpManagersByIdentifier: [String: PumpManagerUI.Type] = [
-    MockPumpManager.managerIdentifier : MockPumpManager.self
+    MockPumpManager.pluginIdentifier : MockPumpManager.self
 ]
 
 var availableStaticPumpManagers: [PumpManagerDescriptor] {
     if FeatureFlags.allowSimulators {
         return [
-            PumpManagerDescriptor(identifier: MockPumpManager.managerIdentifier, localizedTitle: MockPumpManager.localizedTitle)
+            PumpManagerDescriptor(identifier: MockPumpManager.pluginIdentifier, localizedTitle: MockPumpManager.localizedTitle)
         ]
     } else {
         return []
@@ -31,7 +31,7 @@ extension PumpManager {
 
     var rawValue: RawValue {
         return [
-            "managerIdentifier": self.managerIdentifier,
+            "managerIdentifier": self.pluginIdentifier,
             "state": self.rawState
         ]
     }

diff --git a/Common/hi.lproj/Intents.strings b/Common/hi.lproj/Intents.strings
@@ -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";
+
diff --git a/Loop Status Extension/it.lproj/Localizable.strings b/Loop Status Extension/it.lproj/Localizable.strings
@@ -14,7 +14,7 @@
 "%1$@ v%2$@" = "%1$@ contro %2$@";
 
 /* Widget label title describing the active carbs */
-"Active Carbs" = "Carb Attivi";
+"Active Carbs" = "Carboidrati Attivi";
 
 /* Widget label title describing the active insulin */
 "Active Insulin" = "Insulina attiva";

diff --git a/Loop Widget Extension/Helpers/ContentMargin.swift b/Loop Widget Extension/Helpers/ContentMargin.swift
@@ -0,0 +1,20 @@
+//
+//  ContentMargin.swift
+//  Loop Widget Extension
+//
+//  Created by Cameron Ingham on 9/29/23.
+//  Copyright © 2023 LoopKit Authors. All rights reserved.
+//
+
+import SwiftUI
+import WidgetKit
+
+extension WidgetConfiguration {
+    func contentMarginsDisabledIfAvailable() -> some WidgetConfiguration {
+        if #available(iOSApplicationExtension 17.0, *) {
+            return self.contentMarginsDisabled()
+        } else {
+            return self
+        }
+    }
+}
diff --git a/Loop Widget Extension/Helpers/WidgetBackground.swift b/Loop Widget Extension/Helpers/WidgetBackground.swift
@@ -11,6 +11,12 @@ import SwiftUI
 extension View {
     @ViewBuilder
     func widgetBackground() -> some View {
-        self.background { Color("WidgetBackground") }
+        if #available(iOSApplicationExtension 17.0, *) {
+            self.containerBackground(for: .widget) {
+                Color("WidgetBackground")
+            }
+        } else {
+            self.background { Color("WidgetBackground") }
+        }
     }
 }
diff --git a/Loop Widget Extension/Widgets/SystemStatusWidget.swift b/Loop Widget Extension/Widgets/SystemStatusWidget.swift
@@ -76,5 +76,6 @@ struct SystemStatusWidget: Widget {
         .configurationDisplayName("Loop Status Widget")
         .description("See your current blood glucose and insulin delivery.")
         .supportedFamilies([.systemSmall, .systemMedium])
+        .contentMarginsDisabledIfAvailable()
     }
 }
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop Intent Extension.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop Intent Extension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/SmallStatusWidgetExtension.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/SmallStatusWidgetExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme b/Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Loop/AppDelegate.swift b/Loop/AppDelegate.swift
@@ -22,6 +22,8 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {
 
         setenv("CFNETWORK_DIAGNOSTICS", "3", 1)
 
+        log.default("lastPathComponent = %{public}@", String(describing: Bundle.main.appStoreReceiptURL?.lastPathComponent))
+
         loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
         loopAppManager.launch()
         return loopAppManager.isLaunchComplete

diff --git a/Loop/DefaultAssets.xcassets/hardware.imageset/Contents.json b/Loop/DefaultAssets.xcassets/hardware.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 3403.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Loop/DefaultAssets.xcassets/hardware.imageset/Group 3403.pdf b/Loop/DefaultAssets.xcassets/hardware.imageset/Group 3403.pdf
diff --git a/Loop/DefaultAssets.xcassets/phone.imageset/Contents.json b/Loop/DefaultAssets.xcassets/phone.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 3405.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Loop/DefaultAssets.xcassets/phone.imageset/Group 3405.pdf b/Loop/DefaultAssets.xcassets/phone.imageset/Group 3405.pdf
diff --git a/Loop/Extensions/DosingDecisionStore+SimulatedCoreData.swift b/Loop/Extensions/DosingDecisionStore+SimulatedCoreData.swift
@@ -103,23 +103,23 @@ fileprivate extension StoredDosingDecision {
             historicalGlucose.append(HistoricalGlucoseValue(startDate: date.addingTimeInterval(.minutes(minutes)),
                                                             quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 125 + minutes / 5)))
         }
-        let originalCarbEntry = StoredCarbEntry(uuid: UUID(uuidString: "C86DEB61-68E9-464E-9DD5-96A9CB445FD3")!,
+        let originalCarbEntry = StoredCarbEntry(startDate: date.addingTimeInterval(-.minutes(15)),
+                                                quantity: HKQuantity(unit: .gram(), doubleValue: 15),
+                                                uuid: UUID(uuidString: "C86DEB61-68E9-464E-9DD5-96A9CB445FD3")!,
                                                 provenanceIdentifier: Bundle.main.bundleIdentifier!,
                                                 syncIdentifier: "2B03D96C-6F5D-4140-99CD-80C3E64D6010",
                                                 syncVersion: 1,
-                                                startDate: date.addingTimeInterval(-.minutes(15)),
-                                                quantity: HKQuantity(unit: .gram(), doubleValue: 15),
                                                 foodType: "Simulated",
                                                 absorptionTime: .hours(3),
                                                 createdByCurrentApp: true,
                                                 userCreatedDate: date.addingTimeInterval(-.minutes(15)),
                                                 userUpdatedDate: date.addingTimeInterval(-.minutes(1)))
-        let carbEntry = StoredCarbEntry(uuid: UUID(uuidString: "71B699D7-0E8F-4B13-B7A1-E7751EB78E74")!,
+        let carbEntry = StoredCarbEntry(startDate: date.addingTimeInterval(-.minutes(1)),
+                                        quantity: HKQuantity(unit: .gram(), doubleValue: 25),
+                                        uuid: UUID(uuidString: "71B699D7-0E8F-4B13-B7A1-E7751EB78E74")!,
                                         provenanceIdentifier: Bundle.main.bundleIdentifier!,
                                         syncIdentifier: "2B03D96C-6F5D-4140-99CD-80C3E64D6010",
                                         syncVersion: 2,
-                                        startDate: date.addingTimeInterval(-.minutes(1)),
-                                        quantity: HKQuantity(unit: .gram(), doubleValue: 25),
                                         foodType: "Simulated",
                                         absorptionTime: .hours(5),
                                         createdByCurrentApp: true,
@@ -147,7 +147,7 @@ fileprivate extension StoredDosingDecision {
                                                       healthKitEligibleDate: nil)
         let carbsOnBoard = CarbValue(startDate: date,
                                      endDate: date.addingTimeInterval(.minutes(5)),
-                                     quantity: HKQuantity(unit: .gram(), doubleValue: 45.5))
+                                     value: 45.5)
         let insulinOnBoard = InsulinValue(startDate: date, value: 1.5)
         let glucoseTargetRangeSchedule = GlucoseRangeSchedule(rangeSchedule: DailyQuantitySchedule(unit: .milligramsPerDeciliter,
                                                                                                    dailyItems: [RepeatingScheduleValue(startTime: .hours(0), value: DoubleRange(minValue: 100.0, maxValue: 110.0)),

diff --git a/Loop/Extensions/EditMode.swift b/Loop/Extensions/EditMode.swift
@@ -10,7 +10,7 @@ import SwiftUI
 
 extension EditMode {
     var title: String {
-        self == .active ? "Done" : "Edit"
+        self == .active ? NSLocalizedString("Done", comment: "") : NSLocalizedString("Edit", comment: "")
     }
 
     mutating func toggle() {

diff --git a/Loop/Managers/Alerts/StoredAlert.swift b/Loop/Managers/Alerts/StoredAlert.swift
@@ -12,9 +12,19 @@ import UIKit
 
 extension StoredAlert {
 
-    static var encoder = JSONEncoder()
-    static var decoder = JSONDecoder()
-
+    static let encoder: JSONEncoder = {
+        let encoder = JSONEncoder()
+        encoder.outputFormatting = [.sortedKeys]
+        encoder.dateEncodingStrategy = .iso8601
+        return encoder
+    }()
+
+    static let decoder: JSONDecoder = {
+        let decoder = JSONDecoder()
+        decoder.dateDecodingStrategy = .iso8601
+        return decoder
+    }()
+
     convenience init(from alert: Alert, context: NSManagedObjectContext, issuedDate: Date = Date(), syncIdentifier: UUID = UUID()) {
         do {
             /// This code, using the `init(entity:insertInto:)` instead of the `init(context:)` avoids warnings during unit testing that look like this:

diff --git a/Loop/Managers/AnalyticsServicesManager.swift b/Loop/Managers/AnalyticsServicesManager.swift
@@ -28,7 +28,7 @@ final class AnalyticsServicesManager {
     }
 
     func removeService(_ analyticsService: AnalyticsService) {
-        analyticsServices.removeAll { $0.serviceIdentifier == analyticsService.serviceIdentifier }
+        analyticsServices.removeAll { $0.pluginIdentifier == analyticsService.pluginIdentifier }
     }
 
     private func logEvent(_ name: String, withProperties properties: [AnyHashable: Any]? = nil, outOfSession: Bool = false) {