Skip to content

Commit a0ca1d2

Browse files
author
Rick Pasetto
authored
LOOP-1492: Therapy Settings: Add Insulin model section (#168)
* Move insulin model settings to LoopKit * Move Insulin Model Selection rows to LoopKitUI * Move SupportedInsulinModelSettings to LoopKit
1 parent e412c0a commit a0ca1d2

File tree

10 files changed

+21
-379
lines changed

10 files changed

+21
-379
lines changed

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
430D85891F44037000AF2D4F /* HUDViewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */; };
5151
4311FB9B1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */; };
5252
431A8C401EC6E8AB00823B9C /* CircleMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 431A8C3F1EC6E8AB00823B9C /* CircleMaskView.swift */; };
53-
431EA87021EB29120076EC1A /* ExponentialInsulinModelPreset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift */; };
54-
431EA87121EB29120076EC1A /* ExponentialInsulinModelPreset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift */; };
55-
431EA87221EB29150076EC1A /* InsulinModelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */; };
56-
431EA87321EB29160076EC1A /* InsulinModelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */; };
57-
431EA87421EB291A0076EC1A /* WalshInsulinModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */; };
58-
431EA87521EB291B0076EC1A /* WalshInsulinModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */; };
5953
4326BA641F3A44D9007CCAD4 /* ChartLineModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4326BA631F3A44D9007CCAD4 /* ChartLineModel.swift */; };
6054
4328E01A1CFBE1DA00E199AA /* ActionHUDController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E0151CFBE1DA00E199AA /* ActionHUDController.swift */; };
6155
4328E01E1CFBE25F00E199AA /* CarbAndBolusFlowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4328E01D1CFBE25F00E199AA /* CarbAndBolusFlowController.swift */; };
@@ -190,7 +184,6 @@
190184
43D9002D21EB225D00AF44BF /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D9002C21EB225D00AF44BF /* HealthKit.framework */; };
191185
43D9002E21EB226F00AF44BF /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4344628320A7A3BE00C4BE6F /* LoopKit.framework */; };
192186
43D9002F21EB234400AF44BF /* LoopCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D9002A21EB209400AF44BF /* LoopCore.framework */; };
193-
43D9003321EB258C00AF44BF /* InsulinModelSettings+Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D9003221EB258C00AF44BF /* InsulinModelSettings+Loop.swift */; };
194187
43D9F81821EC51CC000578CD /* DateEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D9F81721EC51CC000578CD /* DateEntry.swift */; };
195188
43D9F81A21EC593C000578CD /* UITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D9F81921EC593C000578CD /* UITableViewCell.swift */; };
196189
43D9F81E21EF0609000578CD /* NumberRangeEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D9F81D21EF0609000578CD /* NumberRangeEntry.swift */; };
@@ -711,9 +704,6 @@
711704
43511CED220FC61700566C63 /* HUDRowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDRowController.swift; sourceTree = "<group>"; };
712705
43517916230A0E1A0072ECC0 /* WKInterfaceLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKInterfaceLabel.swift; sourceTree = "<group>"; };
713706
435400331C9F878D00D5819C /* SetBolusUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetBolusUserInfo.swift; sourceTree = "<group>"; };
714-
435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExponentialInsulinModelPreset.swift; sourceTree = "<group>"; };
715-
435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WalshInsulinModel.swift; sourceTree = "<group>"; };
716-
435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinModelSettings.swift; sourceTree = "<group>"; };
717707
43649A621C7A347F00523D7F /* CollectionType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionType.swift; sourceTree = "<group>"; };
718708
4369618F1F19C86400447E89 /* ChartPointsContextFillLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsContextFillLayer.swift; sourceTree = "<group>"; };
719709
436A0DA41D236A2A00104B24 /* LoopError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoopError.swift; sourceTree = "<group>"; };
@@ -801,7 +791,6 @@
801791
43D848AF1E7DCBE100DADCBC /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
802792
43D9002A21EB209400AF44BF /* LoopCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LoopCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
803793
43D9002C21EB225D00AF44BF /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HealthKit.framework; sourceTree = DEVELOPER_DIR; };
804-
43D9003221EB258C00AF44BF /* InsulinModelSettings+Loop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InsulinModelSettings+Loop.swift"; sourceTree = "<group>"; };
805794
43D9F81721EC51CC000578CD /* DateEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateEntry.swift; sourceTree = "<group>"; };
806795
43D9F81921EC593C000578CD /* UITableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITableViewCell.swift; sourceTree = "<group>"; };
807796
43D9F81D21EF0609000578CD /* NumberRangeEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberRangeEntry.swift; sourceTree = "<group>"; };
@@ -1578,16 +1567,6 @@
15781567
path = Models;
15791568
sourceTree = "<group>";
15801569
};
1581-
43D9003A21EB281300AF44BF /* Insulin */ = {
1582-
isa = PBXGroup;
1583-
children = (
1584-
435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift */,
1585-
435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */,
1586-
435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */,
1587-
);
1588-
path = Insulin;
1589-
sourceTree = "<group>";
1590-
};
15911570
43D9FFA321EA9A0C00AF44BF /* Learn */ = {
15921571
isa = PBXGroup;
15931572
children = (
@@ -1621,7 +1600,6 @@
16211600
43D9FFD021EAE05D00AF44BF /* LoopCore */ = {
16221601
isa = PBXGroup;
16231602
children = (
1624-
43D9003A21EB281300AF44BF /* Insulin */,
16251603
43DE92581C5479E4001FFDE1 /* PotentialCarbEntryUserInfo.swift */,
16261604
43C05CB721EBEA54006FB252 /* HKUnit.swift */,
16271605
434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */,
@@ -1694,7 +1672,6 @@
16941672
A9CBE459248ACBE1008E7BA2 /* DosingDecisionStore+SimulatedCoreData.swift */,
16951673
1D872C9424AD176E006317D4 /* Environment+AppName.swift */,
16961674
A9F703742489C9A000C98AD8 /* GlucoseStore+SimulatedCoreData.swift */,
1697-
43D9003221EB258C00AF44BF /* InsulinModelSettings+Loop.swift */,
16981675
438172D81F4E9E37003C3328 /* NewPumpEvent.swift */,
16991676
89E267FE229267DF00A3F2AF /* Optional.swift */,
17001677
895FE0942201234000FCF18A /* OverrideSelectionViewController.swift */,
@@ -2905,7 +2882,6 @@
29052882
43BFF0BC1E45C80600FF19A9 /* UIColor+Loop.swift in Sources */,
29062883
43C0944A1CACCC73001F6403 /* NotificationManager.swift in Sources */,
29072884
1DDE274024AEA4F200796622 /* NotificationsCriticalAlertPermissionsView.swift in Sources */,
2908-
43D9003321EB258C00AF44BF /* InsulinModelSettings+Loop.swift in Sources */,
29092885
434FF1EE1CF27EEF000DB779 /* UITableViewCell.swift in Sources */,
29102886
439BED2A1E76093C00B0AED5 /* CGMManager.swift in Sources */,
29112887
C165B8CE23302C5D0004112E /* RemoteCommand.swift in Sources */,
@@ -3089,11 +3065,8 @@
30893065
C19E96E023D275FA003F79B0 /* LoopCompletionFreshness.swift in Sources */,
30903066
43D9002021EB209400AF44BF /* NSTimeInterval.swift in Sources */,
30913067
43C05CA921EB2B26006FB252 /* PersistenceController.swift in Sources */,
3092-
431EA87221EB29150076EC1A /* InsulinModelSettings.swift in Sources */,
30933068
43C05CAB21EB2B4A006FB252 /* NSBundle.swift in Sources */,
30943069
43D9002221EB209400AF44BF /* LoopSettings.swift in Sources */,
3095-
431EA87421EB291A0076EC1A /* WalshInsulinModel.swift in Sources */,
3096-
431EA87021EB29120076EC1A /* ExponentialInsulinModelPreset.swift in Sources */,
30973070
43C05CC721EC2ABC006FB252 /* IdentifiableClass.swift in Sources */,
30983071
43C05CAE21EB2BBF006FB252 /* NSUserDefaults.swift in Sources */,
30993072
4345E40221F67300009E00E5 /* PotentialCarbEntryUserInfo.swift in Sources */,
@@ -3141,11 +3114,8 @@
31413114
C19E96DF23D275F8003F79B0 /* LoopCompletionFreshness.swift in Sources */,
31423115
43D9FFFB21EAF3D300AF44BF /* NSTimeInterval.swift in Sources */,
31433116
43C05CA821EB2B26006FB252 /* PersistenceController.swift in Sources */,
3144-
431EA87321EB29160076EC1A /* InsulinModelSettings.swift in Sources */,
31453117
43C05CAA21EB2B49006FB252 /* NSBundle.swift in Sources */,
31463118
43D9FFF521EAF27200AF44BF /* LoopSettings.swift in Sources */,
3147-
431EA87521EB291B0076EC1A /* WalshInsulinModel.swift in Sources */,
3148-
431EA87121EB29120076EC1A /* ExponentialInsulinModelPreset.swift in Sources */,
31493119
43C05CC821EC2ABC006FB252 /* IdentifiableClass.swift in Sources */,
31503120
43C05CAD21EB2BBF006FB252 /* NSUserDefaults.swift in Sources */,
31513121
4345E40121F67300009E00E5 /* PotentialCarbEntryUserInfo.swift in Sources */,

‎Loop/Extensions/InsulinModelSettings+Loop.swift‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎Loop/Managers/LoopDataManager.swift‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,37 +1718,6 @@ private extension StoredDosingDecision.BolusRecommendationWithDate {
17181718
}
17191719
}
17201720

1721-
private extension StoredSettings.InsulinModel {
1722-
init?(_ insulinModelSettings: InsulinModelSettings?) {
1723-
guard let insulinModelSettings = insulinModelSettings else {
1724-
return nil
1725-
}
1726-
1727-
var modelType: StoredSettings.InsulinModel.ModelType
1728-
var actionDuration: TimeInterval
1729-
var peakActivity: TimeInterval?
1730-
1731-
switch insulinModelSettings {
1732-
case .exponentialPreset(let preset):
1733-
switch preset {
1734-
case .humalogNovologAdult:
1735-
modelType = .rapidAdult
1736-
case .humalogNovologChild:
1737-
modelType = .rapidChild
1738-
case .fiasp:
1739-
modelType = .fiasp
1740-
}
1741-
actionDuration = preset.actionDuration
1742-
peakActivity = preset.peakActivity
1743-
case .walsh(let model):
1744-
modelType = .walsh
1745-
actionDuration = model.actionDuration
1746-
}
1747-
1748-
self.init(modelType: modelType, actionDuration: actionDuration, peakActivity: peakActivity)
1749-
}
1750-
}
1751-
17521721
// MARK: - Simulated Core Data
17531722

17541723
extension LoopDataManager {

‎Loop/View Controllers/SettingsTableViewController.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ final class SettingsTableViewController: UITableViewController, IdentifiableClas
751751
pumpManagerSettingsViewModel: pumpViewModel,
752752
cgmManagerSettingsViewModel: cgmViewModel,
753753
therapySettings: dataManager.loopManager.therapySettings,
754+
supportedInsulinModelSettings: SupportedInsulinModelSettings(fiaspModelEnabled: FeatureFlags.fiaspInsulinModelEnabled, walshModelEnabled: FeatureFlags.walshInsulinModelEnabled),
754755
pumpSupportedIncrements: pumpSupportedIncrements,
755756
initialDosingEnabled: dataManager.loopManager.settings.dosingEnabled,
756757
setDosingEnabled: { [weak self] in

0 commit comments

Comments
 (0)