Skip to content

Commit e6ea38c

Browse files
Merge pull request #91 from cuappdev/andrew/remove-google-sign-in-temp
Addressing CrossFade lint error
2 parents 24ae607 + 134c1e5 commit e6ea38c

File tree

1 file changed

+12
-5
lines changed
  • app/src/main/java/com/cornellappdev/uplift/ui/screens/gyms

1 file changed

+12
-5
lines changed

app/src/main/java/com/cornellappdev/uplift/ui/screens/gyms/HomeScreen.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import kotlinx.coroutines.delay
2525
* The home page of Uplift.
2626
*/
2727
@OptIn(ExperimentalPermissionsApi::class)
28+
@Suppress("UnusedCrossfadeTargetStateParameter")
2829
@Composable
2930
fun HomeScreen(
3031
homeViewModel: HomeViewModel = hiltViewModel(),
@@ -57,11 +58,16 @@ fun HomeScreen(
5758
LocationRepository.instantiate(context)
5859
}
5960

60-
Crossfade(targetState = gymsState, label = "Main") {
61-
when {
62-
gymsLoading -> MainLoading(loadingShimmer)
63-
gymsError -> MainError(reload = homeViewModel::reload)
64-
gymsState.isNotEmpty() -> MainLoaded(
61+
Crossfade(targetState = when {
62+
gymsLoading -> "loading"
63+
gymsError -> "error"
64+
gymsState.isNotEmpty() -> "loaded"
65+
else -> "empty"
66+
}, label = "Main") { state ->
67+
when (state) {
68+
"loading" -> MainLoading(loadingShimmer)
69+
"error" -> MainError(reload = homeViewModel::reload)
70+
"loaded" -> MainLoaded(
6571
openGym = openGym,
6672
gymsList = gymsState,
6773
navController = navController,
@@ -70,6 +76,7 @@ fun HomeScreen(
7076
onToggleCapacities = { showCapacities = !showCapacities },
7177
reload = homeViewModel::reload,
7278
)
79+
else -> {} // Handle empty state if needed
7380
}
7481
}
7582
}

0 commit comments

Comments
 (0)