Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Loop
Submodule Loop updated 49 files
+3 −0 .gitignore
+16 −1 Common/FeatureFlags.swift
+2 −3 Common/Models/StatusExtensionContext.swift
+2 −2 Common/Models/WatchContext.swift
+0 −98 Loop Widget Extension/Bootstrap/Assets.xcassets/AppIcon.appiconset/Contents.json
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/Contents.json
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/WidgetBackground.colorset/Contents.json
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/WidgetSecondaryBackground.colorset/Contents.json
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/bolus.imageset/Contents.json
+ Loop Widget Extension/DefaultAssets.xcassets/bolus.imageset/bolus.pdf
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/carbs.imageset/Contents.json
+ Loop Widget Extension/DefaultAssets.xcassets/carbs.imageset/Meal.pdf
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/premeal.imageset/Contents.json
+ Loop Widget Extension/DefaultAssets.xcassets/premeal.imageset/Pre-Meal.pdf
+0 −0 Loop Widget Extension/DefaultAssets.xcassets/workout.imageset/Contents.json
+ Loop Widget Extension/DefaultAssets.xcassets/workout.imageset/workout.pdf
+0 −5 Loop Widget Extension/DerivedAssets.xcassets/Contents.json
+6 −0 Loop Widget Extension/DerivedAssetsBase.xcassets/Contents.json
+0 −0 Loop Widget Extension/DerivedAssetsBase.xcassets/fresh.colorset/Contents.json
+0 −0 Loop Widget Extension/DerivedAssetsBase.xcassets/glucose.colorset/Contents.json
+0 −0 Loop Widget Extension/DerivedAssetsBase.xcassets/insulin.colorset/Contents.json
+0 −0 Loop Widget Extension/DerivedAssetsBase.xcassets/warning.colorset/Contents.json
+51 −12 Loop.xcodeproj/project.pbxproj
+3 −199 Loop/Base.lproj/Main.storyboard
+23 −0 Loop/DefaultAssets.xcassets/Favorite Foods Icon.imageset/Contents.json
+ Loop/DefaultAssets.xcassets/Favorite Foods Icon.imageset/Favorite Foods Icon.png
+ Loop/DefaultAssets.xcassets/Favorite Foods Icon.imageset/Favorite Foods [email protected]
+ Loop/DefaultAssets.xcassets/Favorite Foods Icon.imageset/Favorite Foods [email protected]
+6 −0 Loop/Extensions/DeviceDataManager+BolusEntryViewModelDelegate.swift
+19 −0 Loop/Extensions/EditMode.swift
+20 −0 Loop/Extensions/UserDefaults+Loop.swift
+2 −2 Loop/Info.plist
+3 −3 Loop/Managers/LoopDataManager.swift
+30 −41 Loop/View Controllers/CarbAbsorptionViewController.swift
+0 −786 Loop/View Controllers/CarbEntryViewController.swift
+1 −19 Loop/View Controllers/RootNavigationController.swift
+81 −69 Loop/View Controllers/StatusTableViewController.swift
+109 −0 Loop/View Models/AddEditFavoriteFoodViewModel.swift
+1 −1 Loop/View Models/BolusEntryViewModel.swift
+317 −0 Loop/View Models/CarbEntryViewModel.swift
+83 −0 Loop/View Models/FavoriteFoodsViewModel.swift
+173 −0 Loop/Views/AddEditFavoriteFoodView.swift
+319 −0 Loop/Views/CarbEntryView.swift
+73 −0 Loop/Views/FavoriteFoodDetailView.swift
+130 −0 Loop/Views/FavoriteFoodsView.swift
+33 −0 Loop/Views/HowAbsorptionTimeWorksView.swift
+17 −0 Loop/Views/SettingsView.swift
+2 −2 LoopCore/LoopSettings.swift
+5 −0 LoopCore/NSUserDefaults.swift
2 changes: 1 addition & 1 deletion LoopConfigOverride.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//URL_SCHEME_NAME = $(MAIN_APP_DISPLAY_NAME)

