Merge branch 'dev' of github.com:nightscout/Trio into feat/o5

Config.xcconfig

@@ -18,8 +18,8 @@ BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).trio
 TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
-APP_VERSION = 0.8.3
-APP_DEV_VERSION = 0.8.3.10
+APP_VERSION = 0.8.4
+APP_DEV_VERSION = 0.8.4.1
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

G7SensorKit

@@ -1 +1 @@
-Subproject commit 4d0780db06c7c95b3a3bf3cdb2f2838d521e411a
+Subproject commit 0c87905297b70a7f0fa41e87fa0fbe1efff6c29f

MedtrumKit

@@ -1 +1 @@
-Subproject commit 1c2d10fd73478f37773f96facf30ff63dbbc05e1
+Subproject commit 3ad0979a3c8fc36c2d48a76da8ea70ef2132943a

Trio/Sources/APS/APSManager.swift

@@ -1086,17 +1086,14 @@ final class BaseAPSManager: APSManager, Injectable {
             let glucose24h = try await fetchGlucose(predicate: NSPredicate.predicateForOneDayAgo, fetchLimit: 288, batchSize: 50)
             let glucoseOneWeek = try await fetchGlucose(
                 predicate: NSPredicate.predicateForOneWeek,
-                fetchLimit: 288 * 7,
                 batchSize: 250
             )
             let glucoseOneMonth = try await fetchGlucose(
                 predicate: NSPredicate.predicateForOneMonth,
-                fetchLimit: 288 * 7 * 30,
                 batchSize: 500
             )
             let glucoseThreeMonths = try await fetchGlucose(
                 predicate: NSPredicate.predicateForThreeMonths,
-                fetchLimit: 288 * 7 * 30 * 3,
                 batchSize: 1000
             )
 

Trio/Sources/APS/Storage/PumpHistoryStorage.swift

@@ -274,8 +274,7 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
             onContext: context,
             predicate: NSPredicate.pumpHistoryLast24h,
             key: "timestamp",
-            ascending: false,
-            fetchLimit: 288
+            ascending: false
         )
 
         return await context.perform {

Trio/Sources/Modules/Onboarding/View/OnboardingView+Util.swift

@@ -553,7 +553,7 @@ enum PumpOptionForOnboardingUnits: String, Equatable, CaseIterable, Identifiable
         case .minimed:
             return "Medtronic"
         case .omni:
-            return "All Omnipod Types"
+            return "Omnipod"
         case .dana:
             return "Dana (RS/-i)"
         case .medtrum:

Trio/Sources/Services/BolusCalculator/BolusCalculationManager.swift

@@ -196,8 +196,7 @@ final class BaseBolusCalculationManager: BolusCalculationManager, Injectable {
             onContext: glucoseFetchContext,
             predicate: NSPredicate.glucose,
             key: "date",
-            ascending: false,
-            fetchLimit: 288
+            ascending: false
         )
 
         return try await glucoseFetchContext.perform {

Trio/Sources/Services/LiveActivity/Data/DataManager.swift

@@ -11,8 +11,7 @@ extension LiveActivityManager {
             onContext: context,
             predicate: NSPredicate.predicateForSixHoursAgo,
             key: "date",
-            ascending: false,
-            fetchLimit: 72
+            ascending: false
         )
 
         return try await context.perform {

Trio/Sources/Services/WatchManager/AppleWatchManager.swift

@@ -379,8 +379,7 @@ final class BaseWatchManager: NSObject, WCSessionDelegate, Injectable, WatchMana
             onContext: backgroundContext,
             predicate: NSPredicate.glucose,
             key: "date",
-            ascending: false,
-            fetchLimit: 288
+            ascending: false
         )
 
         return try await backgroundContext.perform {

Trio/Sources/Views/BolusProgressBar.swift

@@ -19,6 +19,7 @@ struct BolusProgressBar: View {
                         .mask(alignment: .leading) {
                             RoundedRectangle(cornerRadius: 15)
                                 .frame(width: geo.size.width * CGFloat(progress))
+                                .animation(.easeInOut(duration: 0.25), value: progress)
                         }
                 )
         }