Skip to content

Commit 9ff798e

Browse files
authored
Merge pull request #587 from tidepool-org/noah/LOOP-4682-favorite-foods
Favorite Foods Feature & Refactored SwiftUI Carb Entry Screen
2 parents e71e7ae + 8059823 commit 9ff798e

32 files changed

+1336
-1476
lines changed

Common/FeatureFlags.swift

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
266266
"* adultChildInsulinModelSelectionEnabled: \(adultChildInsulinModelSelectionEnabled)",
267267
"* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
268268
"* missedMealNotifications: \(missedMealNotifications)",
269-
"* allowAlgorithmExperiments: \(allowAlgorithmExperiments)"
269+
"* allowAlgorithmExperiments: \(allowAlgorithmExperiments)",
270+
"* allowExperimentalFeatures: \(allowExperimentalFeatures)"
270271
].joined(separator: "\n")
271272
}
272273
}
@@ -290,6 +291,20 @@ extension FeatureFlagConfiguration {
290291
#endif
291292
}
292293

294+
var allowExperimentalFeatures: Bool {
295+
#if EXPERIMENTAL_FEATURES_ENABLED
296+
return true
297+
#elseif EXPERIMENTAL_FEATURES_ENABLED_CONDITIONALLY
298+
if debugEnabled {
299+
return true
300+
} else {
301+
return UserDefaults.appGroup?.allowExperimentalFeatures ?? false
302+
}
303+
#else
304+
return false
305+
#endif
306+
}
307+
293308
var allowSimulators: Bool {
294309
#if SIMULATORS_ENABLED
295310
return true

Loop.xcodeproj/project.pbxproj

Lines changed: 28 additions & 4 deletions
Large diffs are not rendered by default.

Loop/Base.lproj/Main.storyboard

Lines changed: 3 additions & 199 deletions
Large diffs are not rendered by default.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Favorite Foods Icon.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "Favorite Foods Icon@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "Favorite Foods Icon@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
Loading
Loading
Loading

Loop/DefaultAssets.xcassets/favorite-foods.imageset/Contents.json

Lines changed: 0 additions & 16 deletions
This file was deleted.
Binary file not shown.

Loop/DefaultAssets.xcassets/presets-selected.imageset/Contents.json

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

0 commit comments

Comments
 (0)