added screen to onboarding flow

Author: isiahpwilliams

.DS_Store

@@ -40,6 +40,7 @@ import com.cornellappdev.uplift.ui.screens.classes.ClassDetailScreen
 import com.cornellappdev.uplift.ui.screens.classes.ClassScreen
 import com.cornellappdev.uplift.ui.screens.gyms.GymDetailScreen
 import com.cornellappdev.uplift.ui.screens.gyms.HomeScreen
+import com.cornellappdev.uplift.ui.screens.onboarding.GoalPromptScreen
 import com.cornellappdev.uplift.ui.screens.onboarding.ProfileCreationScreen
 import com.cornellappdev.uplift.ui.screens.onboarding.SignInPromptScreen
 import com.cornellappdev.uplift.ui.screens.profile.ProfileScreen
@@ -237,6 +238,9 @@ fun MainNavigationWrapper(
                 composable<UpliftRootRoute.ProfileCreation> {
                     ProfileCreationScreen()
                 }
+                composable<UpliftRootRoute.GoalsPrompt> {
+                    GoalPromptScreen()
+                }
                 composable<UpliftRootRoute.CapacityReminders> {
                     CapacityReminderScreen()
                 }
@@ -329,6 +333,10 @@ sealed class UpliftRootRoute {
     @Serializable
     data object Profile : UpliftRootRoute()
 
+    @Serializable
+    data object GoalsPrompt : UpliftRootRoute()
+
+
     @Serializable
     data object CapacityReminders : UpliftRootRoute()
 

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

@@ -30,8 +30,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.credentials.Credential
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.cornellappdev.uplift.ui.components.goalsetting.GoalSlider
 import com.cornellappdev.uplift.ui.components.onboarding.auth.LogInButton
+import com.cornellappdev.uplift.ui.viewmodels.onboarding.GoalsPromptViewModel
 import com.cornellappdev.uplift.util.GRAY01
 import com.cornellappdev.uplift.util.montserratFamily
 
@@ -43,12 +46,11 @@ import com.cornellappdev.uplift.util.montserratFamily
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GoalPromptScreen(
-    /* TODO: Replace functions with viewmodel calls */
-    goalValue: Float,
-    onGoalValueChange: (Float) -> Unit,
-    onSignInWithGoogle: (credential: Credential) -> Unit,
-    onSkip: () -> Unit
+    viewModel: GoalsPromptViewModel = hiltViewModel(),
 ) {
+
+    val currentGoal by viewModel.goalValue.collectAsStateWithLifecycle()
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -90,7 +92,7 @@ fun GoalPromptScreen(
                     .verticalScroll(rememberScrollState()),
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
-                GoalSlider(value = goalValue, onValueChange = onGoalValueChange)
+                GoalSlider(value = currentGoal, onValueChange = { viewModel.onGoalValueChange(it) })
             }
 
             // Buttons pinned to the bottom
@@ -101,8 +103,8 @@ fun GoalPromptScreen(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.spacedBy(8.dp)
             ) {
-                LogInButton { onSignInWithGoogle }
-                SkipButton { onSkip }
+                LogInButton { viewModel.onSignInWithGoogle() }
+                SkipButton { viewModel.onSkip() }
             }
         }
     }
@@ -111,6 +113,6 @@ fun GoalPromptScreen(
 @Preview(showBackground = true)
 @Composable
 fun GoalPromptScreenPreview() {
-    var sliderVal by remember { mutableFloatStateOf(1f) }
-    GoalPromptScreen(goalValue = sliderVal, onGoalValueChange = { sliderVal = it }, {}, {})
+    var sliderVal by remember { mutableFloatStateOf(0f) }
+    GoalPromptScreen()
 }

app/src/main/java/com/cornellappdev/uplift/ui/screens/onboarding/GoalsPromptScreen.kt

@@ -0,0 +1,58 @@
+package com.cornellappdev.uplift.ui.viewmodels.onboarding
+
+import android.net.Uri
+import android.util.Log
+import androidx.lifecycle.viewModelScope
+import com.cornellappdev.uplift.data.repositories.UserInfoRepository
+import com.cornellappdev.uplift.ui.UpliftRootRoute
+import com.cornellappdev.uplift.ui.nav.RootNavigationRepository
+import com.cornellappdev.uplift.ui.viewmodels.UpliftViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+data class GoalsPromptUiState(
+    val name: String = "",
+    val imageUri: Uri? = null
+)
+
+@HiltViewModel
+class GoalsPromptViewModel @Inject constructor(
+    private val userInfoRepository: UserInfoRepository,
+    private val rootNavigationRepository: RootNavigationRepository,
+) : UpliftViewModel<GoalsPromptUiState>(GoalsPromptUiState()) {
+
+    private val _goalValue = MutableStateFlow(0f)
+    val goalValue: StateFlow<Float> = _goalValue.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            // TODO: Change this later to reflect correct inputs
+            val user = userInfoRepository.getFirebaseUser()
+            val name = user?.displayName ?: ""
+            applyMutation {
+                copy(name = name)
+            }
+        }
+    }
+
+    fun onGoalValueChange(newValue: Float) {
+        _goalValue.value = newValue
+    }
+
+    // TODO: Change skip and google sign in to reflect correct behavior
+    fun onSkip() {
+        navigateToHome()
+    }
+
+    fun onSignInWithGoogle() {
+        navigateToHome()
+    }
+
+    fun navigateToHome() {
+        rootNavigationRepository.navigate(UpliftRootRoute.Home)
+    }
+}

app/src/main/java/com/cornellappdev/uplift/ui/viewmodels/onboarding/GoalsPromptViewModel.kt

@@ -38,7 +38,7 @@ class ProfileCreationViewModel @Inject constructor(
         val email = user?.email ?: ""
         val netId = email.substring(0, email.indexOf('@'))
         if (userInfoRepository.createUser(email, name, netId)) {
-            navigateToHome()
+            navigateToGoals()
         } else {
             //TODO: Add error handling
             Log.e("Error", "User not created")
@@ -53,6 +53,11 @@ class ProfileCreationViewModel @Inject constructor(
         }
     }
 
+    private fun navigateToGoals() {
+        rootNavigationRepository.navigate(UpliftRootRoute.GoalsPrompt)
+    }
+
+    // Possibly get rid of this function
     private fun navigateToHome() {
         rootNavigationRepository.navigate(UpliftRootRoute.Home)
     }