Skip to content

Commit e0284bb

Browse files
authored
[LOOP-1611] Update insulin model selection UI (#160)
* [LOOP-1611] Update insulin model settings UI * Correct title size, extract feature flag dependency * Match settings requirements to previous impl * Updates from review * More renaming updates
1 parent 2fcca5e commit e0284bb

File tree

7 files changed

+401
-520
lines changed

7 files changed

+401
-520
lines changed

Loop.xcodeproj/project.pbxproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
43517917230A0E1A0072ECC0 /* WKInterfaceLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43517916230A0E1A0072ECC0 /* WKInterfaceLabel.swift */; };
9696
435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */; };
9797
435400351C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */; };
98-
435CB6231F37967800C320C7 /* InsulinModelSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435CB6221F37967800C320C7 /* InsulinModelSettingsViewController.swift */; };
9998
436961911F19D11E00447E89 /* ChartPointsContextFillLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4369618F1F19C86400447E89 /* ChartPointsContextFillLayer.swift */; };
10099
436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0DA41D236A2A00104B24 /* LoopError.swift */; };
101100
436D9BF81F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json in Resources */ = {isa = PBXBuildFile; fileRef = 436D9BF71F6F4EA100CFA75F /* recommended_temp_start_low_end_just_above_range.json */; };
@@ -333,6 +332,8 @@
333332
7D70765E1FE06EE3004AC8EA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076601FE06EE3004AC8EA /* Localizable.strings */; };
334333
7D7076631FE06EE4004AC8EA /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D7076651FE06EE4004AC8EA /* Localizable.strings */; };
335334
7D7076681FE0702F004AC8EA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D70766A1FE0702F004AC8EA /* InfoPlist.strings */; };
335+
89186C0324BE6D710003D0F3 /* InsulinModelSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89186C0224BE6D700003D0F3 /* InsulinModelSelection.swift */; };
336+
89186C0924BF9F7B0003D0F3 /* InsulinModelChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89186C0824BF9F7B0003D0F3 /* InsulinModelChartView.swift */; };
336337
891B508524342BE1005DA578 /* CarbAndBolusFlowViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891B508424342BE1005DA578 /* CarbAndBolusFlowViewModel.swift */; };
337338
892A5D2A222EF60A008961AB /* MockKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 892A5D29222EF60A008961AB /* MockKit.framework */; };
338339
892A5D2C222EF60A008961AB /* MockKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 892A5D2B222EF60A008961AB /* MockKitUI.framework */; };
@@ -709,7 +710,6 @@
709710
43511CED220FC61700566C63 /* HUDRowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDRowController.swift; sourceTree = "<group>"; };
710711
43517916230A0E1A0072ECC0 /* WKInterfaceLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKInterfaceLabel.swift; sourceTree = "<group>"; };
711712
435400331C9F878D00D5819C /* SetBolusUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetBolusUserInfo.swift; sourceTree = "<group>"; };
712-
435CB6221F37967800C320C7 /* InsulinModelSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinModelSettingsViewController.swift; sourceTree = "<group>"; };
713713
435CB6241F37ABFC00C320C7 /* ExponentialInsulinModelPreset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExponentialInsulinModelPreset.swift; sourceTree = "<group>"; };
714714
435CB6261F37AE5600C320C7 /* WalshInsulinModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WalshInsulinModel.swift; sourceTree = "<group>"; };
715715
435CB6281F37B01300C320C7 /* InsulinModelSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinModelSettings.swift; sourceTree = "<group>"; };
@@ -1063,6 +1063,8 @@
10631063
7DD382771F8DBFC60071272B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
10641064
7DD382781F8DBFC60071272B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainInterface.strings; sourceTree = "<group>"; };
10651065
7DD382791F8DBFC60071272B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Interface.strings; sourceTree = "<group>"; };
1066+
89186C0224BE6D700003D0F3 /* InsulinModelSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsulinModelSelection.swift; sourceTree = "<group>"; };
1067+
89186C0824BF9F7B0003D0F3 /* InsulinModelChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsulinModelChartView.swift; sourceTree = "<group>"; };
10661068
891B508424342BE1005DA578 /* CarbAndBolusFlowViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarbAndBolusFlowViewModel.swift; sourceTree = "<group>"; };
10671069
892A5D29222EF60A008961AB /* MockKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = MockKit.framework; path = Carthage/Build/iOS/MockKit.framework; sourceTree = SOURCE_ROOT; };
10681070
892A5D2B222EF60A008961AB /* MockKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = MockKitUI.framework; path = Carthage/Build/iOS/MockKitUI.framework; sourceTree = SOURCE_ROOT; };
@@ -1726,7 +1728,6 @@
17261728
892ADE092446E9C3007CE08C /* ExplicitlyDismissibleModal.swift */,
17271729
C178249F1E19CF9800D9D25C /* GlucoseThresholdTableViewController.swift */,
17281730
4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */,
1729-
435CB6221F37967800C320C7 /* InsulinModelSettingsViewController.swift */,
17301731
437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */,
17311732
439A7941211F631C0041B75F /* RootNavigationController.swift */,
17321733
43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */,
@@ -1741,11 +1742,14 @@
17411742
isa = PBXGroup;
17421743
children = (
17431744
C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */,
1745+
C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */,
17441746
43B260481ED248FB008CAA77 /* CarbEntryTableViewCell.swift */,
17451747
4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */,
17461748
431A8C3F1EC6E8AB00823B9C /* CircleMaskView.swift */,
17471749
43D381611EBD9759007F8C8F /* HeaderValuesTableViewCell.swift */,
17481750
430D85881F44037000AF2D4F /* HUDViewTableViewCell.swift */,
1751+
89186C0224BE6D700003D0F3 /* InsulinModelSelection.swift */,
1752+
89186C0824BF9F7B0003D0F3 /* InsulinModelChartView.swift */,
17491753
1DA46B5F2492E2E300D71A63 /* NotificationsCriticalAlertPermissionsView.swift */,
17501754
B42C951624A3CAF200857C73 /* NotificationsCriticalAlertPermissionsViewModel.swift */,
17511755
899433B723FE129700FA4BEA /* OverrideBadgeView.swift */,
@@ -1757,7 +1761,6 @@
17571761
1DB1CA4E24A56D7600B3B94C /* SettingsViewModel.swift */,
17581762
43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
17591763
4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
1760-
C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */,
17611764
);
17621765
path = Views;
17631766
sourceTree = "<group>";
@@ -2848,6 +2851,7 @@
28482851
C17824A51E1AD4D100D9D25C /* BolusRecommendation.swift in Sources */,
28492852
4F70C2131DE90339006380B7 /* StatusExtensionContext.swift in Sources */,
28502853
43C05CC521EC29E3006FB252 /* TextFieldTableViewCell.swift in Sources */,
2854+
89186C0324BE6D710003D0F3 /* InsulinModelSelection.swift in Sources */,
28512855
4FF4D1001E18374700846527 /* WatchContext.swift in Sources */,
28522856
C1D289B522F90A52003FFBD9 /* BasalDeliveryState.swift in Sources */,
28532857
4F2C15821E074FC600E160D4 /* NSTimeInterval.swift in Sources */,
@@ -2926,6 +2930,7 @@
29262930
A98556852493F901000FD662 /* AlertStore+SimulatedCoreData.swift in Sources */,
29272931
899433B823FE129800FA4BEA /* OverrideBadgeView.swift in Sources */,
29282932
89D1503E24B506EB00EDE253 /* Dictionary.swift in Sources */,
2933+
89186C0924BF9F7B0003D0F3 /* InsulinModelChartView.swift in Sources */,
29292934
4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */,
29302935
4FC8C8011DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift in Sources */,
29312936
43E93FB61E469A4000EAB8DB /* NumberFormatter.swift in Sources */,
@@ -2956,7 +2961,6 @@
29562961
4F7E8ACB20E2ACB500AEA65E /* WatchPredictedGlucose.swift in Sources */,
29572962
436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */,
29582963
4F11D3C220DD80B3006E072C /* WatchHistoricalGlucose.swift in Sources */,
2959-
435CB6231F37967800C320C7 /* InsulinModelSettingsViewController.swift in Sources */,
29602964
4372E490213CFCE70068E043 /* LoopSettingsUserInfo.swift in Sources */,
29612965
89CA2B3D226E6B13004D9350 /* LocalTestingScenariosManager.swift in Sources */,
29622966
43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */,

0 commit comments

Comments
 (0)