Skip to content

Commit 40b599a

Browse files
ps2ps2
committed
Merge remote-tracking branch 'origin/dev' into omnikit
2 parents a7b01e1 + 78260ca commit 40b599a

File tree

11 files changed

+404
-125
lines changed

11 files changed

+404
-125
lines changed

‎Cartfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ github "LoopKit/dexcom-share-client-swift" "dev"
55
github "LoopKit/G4ShareSpy" "dev"
66
github "ps2/rileylink_ios" "omnipod-testing"
77
github "LoopKit/Amplitude-iOS" "decreepify"
8+
github "maxkonovalov/MKRingProgressView" ~> 2.2

‎Cartfile.resolved‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
22
github "LoopKit/CGMBLEKit" "ea1267791c66e884f1013fffd36faf4555cc6eaf"
33
github "LoopKit/G4ShareSpy" "fed5a389e3e47e3a1953878dd21852aa5f44b360"
4-
github "LoopKit/LoopKit" "3c31297a8c3ee1ac5552f4edc6b4bf454267a549"
4+
github "LoopKit/LoopKit" "e386a24577244ee6b2add52e8b2aff0385c2200b"
55
github "LoopKit/dexcom-share-client-swift" "b0419edf55c7f389b36cb47dd5c376bbd3d03d69"
66
github "i-schuetz/SwiftCharts" "0.6.3"
77
github "ps2/rileylink_ios" "7345ade8fd6d1516c058c9b12f7b465ccbf242db"
8+
github "maxkonovalov/MKRingProgressView" "2.2.1"

‎LICENSE.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ Copyright (c) 2016 Mark Wilson
5858
Copyright (c) 2015 Nathan Racklyeft
5959
Copyright (c) 2016 LoopKit Authors
6060