// Features
SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) SIMULATORS_ENABLED ALLOW_ALGORITHM_EXPERIMENTS //DEBUG_FEATURES_ENABLED
SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) EXPERIMENTAL_FEATURES_ENABLED SIMULATORS_ENABLED ALLOW_ALGORITHM_EXPERIMENTS //DEBUG_FEATURES_ENABLED

// Put your team id here for signing
//LOOP_DEVELOPMENT_TEAM = UY678SP37Q
2 changes: 1 addition & 1 deletion LoopKit
Submodule LoopKit updated 42 files
+63 −15 LoopKit.xcodeproj/project.pbxproj
+38 −0 LoopKit/FavoriteFood/FavoriteFood.swift
+23 −0 LoopKit/FavoriteFood/NewFavoriteFood.swift
+62 −0 LoopKit/FavoriteFood/StoredFavoriteFood.swift
+2 −5 LoopKit/GlucoseKit/CachedGlucoseObject+CoreDataClass.swift
+0 −3 LoopKit/GlucoseKit/CachedGlucoseObject+CoreDataProperties.swift
+0 −13 LoopKit/GlucoseKit/GlucoseMath.swift
+2 −4 LoopKit/GlucoseKit/HKQuantitySample+GlucoseKit.swift
+0 −1 LoopKit/GlucoseKit/NewGlucoseSample.swift
+2 −3 LoopKit/InsulinKit/InsulinMath.swift
+1 −2 LoopKit/Persistence/Model.xcdatamodeld/Modelv4.xcdatamodel/contents
+6 −6 LoopKit/Persistence/Modelv1v4.xcmappingmodel/xcmapping.xml
+1 −1 LoopKit/Service/Service.swift
+4 −4 LoopKit/SettingsStore.swift
+0 −4 LoopKitHostedTests/Persistence/CachedGlucoseObjectTests.swift
+2 −2 LoopKitTests/GlucoseStoreTests.swift
+0 −1 LoopKitTests/NewGlucoseSampleTests.swift
+0 −1 LoopKitTests/StoredGlucoseSampleTests.swift
+72 −0 LoopKitUI/CarbKit/AbsorptionTimePickerRow.swift
+98 −0 LoopKitUI/CarbKit/CarbQuantityRow.swift
+0 −112 LoopKitUI/CarbKit/DateAndDurationSteppableTableViewCell.swift
+0 −119 LoopKitUI/CarbKit/DateAndDurationSteppableTableViewCell.xib
+150 −0 LoopKitUI/CarbKit/DatePickerRow.swift
+43 −0 LoopKitUI/CarbKit/EmojiRow.swift
+1 −1 LoopKitUI/CarbKit/FoodEmojiDataSource.swift
+129 −0 LoopKitUI/CarbKit/FoodTypeRow.swift
+0 −62 LoopKitUI/CarbKit/FoodTypeShortcutCell.swift
+68 −0 LoopKitUI/CarbKit/RowEmojiTextField.swift
+82 −0 LoopKitUI/CarbKit/RowTextfield.swift
+48 −0 LoopKitUI/CarbKit/TextFieldRow.swift
+1 −1 LoopKitUI/OverrideEmojiDataSource.swift
+12 −6 LoopKitUI/Views/CardList/Card.swift
+0 −0 LoopKitUI/Views/DateAndDurationTableViewCell.swift
+0 −0 LoopKitUI/Views/DateAndDurationTableViewCell.xib
+0 −0 LoopKitUI/Views/DecimalTextFieldTableViewCell.swift
+17 −14 LoopKitUI/Views/DemoPlaceHolderView.swift
+14 −0 LoopKitUI/Views/EmojiDataSource.swift
+122 −0 LoopKitUI/Views/FavoriteFoodListRow.swift
+21 −0 LoopKitUI/Views/ListButtonStyle.swift
+1 −1 MockKitUI/MockCGMManager+UI.swift
+1 −1 MockKitUI/MockPumpManager+UI.swift
+2 −1 MockKitUI/Views/InsulinStatusView.swift