Skip to content

Error and Loading State UI #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amjiao merged 23 commits into from
Apr 14, 2025
Merged

Error and Loading State UI #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e033a35
LoadingState set up
amjiao Mar 22, 2025
8b226d5
LoadingState set up
amjiao Mar 22, 2025
d05dfc8
Finish LoadingState
amjiao Mar 22, 2025
c374983
Spacing fix
amjiao Mar 22, 2025
83e081f
Finish ErrorState
amjiao Mar 22, 2025
e5c2177
LoadingState set up
amjiao Mar 22, 2025
df00252
LoadingState set up
amjiao Mar 22, 2025
54c9372
Finish LoadingState
amjiao Mar 22, 2025
8c8037c
Spacing fix
amjiao Mar 22, 2025
4c38dfe
Finish ErrorState
amjiao Mar 22, 2025
e60c5f5
Merge remote-tracking branch 'origin/Amy/error-loading-states' into A…
amjiao Mar 22, 2025
f8608d2
Abstracting Error/Loading ui to take custom inputs
amjiao Mar 22, 2025
5f986aa
add onRefresh
amjiao Mar 22, 2025
b781e27
GameDetailsLoadingState
amjiao Mar 22, 2025
0b1963f
PR fixes
amjiao Apr 7, 2025
86ec992
Merge branch 'main' into Amy/error-loading-states
amjiao Apr 7, 2025
acc40c8
Import fix
amjiao Apr 7, 2025
42c8fe4
ScorePreview + small fixes
amjiao Apr 9, 2025
5c52d62
Merge branch 'main' into Amy/error-loading-states
amjiao Apr 9, 2025
a992ad3
Remove redundant code
amjiao Apr 9, 2025
5daf380
Rename to GameDetailsLoadingScreen for consistency
amjiao Apr 9, 2025
b7739a4
PR fixes
amjiao Apr 9, 2025
c480669
Quick migration of remaining previews
zachseidner1 Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/cornellappdev/score/components/ErrorState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fun ErrorState(
}
}

@Preview
@Preview(showBackground = true)
@Composable
private fun ErrorStatePreview() {
ErrorState({}, "Oops! Failed to load.")
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/java/com/cornellappdev/score/components/GameDetailsLoadingState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ 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.util.LocalInfiniteLoading
import com.cornellappdev.score.util.Stroke
import com.cornellappdev.score.util.Wash
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
Expand Down Expand Up @@ -102,6 +102,8 @@ fun GameDetailsLoadingState(

@Preview
@Composable
private fun GameDetailsLoadingStatePreview() {
GameDetailsLoadingState()
private fun GameDetailsLoadingStatePreview(){
ScorePreview {
GameDetailsLoadingState()
}
}
14 changes: 9 additions & 5 deletions app/src/main/java/com/cornellappdev/score/components/LoadingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.cornellappdev.score.theme.GrayStroke
import com.cornellappdev.score.theme.Style.heading1
import com.cornellappdev.score.util.LocalInfiniteLoading
import com.cornellappdev.score.util.Stroke
import com.cornellappdev.score.util.Wash
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
Expand Down Expand Up @@ -123,11 +123,15 @@ private fun LoadingFilter() {
@Preview
@Composable
private fun LoadingFilterPreview() {
LoadingFilter()
ScorePreview {
LoadingFilter()
}
}

@Preview
@Composable
private fun LoadingScreenPreview() {
LoadingScreen("Loading Upcoming...", "Loading Schedules...")
ScorePreview {
LoadingScreen("Loading Upcoming...", "Loading Schedules...")
}
}
10 changes: 6 additions & 4 deletions app/src/main/java/com/cornellappdev/score/components/LoadingStateBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.cornellappdev.score.util.LocalInfiniteLoading
import com.cornellappdev.score.util.Stroke
import com.cornellappdev.score.util.Wash
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
Expand Down Expand Up @@ -40,5 +40,7 @@ fun LoadingStateBox(
@Preview
@Composable
private fun LoadingStateBoxPreview() {
LoadingStateBox(12, 16.dp)
ScorePreview {
LoadingStateBox(12, 16.dp)
}
}
31 changes: 31 additions & 0 deletions app/src/main/java/com/cornellappdev/score/components/ScorePreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.cornellappdev.score.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.cornellappdev.score.theme.LocalInfiniteLoading

@Composable
fun ScorePreview(
padding: Dp = 0.dp,
backgroundColor: Color = Color.White,
content: @Composable () -> Unit
) {
CompositionLocalProvider(
LocalInfiniteLoading provides 0f
) {
Column(
modifier = Modifier
.background(backgroundColor)
.padding(padding)
) {
content()
}
}
}
5 changes: 2 additions & 3 deletions app/src/main/java/com/cornellappdev/score/nav/root/RootNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ import com.cornellappdev.score.R
import com.cornellappdev.score.nav.root.ScoreRootScreens.Home.toScreen
import com.cornellappdev.score.screen.GameDetailsScreen
import com.cornellappdev.score.screen.HomeScreen
import com.cornellappdev.score.util.LocalInfiniteLoading
import com.cornellappdev.score.screen.PastGamesScreen
import com.cornellappdev.score.theme.CrimsonPrimary
import com.cornellappdev.score.theme.GrayPrimary
import com.cornellappdev.score.theme.LocalInfiniteLoading
import com.cornellappdev.score.theme.Style.bodyMedium
import com.cornellappdev.score.theme.White
import kotlinx.serialization.Serializable
import java.time.LocalDate

@Composable
fun RootNavigation(
Expand Down Expand Up @@ -100,7 +99,7 @@ fun RootNavigation(
}
) { innerPadding ->
Box(modifier = Modifier.padding(innerPadding)) {
CompositionLocalProvider(LocalInfiniteLoading provides animatedValue){
CompositionLocalProvider(LocalInfiniteLoading provides animatedValue) {
NavHost(
navController = navController,
startDestination = ScoreRootScreens.Home
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/cornellappdev/score/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.cornellappdev.score.theme

import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.graphics.Color

val GrayPrimary = Color(0xFF333333)
Expand All @@ -22,4 +23,8 @@ val AmbientColor = Color(0x12000000)
//placeholders, will be replaced once we get backend data
val CornellRed = Color(0x66B31B1B)
val PennBlue = Color(0x66021E59)
val PrincetonOrange = Color(0x66FF6000)
val PrincetonOrange = Color(0x66FF6000)

val Wash = Color(0xFFF4F4F4)
val Stroke = Color(0xFFD6D6D6)
val LocalInfiniteLoading = compositionLocalOf<Float> { error("No infinite loading provided") }
5 changes: 0 additions & 5 deletions app/src/main/java/com/cornellappdev/score/util/ColorUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
package com.cornellappdev.score.util

import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.graphics.Color

val Wash = Color(0xFFF4F4F4)
val Stroke = Color(0xFFD6D6D6)
val LocalInfiniteLoading = compositionLocalOf<Float> { error("No infinite loading provided") }

/**
* Converts a hexcode String into Color object
*/
Expand Down