Add Loading Screen for DetailScreen
This commit is contained in:
parent
e58cb76df9
commit
8be471dc84
3 changed files with 178 additions and 97 deletions
|
|
@ -37,6 +37,27 @@ import java.util.Locale
|
|||
|
||||
var pokemap = ArrayList<Pokemon>()
|
||||
val apiString = "https://pokeapi.co/api/v2/pokemon/"
|
||||
@OptIn(ExperimentalResourceApi::class)
|
||||
val pokemonTypeDrawableMap = hashMapOf(
|
||||
"normal" to Res.drawable.normal,
|
||||
"fire" to Res.drawable.fire,
|
||||
"water" to Res.drawable.water,
|
||||
"electric" to Res.drawable.electric,
|
||||
"grass" to Res.drawable.grass,
|
||||
"ice" to Res.drawable.ice,
|
||||
"fighting" to Res.drawable.fighting,
|
||||
"poison" to Res.drawable.poison,
|
||||
"ground" to Res.drawable.ground,
|
||||
"flying" to Res.drawable.flying,
|
||||
"psychic" to Res.drawable.psychic,
|
||||
"bug" to Res.drawable.bug,
|
||||
"rock" to Res.drawable.rock,
|
||||
"ghost" to Res.drawable.ghost,
|
||||
"dragon" to Res.drawable.dragon,
|
||||
"dark" to Res.drawable.dark,
|
||||
"steel" to Res.drawable.steel,
|
||||
"fairy" to Res.drawable.fairy
|
||||
)
|
||||
|
||||
@OptIn(ExperimentalResourceApi::class)
|
||||
@Composable
|
||||
|
|
@ -44,27 +65,6 @@ val apiString = "https://pokeapi.co/api/v2/pokemon/"
|
|||
fun App() {
|
||||
var dataLoaded by remember { mutableStateOf(false) }
|
||||
|
||||
val pokemonTypeDrawableMap = hashMapOf(
|
||||
"normal" to Res.drawable.normal,
|
||||
"fire" to Res.drawable.fire,
|
||||
"water" to Res.drawable.water,
|
||||
"electric" to Res.drawable.electric,
|
||||
"grass" to Res.drawable.grass,
|
||||
"ice" to Res.drawable.ice,
|
||||
"fighting" to Res.drawable.fighting,
|
||||
"poison" to Res.drawable.poison,
|
||||
"ground" to Res.drawable.ground,
|
||||
"flying" to Res.drawable.flying,
|
||||
"psychic" to Res.drawable.psychic,
|
||||
"bug" to Res.drawable.bug,
|
||||
"rock" to Res.drawable.rock,
|
||||
"ghost" to Res.drawable.ghost,
|
||||
"dragon" to Res.drawable.dragon,
|
||||
"dark" to Res.drawable.dark,
|
||||
"steel" to Res.drawable.steel,
|
||||
"fairy" to Res.drawable.fairy
|
||||
)
|
||||
|
||||
MaterialTheme {
|
||||
if (!dataLoaded) {
|
||||
Navigator(screen = LoadingScreen()) {
|
||||
|
|
@ -87,7 +87,7 @@ fun App() {
|
|||
} else {
|
||||
println("Pokemon should show up any second!")
|
||||
//Display Pokemon Grid
|
||||
Navigator(screen = HomeScreen(getPokeMap(), pokemonTypeDrawableMap)) {
|
||||
Navigator(screen = HomeScreen()) {
|
||||
navigator -> SlideTransition(navigator)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue