Skip to content

Commit de76a45

Browse files
committed
Changes made
1 parent 6a82500 commit de76a45

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ android {
4747
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
4848
buildConfigField("String", "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"])
4949
buildConfigField("String", "BACKEND_URL", secretsProperties['PROD_ENDPOINT'])
50+
buildConfigField("boolean", "ONBOARDING_FLAG", "false")
5051
}
5152
debug {
5253
buildConfigField("String", "BACKEND_URL", secretsProperties['DEV_ENDPOINT'])

app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,12 @@ fun MainNavigationWrapper(
9191
)
9292
val shimmer = rememberShimmer(shimmerBounds = ShimmerBounds.Window, theme = yourShimmerTheme)
9393

94-
var items = listOf(
94+
val items = listOfNotNull(
9595
BottomNavScreens.Home,
9696
BottomNavScreens.Classes,
97-
BottomNavScreens.Profile
98-
// TODO: Add new items when activities and profile are implemented.
97+
BottomNavScreens.Profile.takeIf { ONBOARDING_FLAG }
9998
)
10099

101-
if (!ONBOARDING_FLAG) {
102-
items = items.filterNot { it == BottomNavScreens.Profile }
103-
}
104-
105100
systemUiController.setStatusBarColor(PRIMARY_YELLOW)
106101

107102
//TODO: Try to consolidate launched effects into one with consumeIn function that takes in coroutine scope

0 commit comments

Comments
 (0)