Skip to content

Commit 4074b04

Browse files
ps2ps2
authored
Merge pull request #2189 from LoopKit/release-3.4
Release 3.4
2 parents c6b058b + 49feb51 commit 4074b04

File tree

350 files changed

+9648
-11398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+9648
-11398
lines changed

‎.github/workflows/inactive_issues.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Close inactive issues
2+
on:
3+
schedule:
4+
- cron: "30 1 * * *"
5+
6+
jobs:
7+
close-issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
steps:
13+
- uses: actions/stale@v5
14+
with:
15+
operations-per-run: 100
16+
days-before-issue-stale: 30
17+
days-before-issue-close: 14
18+
stale-issue-label: "stale"
19+
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
20+
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
21+
days-before-pr-stale: -1
22+
days-before-pr-close: -1
23+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,12 @@ VersionOverride.xcconfig
7777

7878
Loop/DerivedAssets.xcassets/*
7979
WatchApp/DerivedAssets.xcassets/*
80+
Loop\ Widget\ Extension/DerivedAssets.xcassets/*
8081
# ...except, keep Contents.json
8182
!Loop/DerivedAssets.xcassets/Contents.json
8283
!WatchApp/DerivedAssets.xcassets/Contents.json
84+
!Loop\ Widget\ Extension/DerivedAssets.xcassets/Contents.json
8385

8486
Loop/DerivedAssetsOverride.xcassets
8587
WatchApp/DerivedAssetsOverride.xcassets
88+
Loop\ Widget\ Extension/DerivedAssetsOverride.xcassets

‎Common/Extensions/GlucoseRangeSchedule.swift

+2-8
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@ extension GlucoseRangeSchedule {
1313
func minQuantity(at date: Date) -> HKQuantity {
1414
return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
1515
}
16-
}
17-
18-
19-
extension ClosedRange where Bound == HKQuantity {
20-
func averageValue(for unit: HKUnit) -> Double {
21-
let minValue = lowerBound.doubleValue(for: unit)
22-
let maxValue = upperBound.doubleValue(for: unit)
23-
return (maxValue + minValue) / 2
16+
func maxQuantity(at date: Date) -> HKQuantity {
17+
return HKQuantity(unit: unit, doubleValue: value(at: date).maxValue)
2418
}
2519
}

‎Common/Extensions/NSBundle.swift

+1
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ extension Bundle {
6161
return .days(localCacheDurationDays)
6262
}
6363
}
64+

‎Common/FeatureFlags.swift

+33-5
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ struct FeatureFlagConfiguration: Decodable {
3535
let siriEnabled: Bool
3636
let simpleBolusCalculatorEnabled: Bool
3737
let usePositiveMomentumAndRCForManualBoluses: Bool
38-
let dynamicCarbAbsorptionEnabled: Bool
3938
let adultChildInsulinModelSelectionEnabled: Bool
4039
let profileExpirationSettingsViewEnabled: Bool
40+
let missedMealNotifications: Bool
41+
let allowAlgorithmExperiments: Bool
4142

4243

4344
fileprivate init() {
@@ -212,14 +213,25 @@ struct FeatureFlagConfiguration: Decodable {
212213
self.adultChildInsulinModelSelectionEnabled = false
213214
#endif
214215

215-
self.dynamicCarbAbsorptionEnabled = true
216-
217216
// ProfileExpirationSettingsView is inverse, since the default state is enabled.
218217
#if PROFILE_EXPIRATION_SETTINGS_VIEW_DISABLED
219218
self.profileExpirationSettingsViewEnabled = false
220219
#else
221220
self.profileExpirationSettingsViewEnabled = true
222221
#endif
222+
223+
// Missed meal notifications compiler flag is inverse, since the default state is enabled.
224+
#if MISSED_MEAL_NOTIFICATIONS_DISABLED
225+
self.missedMealNotifications = false
226+
#else
227+
self.missedMealNotifications = true
228+
#endif
229+
230+
#if ALLOW_ALGORITHM_EXPERIMENTS
231+
self.allowAlgorithmExperiments = true
232+
#else
233+
self.allowAlgorithmExperiments = false
234+
#endif
223235
}
224236
}
225237

@@ -251,9 +263,11 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
251263
"* allowDebugFeatures: \(allowDebugFeatures)",
252264
"* simpleBolusCalculatorEnabled: \(simpleBolusCalculatorEnabled)",
253265
"* usePositiveMomentumAndRCForManualBoluses: \(usePositiveMomentumAndRCForManualBoluses)",
254-
"* dynamicCarbAbsorptionEnabled: \(dynamicCarbAbsorptionEnabled)",
255266
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
256-
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)"
267+
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
268+
"* missedMealNotifications: \(missedMealNotifications)",
269+
"* allowAlgorithmExperiments: \(allowAlgorithmExperiments)",
270+
"* allowExperimentalFeatures: \(allowExperimentalFeatures)"
257271
].joined(separator: "\n")
258272
}
259273
}
@@ -277,6 +291,20 @@ extension FeatureFlagConfiguration {
277291
#endif
278292
}
279293

294+
var allowExperimentalFeatures: Bool {
295+
#if EXPERIMENTAL_FEATURES_ENABLED
296+
return true
297+
#elseif EXPERIMENTAL_FEATURES_ENABLED_CONDITIONALLY
298+
if debugEnabled {
299+
return true
300+
} else {
301+
return UserDefaults.appGroup?.allowExperimentalFeatures ?? false
302+
}
303+
#else
304+
return false
305+
#endif
306+
}
307+
280308
var allowSimulators: Bool {
281309
#if SIMULATORS_ENABLED
282310
return true

‎Common/Models/PumpManager.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import MockKit
1212
import MockKitUI
1313

1414
let staticPumpManagersByIdentifier: [String: PumpManagerUI.Type] = [
15-
MockPumpManager.managerIdentifier : MockPumpManager.self
15+
MockPumpManager.pluginIdentifier : MockPumpManager.self
1616
]
1717

1818
var availableStaticPumpManagers: [PumpManagerDescriptor] {
1919
if FeatureFlags.allowSimulators {
2020
return [
21-
PumpManagerDescriptor(identifier: MockPumpManager.managerIdentifier, localizedTitle: MockPumpManager.localizedTitle)
21+
PumpManagerDescriptor(identifier: MockPumpManager.pluginIdentifier, localizedTitle: MockPumpManager.localizedTitle)
2222
]
2323
} else {
2424
return []
@@ -31,7 +31,7 @@ extension PumpManager {
3131

3232
var rawValue: RawValue {
3333
return [
34-
"managerIdentifier": self.managerIdentifier,
34+
"managerIdentifier": self.pluginIdentifier,
3535
"state": self.rawState
3636
]
3737
}

‎Common/Models/StatusExtensionContext.swift

+11-3
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ extension GlucoseDisplayableContext: RawRepresentable {
160160
trendType = nil
161161
}
162162

163-
if let trendRateUnit = rawValue["trendRateUnit"] as? String, let trendRateValue = rawValue["trendRateValue"] as? Double {
164-
trendRate = HKQuantity(unit: HKUnit(from: trendRateUnit), doubleValue: trendRateValue)
163+
if let trendRateValue = rawValue["trendRateValue"] as? Double {
164+
trendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: trendRateValue)
165165
} else {
166166
trendRate = nil
167167
}
@@ -181,7 +181,6 @@ extension GlucoseDisplayableContext: RawRepresentable {
181181
]
182182
raw["trendType"] = trendType?.rawValue
183183
if let trendRate = trendRate {
184-
raw["trendRateUnit"] = HKUnit.milligramsPerDeciliterPerMinute.unitString
185184
raw["trendRateValue"] = trendRate.doubleValue(for: HKUnit.milligramsPerDeciliterPerMinute)
186185
}
187186
raw["glucoseRangeCategory"] = glucoseRangeCategory?.rawValue
@@ -298,6 +297,9 @@ struct StatusExtensionContext: RawRepresentable {
298297
var lastLoopCompleted: Date?
299298
var createdAt: Date?
300299
var isClosedLoop: Bool?
300+
var preMealPresetAllowed: Bool?
301+
var preMealPresetActive: Bool?
302+
var customPresetActive: Bool?
301303
var netBasal: NetBasalContext?
302304
var batteryPercentage: Double?
303305
var reservoirCapacity: Double?
@@ -327,6 +329,9 @@ struct StatusExtensionContext: RawRepresentable {
327329
lastLoopCompleted = rawValue["lastLoopCompleted"] as? Date
328330
createdAt = rawValue["createdAt"] as? Date
329331
isClosedLoop = rawValue["isClosedLoop"] as? Bool
332+
preMealPresetAllowed = rawValue["preMealPresetAllowed"] as? Bool
333+
preMealPresetActive = rawValue["preMealPresetActive"] as? Bool
334+
customPresetActive = rawValue["customPresetActive"] as? Bool
330335
batteryPercentage = rawValue["batteryPercentage"] as? Double
331336
reservoirCapacity = rawValue["reservoirCapacity"] as? Double
332337
carbsOnBoard = rawValue["carbsOnBoard"] as? Double
@@ -365,6 +370,9 @@ struct StatusExtensionContext: RawRepresentable {
365370
raw["lastLoopCompleted"] = lastLoopCompleted
366371
raw["createdAt"] = createdAt
367372
raw["isClosedLoop"] = isClosedLoop
373+
raw["preMealPresetAllowed"] = preMealPresetAllowed
374+
raw["preMealPresetActive"] = preMealPresetActive
375+
raw["customPresetActive"] = customPresetActive
368376
raw["netBasal"] = netBasal?.rawValue
369377
raw["batteryPercentage"] = batteryPercentage
370378
raw["reservoirCapacity"] = reservoirCapacity

‎Common/Models/WatchContext.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ final class WatchContext: RawRepresentable {
7575
if let rawGlucoseTrend = rawValue["gt"] as? GlucoseTrend.RawValue {
7676
glucoseTrend = GlucoseTrend(rawValue: rawGlucoseTrend)
7777
}
78-
if let glucoseTrendRateUnitString = rawValue["gtru"] as? String, let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
79-
glucoseTrendRate = HKQuantity(unit: HKUnit(from: glucoseTrendRateUnitString), doubleValue: glucoseTrendRateValue)
78+
if let glucoseTrendRateValue = rawValue["gtrv"] as? Double {
79+
glucoseTrendRate = HKQuantity(unit: .milligramsPerDeciliterPerMinute, doubleValue: glucoseTrendRateValue)
8080
}
8181
glucoseDate = rawValue["gd"] as? Date
8282
glucoseIsDisplayOnly = rawValue["gdo"] as? Bool

‎Common/de.lproj/Intents.strings

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
"9KhaIS" = "Voreinstellung gesetzt";
33

44
/* (No Comment) */
5-
"80eo5o" = "Kohlenhydrate hinzufügen";
5+
"80eo5o" = "KH-Eintrag hinzufügen";
66

