Skip to content

Commit 693a264

Browse files
author
Bharat Mediratta
committed
Merge branch 'dev' into lock-screen-widget
2 parents 5d68765 + 4c5e32c commit 693a264

File tree

10 files changed

+70
-25
lines changed

10 files changed

+70
-25
lines changed

‎DoseMathTests/DoseMathTests.swift‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ class RecommendTempBasalTests: XCTestCase {
9797
maxBasalRate: maxBasalRate,
9898
glucoseTargetRange: glucoseTargetRange,
9999
insulinSensitivity: insulinSensitivitySchedule,
100-
basalRateSchedule: basalRateSchedule
100+
basalRateSchedule: basalRateSchedule,
101+
allowPredictiveTempBelowRange: false
101102
)
102103

103104
XCTAssertNil(dose)
@@ -112,7 +113,8 @@ class RecommendTempBasalTests: XCTestCase {
112113
maxBasalRate: maxBasalRate,
113114
glucoseTargetRange: glucoseTargetRange,
114115
insulinSensitivity: insulinSensitivitySchedule,
115-
basalRateSchedule: basalRateSchedule
116+
basalRateSchedule: basalRateSchedule,
117+
allowPredictiveTempBelowRange: false
116118
)
117119

118120
XCTAssertNil(dose)
@@ -132,7 +134,8 @@ class RecommendTempBasalTests: XCTestCase {
132134
maxBasalRate: maxBasalRate,
133135
glucoseTargetRange: glucoseTargetRange,
134136
insulinSensitivity: insulinSensitivitySchedule,
135-
basalRateSchedule: basalRateSchedule
137+
basalRateSchedule: basalRateSchedule,
138+
allowPredictiveTempBelowRange: false
136139
)
137140

138141
XCTAssertEqual(0, dose!.rate)
@@ -148,7 +151,8 @@ class RecommendTempBasalTests: XCTestCase {
148151
maxBasalRate: maxBasalRate,
149152
glucoseTargetRange: glucoseTargetRange,
150153
insulinSensitivity: insulinSensitivitySchedule,
151-
basalRateSchedule: basalRateSchedule
154+
basalRateSchedule: basalRateSchedule,
155+
allowPredictiveTempBelowRange: false
152156
)
153157

154158
XCTAssertEqual(0, dose!.rate)
@@ -197,7 +201,8 @@ class RecommendTempBasalTests: XCTestCase {
197201
maxBasalRate: maxBasalRate,
198202
glucoseTargetRange: glucoseTargetRange,
199203
insulinSensitivity: insulinSensitivitySchedule,
200-
basalRateSchedule: basalRateSchedule
204+
basalRateSchedule: basalRateSchedule,
205+
allowPredictiveTempBelowRange: false
201206
)
202207

203208
XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0)
@@ -218,7 +223,8 @@ class RecommendTempBasalTests: XCTestCase {
218223
maxBasalRate: maxBasalRate,
219224
glucoseTargetRange: glucoseTargetRange,
220225
insulinSensitivity: insulinSensitivitySchedule,
221-
basalRateSchedule: basalRateSchedule
226+
basalRateSchedule: basalRateSchedule,
227+
allowPredictiveTempBelowRange: false
222228
)
223229

224230
XCTAssertNil(dose)
@@ -238,7 +244,8 @@ class RecommendTempBasalTests: XCTestCase {
238244
maxBasalRate: maxBasalRate,
239245
glucoseTargetRange: glucoseTargetRange,
240246
insulinSensitivity: insulinSensitivitySchedule,
241-
basalRateSchedule: basalRateSchedule
247+
basalRateSchedule: basalRateSchedule,
248+
allowPredictiveTempBelowRange: false
242249
)
243250

244251
XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0)
@@ -259,7 +266,8 @@ class RecommendTempBasalTests: XCTestCase {
259266
maxBasalRate: maxBasalRate,
260267
glucoseTargetRange: glucoseTargetRange,
261268
insulinSensitivity: insulinSensitivitySchedule,
262-
basalRateSchedule: basalRateSchedule
269+
basalRateSchedule: basalRateSchedule,
270+
allowPredictiveTempBelowRange: false
263271
)
264272

