Error and Loading State UI #33
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package com.cornellappdev.score.components | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.ButtonDefaults | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cornellappdev.score.R | ||
| import com.cornellappdev.score.theme.CrimsonPrimary | ||
| import com.cornellappdev.score.theme.GrayMedium | ||
| import com.cornellappdev.score.theme.GrayPrimary | ||
| import com.cornellappdev.score.theme.Style.bodyNormal | ||
| import com.cornellappdev.score.theme.Style.heading2 | ||
|
|
||
| @Composable | ||
| fun ErrorState( | ||
| onRefresh: () -> Unit, | ||
| message: String, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .fillMaxSize(), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.spacedBy(100.dp) | ||
| ) { | ||
| Spacer(modifier = Modifier.height(200.dp)) | ||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
|
Collaborator
There was a problem hiding this comment. Redundant parameter here
Contributor
Author
There was a problem hiding this comment. i made a column for the feedback icon + text and nested that + the button within the main column, so i think both of these are necessary |
||
| ) { | ||
| Image( | ||
| painter = painterResource(R.drawable.ic_feedback), | ||
| contentDescription = "feedback bubble" | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Text( | ||
| text = message, | ||
| style = heading2.copy(color = GrayPrimary) | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| Text( | ||
| text = "Please try again later.", | ||
| style = bodyNormal.copy(color = GrayMedium) | ||
| ) | ||
| } | ||
|
|
||
| Button( | ||
| colors = ButtonDefaults.buttonColors(containerColor = CrimsonPrimary), | ||
| onClick = onRefresh | ||
| ) { | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Image( | ||
| painter = painterResource(R.drawable.ic_cached), | ||
| contentDescription = "refresh icon" | ||
| ) | ||
| Text("Try again") | ||
| } | ||
| } | ||
| Spacer(modifier = Modifier.height(70.dp)) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
amjiao marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @Composable | ||
| private fun ErrorStatePreview() = ScorePreview { | ||
| ErrorState({}, "Oops! Failed to load.") | ||
| } | ||
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,107 @@ | ||
| package com.cornellappdev.score.components | ||
|
|
||
| import androidx.compose.foundation.Canvas | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.material3.MaterialTheme.typography | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cornellappdev.score.R | ||
| import com.cornellappdev.score.theme.GrayStroke | ||
| import com.cornellappdev.score.theme.LocalInfiniteLoading | ||
| import com.cornellappdev.score.theme.Stroke | ||
| import com.cornellappdev.score.theme.Wash | ||
| import com.cornellappdev.score.util.interpolateColorHSV | ||
|
|
||
| @Composable | ||
| fun GameDetailsLoadingScreen( | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| val shimmerColor = interpolateColorHSV(Wash, Stroke, LocalInfiniteLoading.current) | ||
| Column( | ||
| modifier = modifier.fillMaxWidth() | ||
| ) { | ||
| Row( | ||
| modifier = Modifier | ||
| .background(color = shimmerColor) | ||
| .fillMaxWidth() | ||
| .height(185.dp), | ||
| horizontalArrangement = Arrangement.Center, | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Canvas( | ||
| modifier = Modifier | ||
| .size(72.dp) | ||
| ) { | ||
| drawCircle(color = shimmerColor) | ||
| } | ||
| Spacer(modifier = Modifier.width(24.dp)) | ||
| LoadingStateBox(100, 33.dp, Modifier.width(100.dp)) | ||
| Spacer(modifier = Modifier.width(24.dp)) | ||
| Canvas( | ||
| modifier = Modifier | ||
| .size(72.dp) | ||
| ) { | ||
| drawCircle(color = shimmerColor) | ||
| } | ||
| } | ||
| Column( | ||
| modifier = Modifier.padding(24.dp) | ||
| ) { | ||
| LoadingStateBox(12, 16.dp, Modifier.width(100.dp)) | ||
| Spacer(modifier = Modifier.height(12.dp)) | ||
| LoadingStateBox(100, 32.dp, Modifier.width(200.dp)) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| LoadingStateBox(12, 16.dp) | ||
|
|
||
| Spacer(modifier = Modifier.height(24.dp)) | ||
| LoadingStateBox(8, 125.dp) | ||
| Spacer(modifier = Modifier.height(24.dp)) | ||
|
|
||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.SpaceBetween, | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Text( | ||
| text = "Loading Score Summary", | ||
| color = GrayStroke, | ||
| style = typography.titleMedium, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
|
|
||
| Image( | ||
| painter = painterResource(R.drawable.ic_right_chevron), | ||
| contentDescription = "right chevron" | ||
| ) | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| LoadingStateBox(8, 48.dp) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| LoadingStateBox(8, 48.dp) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| LoadingStateBox(8, 48.dp) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun GameDetailsLoadingStatePreview() = ScorePreview { | ||
| GameDetailsLoadingScreen() | ||
| } |
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
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.
Uh oh!
There was an error while loading. Please reload this page.