61+
## MKRingProgressView.framework
62+
63+
Copyright (c) 2015 Max Konovalov
64+
65+
6166
> Permission is hereby granted, free of charge, to any person obtaining a copy
6267
> of this software and associated documentation files (the "Software"), to deal
6368
> in the Software without restriction, including without limitation the rights

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
4344628F20A7ADD500C4BE6F /* UserDefaults+CGM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4344628D20A7ADD100C4BE6F /* UserDefaults+CGM.swift */; };
6363
4344629220A7C19800C4BE6F /* ButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4344629120A7C19800C4BE6F /* ButtonGroup.swift */; };
6464
4344629820A8B2D700C4BE6F /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5EE209D84BE00D17AA8 /* OSLog.swift */; };
65-
4345E3F221F0351E009E00E5 /* Locked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5F1209D897600D17AA8 /* Locked.swift */; };
66-
4345E3F321F0351E009E00E5 /* Locked.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4374B5F1209D897600D17AA8 /* Locked.swift */; };
6765
4345E3F421F036FC009E00E5 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848AF1E7DCBE100DADCBC /* Result.swift */; };
6866
4345E3F521F036FC009E00E5 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D848AF1E7DCBE100DADCBC /* Result.swift */; };
6967
4345E3F821F03D2A009E00E5 /* DatesAndNumberCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4345E3F721F03D2A009E00E5 /* DatesAndNumberCell.swift */; };
@@ -342,6 +340,7 @@
342340
C110A0E8221BC2430016560B /* OmniKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1C0220D675700689850 /* OmniKitUI.framework */; };
343341
C11C87DE1E21EAAD00BB71D3 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
344342
C12F21A71DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */; };
343+
C13255D6223E7BE2008AF50C /* BolusProgressTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */; };
345344
C13BAD941E8009B000050CB5 /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; };
346345
C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; };
347346
C168C40621B0D53E00ADE90E /* MinimedKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C168C40521B0D53E00ADE90E /* MinimedKit.framework */; };
@@ -358,6 +357,8 @@
358357
C1C7F1C1220D675800689850 /* OmniKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1BF220D675700689850 /* OmniKit.framework */; };
359358
C1C7F1C2220D675800689850 /* OmniKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1C0220D675700689850 /* OmniKitUI.framework */; };
360359
C1E2773E224177C000354103 /* ClockKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2773D224177C000354103 /* ClockKit.framework */; };
360+
C1E2774822433D7A00354103 /* MKRingProgressView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2774722433D7A00354103 /* MKRingProgressView.framework */; };
361+
C1F8B243223E73FD00DD66CF /* BolusProgressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */; };
361362
C1FB428C217806A400FAB378 /* StateColorPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428B217806A300FAB378 /* StateColorPalette.swift */; };
362363
C1FB428D21791D2500FAB378 /* PumpManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6F620BBCAA30026CAFA /* PumpManager.swift */; };
363364
C1FB428F217921D600FAB378 /* PumpManagerUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428E217921D600FAB378 /* PumpManagerUI.swift */; };
@@ -642,7 +643,6 @@
642643
4372E48F213CFCE70068E043 /* LoopSettingsUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopSettingsUserInfo.swift; sourceTree = "<group>"; };
643644
4372E495213DCDD30068E043 /* GlucoseChartValueHashable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseChartValueHashable.swift; sourceTree = "<group>"; };
644645
4374B5EE209D84BE00D17AA8 /* OSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = "<group>"; };
645-
4374B5F1209D897600D17AA8 /* Locked.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locked.swift; sourceTree = "<group>"; };
646646
4374B5F3209D89A900D17AA8 /* TextFieldTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewCell.swift; sourceTree = "<group>"; };
647647
43776F8C1B8022E90074EA36 /* Loop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Loop.app; sourceTree = BUILT_PRODUCTS_DIR; };
648648
43776F8F1B8022E90074EA36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AppDelegate.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -1010,6 +1010,9 @@
10101010
C1C7F1BF220D675700689850 /* OmniKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OmniKit.framework; path = Carthage/Build/iOS/OmniKit.framework; sourceTree = "<group>"; };
10111011
C1C7F1C0220D675700689850 /* OmniKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OmniKitUI.framework; path = Carthage/Build/iOS/OmniKitUI.framework; sourceTree = "<group>"; };
10121012
C1E2773D224177C000354103 /* ClockKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ClockKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS5.1.sdk/System/Library/Frameworks/ClockKit.framework; sourceTree = DEVELOPER_DIR; };
1013+
C1E2774722433D7A00354103 /* MKRingProgressView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MKRingProgressView.framework; path = Carthage/Build/iOS/MKRingProgressView.framework; sourceTree = "<group>"; };
1014+
C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BolusProgressTableViewCell.swift; sourceTree = "<group>"; };
1015+
C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BolusProgressTableViewCell.xib; sourceTree = "<group>"; };
10131016
C1FB428B217806A300FAB378 /* StateColorPalette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StateColorPalette.swift; sourceTree = "<group>"; };
10141017
C1FB428E217921D600FAB378 /* PumpManagerUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PumpManagerUI.swift; sourceTree = "<group>"; };
10151018
/* End PBXFileReference section */
@@ -1027,6 +1030,7 @@
10271030
buildActionMask = 2147483647;
10281031
files = (
10291032
43D9FFD621EAE05D00AF44BF /* LoopCore.framework in Frameworks */,
1033+
C1E2774822433D7A00354103 /* MKRingProgressView.framework in Frameworks */,
10301034
892A5D5B222F0D7C008961AB /* LoopTestingKit.framework in Frameworks */,
10311035
892A5D2A222EF60A008961AB /* MockKit.framework in Frameworks */,
10321036
892A5D2C222EF60A008961AB /* MockKitUI.framework in Frameworks */,
@@ -1394,7 +1398,6 @@
13941398
430B298D2041F56500BA9F93 /* GlucoseThreshold.swift */,
13951399
43C05CB721EBEA54006FB252 /* HKUnit.swift */,
13961400
434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */,
1397-
4374B5F1209D897600D17AA8 /* Locked.swift */,
13981401
430B298C2041F56500BA9F93 /* LoopSettings.swift */,
13991402
430B29892041F54A00BA9F93 /* NSUserDefaults.swift */,
14001403
431E73471FF95A900069B5F7 /* PersistenceController.swift */,
@@ -1499,6 +1502,8 @@
14991502
43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */,
15001503
43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
15011504
4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
1505+
C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */,
1506+
C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */,
15021507
);
15031508
path = Views;
15041509
sourceTree = "<group>";
@@ -1705,6 +1710,7 @@
17051710
C1C7F1BF220D675700689850 /* OmniKit.framework */,
17061711
C1C7F1C0220D675700689850 /* OmniKitUI.framework */,
17071712
C1E2773D224177C000354103 /* ClockKit.framework */,
1713+
C1E2774722433D7A00354103 /* MKRingProgressView.framework */,
17081714
892A5D5A222F0D7C008961AB /* LoopTestingKit.framework */,
17091715
892A5D29222EF60A008961AB /* MockKit.framework */,
17101716
892A5D2B222EF60A008961AB /* MockKitUI.framework */,
@@ -2084,6 +2090,7 @@
20842090
developmentRegion = English;
20852091
hasScannedForEncodings = 0;
20862092
knownRegions = (
2093+
English,
20872094
en,
20882095
Base,
20892096
fr,
@@ -2094,6 +2101,7 @@
20942101
nb,
20952102
es,
20962103
pl,
2104+
ru,
20972105
);
20982106
mainGroup = 43776F831B8022E90074EA36;
20992107
productRefGroup = 43776F8D1B8022E90074EA36 /* Products */;
@@ -2120,6 +2128,7 @@
21202128
isa = PBXResourcesBuildPhase;
21212129
buildActionMask = 2147483647;
21222130
files = (
2131+
C13255D6223E7BE2008AF50C /* BolusProgressTableViewCell.xib in Resources */,
21232132
43FCBBC21E51710B00343C1B /* LaunchScreen.storyboard in Resources */,
21242133
7D70764F1FE06EE1004AC8EA /* InfoPlist.strings in Resources */,
21252134
43776F991B8022E90074EA36 /* Assets.xcassets in Resources */,
@@ -2306,6 +2315,10 @@
23062315
"$(SRCROOT)/Carthage/Build/iOS/LoopTestingKit.framework",
23072316
"$(SRCROOT)/Carthage/Build/iOS/MockKit.framework",
23082317
"$(SRCROOT)/Carthage/Build/iOS/MockKitUI.framework",
2318+
"$(SRCROOT)/Carthage/Build/iOS/MockKit.framework",
2319+
"$(SRCROOT)/Carthage/Build/iOS/MockKitUI.framework",
2320+
"$(SRCROOT)/Carthage/Build/iOS/LoopTestingKit.framework",
2321+
"$(SRCROOT)/Carthage/Build/iOS/MKRingProgressView.framework",
23092322
);
23102323
name = "Copy Frameworks with Carthage";
23112324
outputPaths = (
@@ -2357,6 +2370,7 @@
23572370
430B29932041F5B300BA9F93 /* UserDefaults+Loop.swift in Sources */,
23582371
4341F4EB1EDB92AC001C936B /* LogglyService.swift in Sources */,
23592372
43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */,
2373+
C1F8B243223E73FD00DD66CF /* BolusProgressTableViewCell.swift in Sources */,
23602374
439A7942211F631C0041B75F /* RootNavigationController.swift in Sources */,
23612375
4F11D3C020DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift in Sources */,
23622376
43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */,
@@ -2503,7 +2517,6 @@
25032517
43C05CA921EB2B26006FB252 /* PersistenceController.swift in Sources */,
25042518
431EA87221EB29150076EC1A /* InsulinModelSettings.swift in Sources */,
25052519
43D9002121EB209400AF44BF /* GlucoseThreshold.swift in Sources */,
2506-
4345E3F221F0351E009E00E5 /* Locked.swift in Sources */,
25072520
43C05CAB21EB2B4A006FB252 /* NSBundle.swift in Sources */,
25082521
43D9002221EB209400AF44BF /* LoopSettings.swift in Sources */,
25092522
431EA87421EB291A0076EC1A /* WalshInsulinModel.swift in Sources */,
@@ -2549,7 +2562,6 @@
25492562
43C05CA821EB2B26006FB252 /* PersistenceController.swift in Sources */,
25502563
431EA87321EB29160076EC1A /* InsulinModelSettings.swift in Sources */,
25512564
43D9FFF921EAF34800AF44BF /* GlucoseThreshold.swift in Sources */,
2552-
4345E3F321F0351E009E00E5 /* Locked.swift in Sources */,
25532565
43C05CAA21EB2B49006FB252 /* NSBundle.swift in Sources */,
25542566
43D9FFF521EAF27200AF44BF /* LoopSettings.swift in Sources */,
25552567
431EA87521EB291B0076EC1A /* WalshInsulinModel.swift in Sources */,

‎Loop/Managers/DeviceDataManager.swift‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,15 @@ final class DeviceDataManager {
171171
}
172172
}
173173

