@@ -16,7 +16,6 @@ import androidx.compose.runtime.getValue
1616import androidx.compose.ui.Alignment
1717import androidx.compose.ui.Modifier
1818import androidx.compose.ui.graphics.Color
19- import androidx.compose.ui.platform.LocalContext
2019import androidx.compose.ui.res.painterResource
2120import androidx.compose.ui.text.font.FontWeight
2221import androidx.compose.ui.text.style.TextAlign
@@ -40,17 +39,17 @@ import com.cornellappdev.uplift.ui.screens.gyms.GymDetailScreen
4039import com.cornellappdev.uplift.ui.screens.gyms.HomeScreen
4140import com.cornellappdev.uplift.ui.screens.onboarding.ProfileCreationScreen
4241import com.cornellappdev.uplift.ui.screens.onboarding.SignInPromptScreen
43- import com.cornellappdev.uplift.ui.screens.reminders.CapacityReminderScreen
4442import com.cornellappdev.uplift.ui.screens.profile.ProfileScreen
4543import com.cornellappdev.uplift.ui.screens.profile.SettingsScreen
44+ import com.cornellappdev.uplift.ui.screens.reminders.CapacityReminderScreen
4645import com.cornellappdev.uplift.ui.screens.reminders.MainReminderScreen
4746import com.cornellappdev.uplift.ui.screens.report.ReportIssueScreen
4847import com.cornellappdev.uplift.ui.screens.report.ReportSubmittedScreen
4948import com.cornellappdev.uplift.ui.viewmodels.classes.ClassDetailViewModel
5049import com.cornellappdev.uplift.ui.viewmodels.gyms.GymDetailViewModel
5150import com.cornellappdev.uplift.ui.viewmodels.nav.RootNavigationViewModel
52- import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInMode
5351import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInViewModel
52+ import com.cornellappdev.uplift.util.ONBOARDING_FLAG
5453import com.cornellappdev.uplift.util.PRIMARY_BLACK
5554import com.cornellappdev.uplift.util.PRIMARY_YELLOW
5655import com.cornellappdev.uplift.util.montserratFamily
@@ -72,7 +71,7 @@ fun MainNavigationWrapper(
7271 classDetailViewModel : ClassDetailViewModel = hiltViewModel(),
7372 rootNavigationViewModel : RootNavigationViewModel = hiltViewModel(),
7473
75- ) {
74+ ) {
7675
7776 val checkInViewModel: CheckInViewModel = hiltViewModel()
7877 val rootNavigationUiState = rootNavigationViewModel.collectUiStateValue()
@@ -92,13 +91,17 @@ fun MainNavigationWrapper(
9291 )
9392 val shimmer = rememberShimmer(shimmerBounds = ShimmerBounds .Window , theme = yourShimmerTheme)
9493
95- val items = listOf (
94+ var items = listOf (
9695 BottomNavScreens .Home ,
9796 BottomNavScreens .Classes ,
9897 BottomNavScreens .Profile
9998 // TODO: Add new items when activities and profile are implemented.
10099 )
101100
101+ if (! ONBOARDING_FLAG ) {
102+ items = items.filterNot { it == BottomNavScreens .Profile }
103+ }
104+
102105 systemUiController.setStatusBarColor(PRIMARY_YELLOW )
103106
104107 // TODO: Try to consolidate launched effects into one with consumeIn function that takes in coroutine scope
@@ -262,7 +265,7 @@ fun MainNavigationWrapper(
262265 end = 9 .dp,
263266 bottom = it.calculateBottomPadding() + 13 .dp
264267 )
265- ){
268+ ) {
266269 CheckInPopUp (
267270 gymName = checkInUiState.gymName,
268271 currentTimeText = checkInUiState.timeText,
0 commit comments