Skip to content

Commit 67055da

Browse files
update nav based on auth vm changes
1 parent df07e4d commit 67055da

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

app/src/main/java/com/cornellappdev/hustle/ui/navigation/HustleNavigation.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.cornellappdev.hustle.ui.navigation.navgraphs.homeNavGraph
1212
import com.cornellappdev.hustle.ui.navigation.navgraphs.messagesNavGraph
1313
import com.cornellappdev.hustle.ui.navigation.navgraphs.onboardingNavGraph
1414
import com.cornellappdev.hustle.ui.navigation.navgraphs.profileNavGraph
15+
import com.cornellappdev.hustle.ui.viewmodels.ActionState
1516
import com.cornellappdev.hustle.ui.viewmodels.onboarding.AuthViewModel
1617

1718
@Composable
@@ -47,17 +48,21 @@ fun HustleNavigation(
4748
) {
4849
onboardingNavGraph(
4950
signInWithGoogle = authViewModel::signInWithGoogle,
50-
isLoading = authUiState.isLoading,
51-
errorMessage = authUiState.errorMessage,
52-
clearError = authViewModel::clearError
51+
isLoading = authUiState.actionState == ActionState.Loading,
52+
errorMessage = when (authUiState.actionState) {
53+
is ActionState.Error -> authUiState.actionState.message
54+
else -> null
55+
},
56+
clearError = authViewModel::clearActionState
5357

5458
)
5559
homeNavGraph(navController = navController)
5660
messagesNavGraph(navController = navController)
5761
profileNavGraph(
58-
onSignOut = {
59-
authViewModel.signOut()
60-
})
62+
user = authUiState.user,
63+
onSignOut = authViewModel::signOut,
64+
isLoading = authUiState.actionState == ActionState.Loading
65+
)
6166
}
6267
}
6368

app/src/main/java/com/cornellappdev/hustle/ui/navigation/navgraphs/ProfileNavigation.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,23 @@ package com.cornellappdev.hustle.ui.navigation.navgraphs
33
import androidx.navigation.NavGraphBuilder
44
import androidx.navigation.compose.composable
55
import androidx.navigation.navigation
6+
import com.cornellappdev.hustle.data.model.user.User
67
import com.cornellappdev.hustle.ui.navigation.ProfileDestination
78
import com.cornellappdev.hustle.ui.navigation.ProfileTab
89
import com.cornellappdev.hustle.ui.screens.profile.ProfileScreen
910

1011
fun NavGraphBuilder.profileNavGraph(
11-
onSignOut: () -> Unit
12+
user: User?,
13+
onSignOut: () -> Unit,
14+
isLoading: Boolean
1215
) {
1316
navigation<ProfileTab>(startDestination = ProfileDestination.Profile) {
1417
composable<ProfileDestination.Profile> {
15-
ProfileScreen(onSignOut = onSignOut)
18+
ProfileScreen(
19+
user = user,
20+
onSignOut = onSignOut,
21+
isLoading = isLoading
22+
)
1623
}
1724

1825
composable<ProfileDestination.EditProfile> {

0 commit comments

Comments
 (0)