174-
174+
// MARK: - RemoteDataManagerDelegate
175175
extension DeviceDataManager: RemoteDataManagerDelegate {
176176
func remoteDataManagerDidUpdateServices(_ dataManager: RemoteDataManager) {
177177
loopManager.carbStore.syncDelegate = dataManager.nightscoutService.uploader
178178
}
179179
}
180180

181181

182+
// MARK: - CGMManagerDelegate
182183
extension DeviceDataManager: CGMManagerDelegate {
183184
func cgmManagerWantsDeletion(_ manager: CGMManager) {
184185
self.cgmManager = nil
@@ -226,6 +227,7 @@ extension DeviceDataManager: CGMManagerDelegate {
226227
}
227228

228229

230+
// MARK: - PumpManagerDelegate
229231
extension DeviceDataManager: PumpManagerDelegate {
230232

231233
func pumpManager(_ pumpManager: PumpManager, didAdjustPumpClockBy adjustment: TimeInterval) {
@@ -267,6 +269,7 @@ extension DeviceDataManager: PumpManagerDelegate {
267269
}
268270

269271
func pumpManager(_ pumpManager: PumpManager, didUpdate status: PumpManagerStatus) {
272+
log.default("PumpManager:\(type(of: pumpManager)) did update status: \(status)")
270273
self.pumpManagerStatus = status
271274
}
272275

@@ -354,7 +357,7 @@ extension DeviceDataManager: PumpManagerDelegate {
354357

355358
}
356359

357-
360+
// MARK: - DoseStoreDelegate
358361
extension DeviceDataManager: DoseStoreDelegate {
359362
func doseStore(_ doseStore: DoseStore,
360363
hasEventsNeedingUpload pumpEvents: [PersistedPumpEvent],
@@ -440,6 +443,7 @@ extension DeviceDataManager {
440443
}
441444
}
442445

446+
// MARK: - LoopDataManagerDelegate
443447
extension DeviceDataManager: LoopDataManagerDelegate {
444448
func loopDataManager(_ manager: LoopDataManager, roundBasalRate unitsPerHour: Double) -> Double {
445449
guard let pumpManager = pumpManager else {
@@ -487,6 +491,7 @@ extension DeviceDataManager: LoopDataManagerDelegate {
487491
}
488492

489493

494+
// MARK: - CustomDebugStringConvertible
490495
extension DeviceDataManager: CustomDebugStringConvertible {
491496
var debugDescription: String {
492497
return [

0 commit comments

Comments
 (0)