77
/* (No Comment) */
88
"b085BW" = "Voreinstellung konnte nicht gesetzt werden.";
99

1010
/* (No Comment) */
11-
"I4OZy8" = "Enable Override Preset";
11+
"I4OZy8" = "Aktiviere Voreinstellung";
1212

1313
/* (No Comment) */
1414
"lYMuWV" = "Voreinstellungs-Name";
1515

1616
/* (No Comment) */
17-
"nDKAmn" = "Welche Voreinstellung möchten Sie aktivieren?";
17+
"nDKAmn" = "Welche Voreinstellung möchtest Du aktivieren?";
1818

1919
/* (No Comment) */
20-
"OcNxIj" = "Kohlenhydrate hinzufügen";
20+
"OcNxIj" = "KH hinzufügen";
2121

2222
/* (No Comment) */
2323
"oLQSsJ" = "Aktiviere '${overrideName}' Voreinstellung";

‎Common/he.lproj/Intents.strings

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
/* (No Comment) */
2-
"9KhaIS" = "I've set the preset";
2+
"9KhaIS" = "ההגדרה נקבעה";
33

44
/* (No Comment) */
5-
"80eo5o" = "Add Carb Entry";
5+
"80eo5o" = "הוסף שורת פחמימות";
66

77
/* (No Comment) */
8-
"b085BW" = "I wasn't able to set the preset.";
8+
"b085BW" = "לא הצלחתי לקבוע את ההגדרה.";
99

