Login Screens + Design System #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package com.cornellappdev.hustle.ui.components.onboarding | ||
|
|
||
| import androidx.compose.animation.animateContentSize | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.ButtonDefaults | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cornellappdev.hustle.ui.theme.HustleColors | ||
| import com.cornellappdev.hustle.ui.theme.HustleSpacing | ||
| import com.cornellappdev.hustle.ui.theme.HustleTheme | ||
|
|
||
| @Composable | ||
| fun SignInButton( | ||
| onClick: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| isLoading: Boolean = false | ||
| ) { | ||
| Button( | ||
| onClick = onClick, | ||
| enabled = !isLoading, | ||
| modifier = modifier.fillMaxWidth(), | ||
| colors = ButtonDefaults.buttonColors( | ||
| containerColor = HustleColors.accentGreen, | ||
| contentColor = HustleColors.hustleGreen, | ||
| disabledContainerColor = HustleColors.accentGreen, | ||
| disabledContentColor = HustleColors.hustleGreen | ||
| ), | ||
| contentPadding = PaddingValues( | ||
| vertical = HustleSpacing.medium | ||
| ), | ||
| shape = RoundedCornerShape(15.dp) | ||
| ) { | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.spacedBy(HustleSpacing.small), | ||
| modifier = Modifier.animateContentSize() | ||
| ) { | ||
| if (isLoading) { | ||
| CircularProgressIndicator( | ||
| color = HustleColors.hustleGreen, | ||
| modifier = Modifier.size(24.dp) | ||
| ) | ||
| } | ||
| Text( | ||
| text = if (isLoading) "Signing in..." else "Log in with NetID", | ||
| style = MaterialTheme.typography.titleLarge | ||
| ) | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun SignInButtonPreview() { | ||
| HustleTheme(dynamicColor = false) { | ||
| SignInButton(onClick = {}, isLoading = true) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,19 +1,38 @@ | ||||||
| package com.cornellappdev.hustle.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.fillMaxSize | ||||||
| import androidx.compose.foundation.layout.padding | ||||||
| import androidx.compose.material3.Icon | ||||||
| import androidx.compose.material3.MaterialTheme | ||||||
| import androidx.compose.material3.Text | ||||||
| import androidx.compose.runtime.Composable | ||||||
| import androidx.compose.runtime.LaunchedEffect | ||||||
| import androidx.compose.ui.Alignment | ||||||
| import androidx.compose.ui.Modifier | ||||||
| import androidx.compose.ui.graphics.Color | ||||||
| import androidx.compose.ui.res.painterResource | ||||||
| import androidx.compose.ui.text.SpanStyle | ||||||
| import androidx.compose.ui.text.buildAnnotatedString | ||||||
| import androidx.compose.ui.text.font.FontStyle | ||||||
| import androidx.compose.ui.text.font.FontWeight | ||||||
| import androidx.compose.ui.text.withStyle | ||||||
| import androidx.compose.ui.tooling.preview.Preview | ||||||
| import androidx.compose.ui.tooling.preview.PreviewParameter | ||||||
| import androidx.compose.ui.tooling.preview.PreviewParameterProvider | ||||||
| import androidx.compose.ui.unit.dp | ||||||
| import androidx.compose.ui.unit.sp | ||||||
| import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel | ||||||
| import com.cornellappdev.hustle.R | ||||||
| import com.cornellappdev.hustle.ui.components.general.ErrorMessage | ||||||
| import com.cornellappdev.hustle.ui.components.onboarding.SignInButton | ||||||
| import com.cornellappdev.hustle.ui.theme.HustleColors | ||||||
| import com.cornellappdev.hustle.ui.theme.HustleSpacing | ||||||
| import com.cornellappdev.hustle.ui.theme.HustleTheme | ||||||
| import com.cornellappdev.hustle.ui.theme.InstrumentSans | ||||||
| import com.cornellappdev.hustle.ui.viewmodels.ActionState | ||||||
| import com.cornellappdev.hustle.ui.viewmodels.onboarding.SignInScreenViewModel | ||||||
|
|
||||||
|
|
@@ -49,13 +68,23 @@ private fun SignInScreenContent( | |||||
| onDismissError: () -> Unit, | ||||||
| modifier: Modifier = Modifier, | ||||||
| ) { | ||||||
| Box( | ||||||
| modifier = modifier | ||||||
| .fillMaxSize() | ||||||
| .background(HustleColors.hustleGreen) | ||||||
| .padding( | ||||||
| horizontal = HustleSpacing.leftRightMargin | ||||||
| ) | ||||||
| ) { | ||||||
| Column( | ||||||
| horizontalAlignment = Alignment.CenterHorizontally, | ||||||
| verticalArrangement = Arrangement.spacedBy( | ||||||
| 89.dp, alignment = Alignment.CenterVertically | ||||||
|
There was a problem hiding this comment. The hardcoded spacing value of 89.dp should use a constant from HustleSpacing for consistency with the design system.
Suggested change
|
||||||
| ), | ||||||
| modifier = Modifier.fillMaxSize() | ||||||
| ) { | ||||||
| WelcomeHeader() | ||||||
| SignInButton( | ||||||
| onClick = onGoogleSignInButtonClick, isLoading = isSignInLoading | ||||||
| ) | ||||||
| } | ||||||
|
|
@@ -69,6 +98,59 @@ private fun SignInScreenContent( | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| @Composable | ||||||
| private fun WelcomeHeader() { | ||||||
| Column( | ||||||
| horizontalAlignment = Alignment.CenterHorizontally, | ||||||
| verticalArrangement = Arrangement.spacedBy(HustleSpacing.medium) | ||||||
| ) { | ||||||
| Icon( | ||||||
| painter = painterResource(id = R.drawable.ic_hustle_logo), | ||||||
| contentDescription = "Hustle Logo", | ||||||
| tint = Color.Unspecified | ||||||
|
There was a problem hiding this comment. Is unspecified intentional? Why is it needed?
Member
Author
There was a problem hiding this comment. I think Compose tints the icon another color without it, so this makes sure it keeps the original color |
||||||
| ) | ||||||
| WelcomeText() | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| @Composable | ||||||
| private fun WelcomeText() { | ||||||
| Column( | ||||||
| horizontalAlignment = Alignment.CenterHorizontally, | ||||||
| verticalArrangement = Arrangement.spacedBy(HustleSpacing.extraSmall) | ||||||
| ) { | ||||||
| Text( | ||||||
| buildAnnotatedString { | ||||||
| withStyle( | ||||||
| style = SpanStyle( | ||||||
| color = HustleColors.white, | ||||||
| fontFamily = InstrumentSans, | ||||||
| fontSize = 36.sp, | ||||||
| ) | ||||||
| ) { | ||||||
| append("Welcome to ") | ||||||
| } | ||||||
| withStyle( | ||||||
| style = SpanStyle( | ||||||
| color = HustleColors.white, | ||||||
| fontFamily = InstrumentSans, | ||||||
| fontSize = 36.sp, | ||||||
| fontWeight = FontWeight.Bold, | ||||||
| fontStyle = FontStyle.Italic | ||||||
| ) | ||||||
| ) { | ||||||
| append("Hustle") | ||||||
| } | ||||||
| } | ||||||
| ) | ||||||
| Text( | ||||||
| text = "Browse. Buy. Book.", | ||||||
| color = HustleColors.white, | ||||||
| style = MaterialTheme.typography.headlineMedium | ||||||
| ) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| class SignInErrorMessageProvider : PreviewParameterProvider<String?> { | ||||||
| override val values = sequenceOf( | ||||||
| null, | ||||||
|
|
@@ -81,9 +163,11 @@ class SignInErrorMessageProvider : PreviewParameterProvider<String?> { | |||||
| private fun SignInScreenPreview( | ||||||
| @PreviewParameter(SignInErrorMessageProvider::class) errorMessage: String? | ||||||
| ) { | ||||||
| HustleTheme(dynamicColor = false) { | ||||||
| SignInScreenContent( | ||||||
| onGoogleSignInButtonClick = {}, | ||||||
| isSignInLoading = false, | ||||||
| errorMessage = errorMessage, | ||||||
| onDismissError = {}) | ||||||
| } | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.cornellappdev.hustle.ui.theme | ||
|
|
||
| import androidx.compose.ui.unit.dp | ||
|
|
||
| object HustleSpacing { | ||
| val extraSmall = 8.dp | ||
| val small = 12.dp | ||
| val medium = 16.dp | ||
| val large = 24.dp | ||
| val extraLarge = 36.dp | ||
| val huge = 64.dp | ||
|
|
||
| val topMarginBig = huge | ||
| val topMarginNormal = extraLarge | ||
| val leftRightMargin = large | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: could we wrap this in
animateContentSizeto make the whole experience a bit cleanerThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will look into
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added to the row modifier