finished ui

Author: isiahpwilliams

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

@@ -2,8 +2,11 @@ package com.cornellappdev.uplift.ui.screens.onboarding
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
@@ -18,15 +21,17 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.credentials.Credential
 import com.cornellappdev.uplift.ui.components.goalsetting.GoalSlider
+import com.cornellappdev.uplift.ui.components.onboarding.auth.LogInButton
 import com.cornellappdev.uplift.util.GRAY01
 import com.cornellappdev.uplift.util.montserratFamily
 
@@ -40,57 +45,72 @@ import com.cornellappdev.uplift.util.montserratFamily
 fun GoalPromptScreen(
     /* TODO: Replace functions with viewmodel calls */
     goalValue: Float,
-    onGoalValueChange: (Float) -> Unit
+    onGoalValueChange: (Float) -> Unit,
+    onSignInWithGoogle: (credential: Credential) -> Unit,
+    onSkip: () -> Unit
 ) {
-
     Scaffold(
         topBar = {
-                TopAppBar(
-                    title = {
+            TopAppBar(
+                title = {
+                    Box(
+                        modifier = Modifier.fillMaxHeight(),
+                        contentAlignment = Alignment.BottomStart
+                    ) {
                         Text(
                             text = "Set your goals.",
-                            modifier = Modifier.padding(top = 20.dp),
                             fontSize = 24.sp,
                             fontFamily = montserratFamily,
                             fontWeight = FontWeight.Bold,
-                            textAlign = TextAlign.Left
+                            modifier = Modifier.padding(bottom = 16.dp)
                         )
-                    },
-                    modifier = Modifier
-                        .height(120.dp)
-                        .shadow(elevation = 20.dp, ambientColor = GRAY01),
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = Color.White,
-                    )
-
+                    }
+                },
+                modifier = Modifier
+                    .height(120.dp)
+                    .shadow(elevation = 20.dp, ambientColor = GRAY01),
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = Color.White,
                 )
+            )
         },
         modifier = Modifier.fillMaxSize(),
     ) { padding ->
         Column(
             modifier = Modifier
-                .background(color = Color.White)
-                .padding(
-                    top = padding.calculateTopPadding(),
-                )
+                .padding(padding)
                 .fillMaxSize()
-                .verticalScroll(rememberScrollState()),
-            verticalArrangement = Arrangement.SpaceBetween
+                .background(color = Color.White),
+            horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            /* Groups the goal slider and workout reminders together */
-            Column {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+                    .verticalScroll(rememberScrollState()),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
                 GoalSlider(value = goalValue, onValueChange = onGoalValueChange)
+            }
 
+            // Buttons pinned to the bottom
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 32.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                LogInButton { onSignInWithGoogle }
+                SkipButton { onSkip }
             }
         }
-
     }
 }
 
-
 @Preview(showBackground = true)
 @Composable
 fun GoalPromptScreenPreview() {
     var sliderVal by remember { mutableFloatStateOf(1f) }
-    GoalPromptScreen(goalValue = sliderVal, onGoalValueChange = { sliderVal = it })
+    GoalPromptScreen(goalValue = sliderVal, onGoalValueChange = { sliderVal = it }, {}, {})
 }

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

@@ -112,7 +112,7 @@ private fun SignInPromptScreenContent(
 }
 
 @Composable
-private fun SkipButton(onClick: () -> Unit) {
+fun SkipButton(onClick: () -> Unit) {
     TextButton(
         onClick = onClick
     ) {