1010
/* (No Comment) */
11-
"I4OZy8" = "Enable Override Preset";
11+
"I4OZy8" = "אפשר מעקף מוגדר";
1212

1313
/* (No Comment) */
14-
"lYMuWV" = "Override Name";
14+
"lYMuWV" = "שם המעקף";
1515

1616
/* (No Comment) */
17-
"nDKAmn" = "What's the name of the override you'd like to set?";
17+
"nDKAmn" = "מה שם המעקף שברצונך ליצור?";
1818

1919
/* (No Comment) */
20-
"OcNxIj" = "Add Carb Entry";
20+
"OcNxIj" = "הוסף שורת פחמימות";
2121

2222
/* (No Comment) */
23-
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
23+
"oLQSsJ" = "אפשר מעקף ${overrideName} מוגדר";
2424

2525
/* (No Comment) */
26-
"XNNmtH" = "Enable preset in Loop";
26+
"XNNmtH" = "אפשר את ההגדרה ב-Loop";
2727

2828
/* (No Comment) */
29-
"yBzwCL" = "Override Selection";
29+
"yBzwCL" = "בחירת מעקף";
3030

3131
/* (No Comment) */
32-
"yc02Yq" = "Add a carb entry to Loop";
32+
"yc02Yq" = "הוסף שורת פחמימות ל-Loop";
3333

3434
/* (No Comment) */
35-
"ZZ3mtM" = "Enable an override preset in Loop";
35+
"ZZ3mtM" = "אפשר את המעקף ב-Loop";
3636

‎Common/hi.lproj/Intents.strings

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
"80eo5o" = "Add Carb Entry";
2+
3+
"9KhaIS" = "I've set the preset";
4+
5+
"I4OZy8" = "Enable Override Preset";
6+
7+
"OcNxIj" = "Add Carb Entry";
8+
9+
"XNNmtH" = "Enable preset in Loop";
10+
11+
"ZZ3mtM" = "Enable an override preset in Loop";
12+
13+
"b085BW" = "I wasn't able to set the preset.";
14+
15+
"lYMuWV" = "Override Name";
16+
17+
"nDKAmn" = "What's the name of the override you'd like to set?";
18+
19+
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
20+
21+
"yBzwCL" = "Override Selection";
22+
23+
"yc02Yq" = "Add a carb entry to Loop";
24+

‎Common/pl.lproj/Intents.strings

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* (No Comment) */
2-
"9KhaIS" = "Ustawiłem Cel Tymczas.";
2+
"9KhaIS" = "Ustawiłem Cel Tymczasowy";
33

44
/* (No Comment) */
55
"80eo5o" = "Wprowadź węglowodany";

‎DoseMathTests/Base.lproj/Localizable.strings

-26
This file was deleted.

0 commit comments

Comments
 (0)