Skip to content

Commit 044781f

Browse files
ps2ps2
authored
Merge pull request #1244 from LoopKit/carb-entry-flow
Updated carb entry flow
2 parents 1fab955 + 49977fc commit 044781f

16 files changed

+1656
-343
lines changed

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@
341341
892A5D59222F0A27008961AB /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892A5D58222F0A27008961AB /* Debug.swift */; };
342342
892A5D5B222F0D7C008961AB /* LoopTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 892A5D5A222F0D7C008961AB /* LoopTestingKit.framework */; };
343343
892A5D692230C41D008961AB /* RangeReplaceableCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892A5D682230C41D008961AB /* RangeReplaceableCollection.swift */; };
344+
892D7C5123B54A15008A9656 /* CarbEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892D7C5023B54A14008A9656 /* CarbEntryViewController.swift */; };
344345
892FB4CD22040104005293EC /* OverridePresetRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892FB4CC22040104005293EC /* OverridePresetRow.swift */; };
345346
892FB4CF220402C0005293EC /* OverrideSelectionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892FB4CE220402C0005293EC /* OverrideSelectionController.swift */; };
346347
895FE0952201234000FCF18A /* OverrideSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 895FE0942201234000FCF18A /* OverrideSelectionViewController.swift */; };
@@ -353,6 +354,7 @@
353354
89CA2B30226C0161004D9350 /* DirectoryObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89CA2B2F226C0161004D9350 /* DirectoryObserver.swift */; };
354355
89CA2B32226C18B8004D9350 /* TestingScenariosTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89CA2B31226C18B8004D9350 /* TestingScenariosTableViewController.swift */; };
355356
89CA2B3D226E6B13004D9350 /* LocalTestingScenariosManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89CA2B3C226E6B13004D9350 /* LocalTestingScenariosManager.swift */; };
357+
89D6953E23B6DF8A002B3066 /* PotentialCarbEntryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89D6953D23B6DF8A002B3066 /* PotentialCarbEntryTableViewCell.swift */; };
356358
89E267FC2292456700A3F2AF /* FeatureFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E267FB2292456700A3F2AF /* FeatureFlags.swift */; };
357359
89E267FD2292456700A3F2AF /* FeatureFlags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E267FB2292456700A3F2AF /* FeatureFlags.swift */; };
358360
89E267FF229267DF00A3F2AF /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E267FE229267DF00A3F2AF /* Optional.swift */; };
@@ -1045,6 +1047,7 @@
10451047
892A5D58222F0A27008961AB /* Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debug.swift; sourceTree = "<group>"; };
10461048
892A5D5A222F0D7C008961AB /* LoopTestingKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = LoopTestingKit.framework; path = Carthage/Build/iOS/LoopTestingKit.framework; sourceTree = SOURCE_ROOT; };
10471049
892A5D682230C41D008961AB /* RangeReplaceableCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RangeReplaceableCollection.swift; sourceTree = "<group>"; };
1050+
892D7C5023B54A14008A9656 /* CarbEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarbEntryViewController.swift; sourceTree = "<group>"; };
10481051
892FB4CC22040104005293EC /* OverridePresetRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverridePresetRow.swift; sourceTree = "<group>"; };
10491052
892FB4CE220402C0005293EC /* OverrideSelectionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideSelectionController.swift; sourceTree = "<group>"; };
10501053
894F71E11FFEC4D8007D365C /* DefaultAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DefaultAssets.xcassets; sourceTree = "<group>"; };
@@ -1060,6 +1063,7 @@
10601063
89CA2B2F226C0161004D9350 /* DirectoryObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectoryObserver.swift; sourceTree = "<group>"; };
10611064
89CA2B31226C18B8004D9350 /* TestingScenariosTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestingScenariosTableViewController.swift; sourceTree = "<group>"; };
10621065
89CA2B3C226E6B13004D9350 /* LocalTestingScenariosManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalTestingScenariosManager.swift; sourceTree = "<group>"; };
1066+
89D6953D23B6DF8A002B3066 /* PotentialCarbEntryTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PotentialCarbEntryTableViewCell.swift; sourceTree = "<group>"; };
10631067
89E267FB2292456700A3F2AF /* FeatureFlags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlags.swift; sourceTree = "<group>"; };
10641068
89E267FE229267DF00A3F2AF /* Optional.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
10651069
C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NightscoutUploadKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1592,9 +1596,8 @@
15921596
isa = PBXGroup;
15931597
children = (
15941598
43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */,
1595-
43D2E8221F00425400AE5CBF /* BolusViewController+LoopDataManager.swift */,
15961599
43A51E1E1EB6D62A000736CC /* CarbAbsorptionViewController.swift */,
1597-
4315D2861CA5CC3B00589052 /* CarbEntryEditTableViewController.swift */,
1600+
892D7C5023B54A14008A9656 /* CarbEntryViewController.swift */,
15981601
43DBF0581C93F73800B3C386 /* CarbEntryTableViewController.swift */,
15991602
43A51E201EB6DBDD000736CC /* ChartsTableViewController.swift */,
16001603
433EA4C31D9F71C800CD78FB /* CommandResponseViewController.swift */,
@@ -1625,6 +1628,7 @@
16251628
43C3B6EB20B650A80026CAFA /* SettingsImageTableViewCell.swift */,
16261629
43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
16271630
4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
1631+
89D6953D23B6DF8A002B3066 /* PotentialCarbEntryTableViewCell.swift */,
16281632
439706E522D2E84900C81566 /* PredictionSettingTableViewCell.swift */,
16291633
);
16301634
path = Views;
@@ -2627,6 +2631,7 @@
26272631
4341F4EB1EDB92AC001C936B /* LogglyService.swift in Sources */,
26282632
43CE7CDE1CA8B63E003CC1B0 /* Data.swift in Sources */,
26292633
C1F8B243223E73FD00DD66CF /* BolusProgressTableViewCell.swift in Sources */,
2634+
89D6953E23B6DF8A002B3066 /* PotentialCarbEntryTableViewCell.swift in Sources */,
26302635
89CA2B30226C0161004D9350 /* DirectoryObserver.swift in Sources */,
26312636
439A7942211F631C0041B75F /* RootNavigationController.swift in Sources */,
26322637
4F11D3C020DCBEEC006E072C /* GlucoseBackfillRequestUserInfo.swift in Sources */,
@@ -2646,6 +2651,7 @@
26462651
4372E487213C86240068E043 /* SampleValue.swift in Sources */,
26472652
4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */,
26482653
437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */,
2654+
892D7C5123B54A15008A9656 /* CarbEntryViewController.swift in Sources */,
26492655
43DBF0591C93F73800B3C386 /* CarbEntryTableViewController.swift in Sources */,
26502656
89CA2B32226C18B8004D9350 /* TestingScenariosTableViewController.swift in Sources */,
26512657
43E93FB71E469A5100EAB8DB /* HKUnit.swift in Sources */,
@@ -2660,7 +2666,6 @@
26602666
438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */,
26612667
438172D91F4E9E37003C3328 /* NewPumpEvent.swift in Sources */,
26622668
4389916B1E91B689000EEF90 /* ChartSettings+Loop.swift in Sources */,
2663-
4315D2871CA5CC3B00589052 /* CarbEntryEditTableViewController.swift in Sources */,
26642669
C178249A1E1999FA00D9D25C /* CaseCountable.swift in Sources */,
26652670
43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */,
26662671
4FB76FBB1E8C42CF00B39636 /* UIColor.swift in Sources */,
@@ -2685,7 +2690,6 @@
26852690
43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */,
26862691
433EA4C41D9F71C800CD78FB /* CommandResponseViewController.swift in Sources */,
26872692
C16DA84222E8E112008624C2 /* LoopPlugins.swift in Sources */,
2688-
43D2E8231F00425400AE5CBF /* BolusViewController+LoopDataManager.swift in Sources */,
26892693
430B29952041F5CB00BA9F93 /* LoopSettings+Loop.swift in Sources */,
26902694
43785E932120A01B0057DED1 /* NewCarbEntryIntent+Loop.swift in Sources */,
26912695
43CEE6E61E56AFD400CB9116 /* NightscoutUploader.swift in Sources */,

‎Loop/AppDelegate.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
5050

5151
NotificationManager.authorize(delegate: self)
5252

53-
let mainStatusViewControllers = UIStoryboard(name: "Main", bundle: Bundle(for: AppDelegate.self)).instantiateViewController(withIdentifier: "MainStatusViewController") as! StatusTableViewController
53+
let mainStatusViewController = UIStoryboard(name: "Main", bundle: Bundle(for: AppDelegate.self)).instantiateViewController(withIdentifier: "MainStatusViewController") as! StatusTableViewController
5454

55-
rootViewController.pushViewController(mainStatusViewControllers, animated: false)
56-
57-
rootViewController.rootViewController.deviceManager = deviceManager
55+
mainStatusViewController.deviceManager = deviceManager
56+
57+
rootViewController.pushViewController(mainStatusViewController, animated: false)
5858

5959
}
6060

0 commit comments

Comments
 (0)