265273
XCTAssertEqualWithAccuracy(0.125, dose!.rate, accuracy: 1.0 / 40.0)
@@ -309,7 +317,8 @@ class RecommendTempBasalTests: XCTestCase {
309317
maxBasalRate: maxBasalRate,
310318
glucoseTargetRange: glucoseTargetRange,
311319
insulinSensitivity: insulinSensitivitySchedule,
312-
basalRateSchedule: basalRateSchedule
320+
basalRateSchedule: basalRateSchedule,
321+
allowPredictiveTempBelowRange: false
313322
)
314323

315324
XCTAssertEqual(0, dose!.rate)
@@ -325,7 +334,8 @@ class RecommendTempBasalTests: XCTestCase {
325334
maxBasalRate: maxBasalRate,
326335
glucoseTargetRange: glucoseTargetRange,
327336
insulinSensitivity: insulinSensitivitySchedule,
328-
basalRateSchedule: basalRateSchedule
337+
basalRateSchedule: basalRateSchedule,
338+
allowPredictiveTempBelowRange: false
329339
)
330340

331341
XCTAssertEqual(0, dose!.rate)
@@ -375,7 +385,8 @@ class RecommendTempBasalTests: XCTestCase {
375385
maxBasalRate: maxBasalRate,
376386
glucoseTargetRange: glucoseTargetRange,
377387
insulinSensitivity: insulinSensitivitySchedule,
378-
basalRateSchedule: basalRateSchedule
388+
basalRateSchedule: basalRateSchedule,
389+
allowPredictiveTempBelowRange: false
379390
)
380391

381392
XCTAssertEqual(3.0, dose!.rate)
@@ -391,7 +402,8 @@ class RecommendTempBasalTests: XCTestCase {
391402
maxBasalRate: maxBasalRate,
392403
glucoseTargetRange: glucoseTargetRange,
393404
insulinSensitivity: insulinSensitivitySchedule,
394-
basalRateSchedule: basalRateSchedule
405+
basalRateSchedule: basalRateSchedule,
406+
allowPredictiveTempBelowRange: false
395407
)
396408

397409
XCTAssertEqualWithAccuracy(1.425, dose!.rate, accuracy: 1.0 / 40.0)
@@ -407,7 +419,8 @@ class RecommendTempBasalTests: XCTestCase {
407419
maxBasalRate: maxBasalRate,
408420
glucoseTargetRange: glucoseTargetRange,
409421
insulinSensitivity: insulinSensitivitySchedule,
410-
basalRateSchedule: basalRateSchedule
422+
basalRateSchedule: basalRateSchedule,
423+
allowPredictiveTempBelowRange: false
411424
)
412425

413426
XCTAssertEqualWithAccuracy(1.475, dose!.rate, accuracy: 1.0 / 40.0)
@@ -423,7 +436,8 @@ class RecommendTempBasalTests: XCTestCase {
423436
maxBasalRate: maxBasalRate,
424437
glucoseTargetRange: glucoseTargetRange,
425438
insulinSensitivity: self.insulinSensitivitySchedule,
426-
basalRateSchedule: basalRateSchedule
439+
basalRateSchedule: basalRateSchedule,
440+
allowPredictiveTempBelowRange: false
427441
)
428442

429443
XCTAssertEqual(3.0, dose!.rate)
@@ -438,7 +452,8 @@ class RecommendTempBasalTests: XCTestCase {
438452
maxBasalRate: maxBasalRate,
439453
glucoseTargetRange: glucoseTargetRange,
440454
insulinSensitivity: insulinSensitivitySchedule,
441-
basalRateSchedule: basalRateSchedule
455+
basalRateSchedule: basalRateSchedule,
456+
allowPredictiveTempBelowRange: false
442457
)
443458

444459
XCTAssertEqualWithAccuracy(2.975, dose!.rate, accuracy: 1.0 / 40.0)
@@ -451,7 +466,8 @@ class RecommendTempBasalTests: XCTestCase {
451466
maxBasalRate: maxBasalRate,
452467
glucoseTargetRange: glucoseTargetRange,
453468
insulinSensitivity: insulinSensitivitySchedule,
454-
basalRateSchedule: basalRateSchedule
469+
basalRateSchedule: basalRateSchedule,
470+
allowPredictiveTempBelowRange: false
455471
)
456472

457473
XCTAssertNil(dose)

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
4F70C2131DE90339006380B7 /* StatusExtensionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F70C2111DE900EA006380B7 /* StatusExtensionContext.swift */; };
176176
4FC8C8011DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */; };
177177
4FC8C8021DEB943800A1452E /* NSUserDefaults+StatusExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */; };
178+
4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43C6407B1DA051850093E25D /* InsulinKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
178179
C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
179180
C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; };
180181
C17884631D51A7A400405663 /* BatteryIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17884621D51A7A400405663 /* BatteryIndicator.swift */; };
@@ -265,6 +266,7 @@
265266
dstPath = "";
266267
dstSubfolderSpec = 10;
267268
files = (
269+
4F526D5D1DF0FD6500A04910 /* InsulinKit.framework in CopyFiles */,
268270
43E2D9171D2226BD004DA55F /* LoopKit.framework in CopyFiles */,
269271
);
270272
runOnlyForDeploymentPostprocessing = 0;
@@ -956,8 +958,13 @@
956958
43776F841B8022E90074EA36 /* Project object */ = {
957959
isa = PBXProject;
958960
attributes = {
961+
<<<<<<< HEAD
959962
LastSwiftUpdateCheck = 0810;
960963
LastUpgradeCheck = 0800;
964+
=======
965+
LastSwiftUpdateCheck = 0730;
966+
LastUpgradeCheck = 0810;
967+
>>>>>>> dev
961968
ORGANIZATIONNAME = "LoopKit Authors";
962969
TargetAttributes = {
963970
43776F8B1B8022E90074EA36 = {
@@ -1414,6 +1421,7 @@
14141421
baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */;
14151422
buildSettings = {
14161423
ALWAYS_SEARCH_USER_PATHS = NO;
1424+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
14171425
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
14181426
CLANG_CXX_LIBRARY = "libc++";
14191427
CLANG_ENABLE_MODULES = YES;
@@ -1466,6 +1474,7 @@
14661474
baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */;
14671475
buildSettings = {
14681476
ALWAYS_SEARCH_USER_PATHS = NO;
1477+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
14691478
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
14701479
CLANG_CXX_LIBRARY = "libc++";
14711480
CLANG_ENABLE_MODULES = YES;

‎Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Loop/Managers/DoseMath.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct DoseMath {
6262
glucoseTargetRange: GlucoseRangeSchedule,
6363
insulinSensitivity: InsulinSensitivitySchedule,
6464
basalRateSchedule: BasalRateSchedule,
65-
allowPredictiveTempBelowRange: Bool = false
65+
allowPredictiveTempBelowRange: Bool
6666
) -> (rate: Double, duration: TimeInterval)? {
6767
guard glucose.count > 1 else {
6868
return nil

‎Loop/View Controllers/BolusViewController.swift‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
2222
bolusAmountTextField.accessibilityHint = String(format: NSLocalizedString("Recommended Bolus: %@ Units", comment: "Accessibility hint describing recommended bolus units"), spellOutFormatter.string(from: NSNumber(value: recommendedBolus)) ?? "0")
2323

2424
bolusAmountTextField.becomeFirstResponder()
25-
25+
2626
AnalyticsManager.sharedManager.didDisplayBolusScreen()
2727
}
2828

@@ -42,10 +42,30 @@ final class BolusViewController: UITableViewController, IdentifiableClass, UITex
4242
}
4343
}
4444

45+
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
46+
if (indexPath.row == 0) {
47+
acceptRecommendedBolus();
48+
}
49+
}
50+
51+
override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
52+
if (indexPath.row == 0) {
53+
cell.accessibilityCustomActions = [
54+
UIAccessibilityCustomAction(name: NSLocalizedString("AcceptRecommendedBolus", comment: "Action to copy the recommended Bolus value to the actual Bolus Field"), target: self, selector: #selector(BolusViewController.acceptRecommendedBolus))
55+
]
56+
}
57+
}
58+
59+
@objc
60+
func acceptRecommendedBolus() {
61+
bolusAmountTextField?.text = recommendedBolusAmountLabel?.text
62+
}
63+
64+
4565
@IBOutlet weak var bolusAmountTextField: UITextField!
4666

4767
// MARK: - Actions
48-
68+
4969
@IBAction func authenticateBolus(_ sender: Any) {
5070
bolusAmountTextField.resignFirstResponder()
5171

0 commit comments

Comments
 (0)