Oracle/PokeDex
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix search

Browse source
This commit is contained in:
FirephoenixX02 2024-04-17 10:58:08 +02:00
parent f90696d3d3
commit e86ff0cc17
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
composeApp/build/generated/compose/resourceGenerator/kotlin/HomeScreen.kt
View file

@ -90,7 +90,8 @@ class HomeScreen: Screen {
println(names) println(names)
println(newMap) println(newMap)
if (newMap.isNotEmpty()) { if (newMap.isNotEmpty()) {
pokemap = newMap println("Updating map")
pokemap = newMap;
} }
} }
} }

16
composeApp/src/commonMain/kotlin/App.kt
View file

@ -35,7 +35,7 @@ import pokedex.composeapp.generated.resources.water
import java.net.URL import java.net.URL
import java.util.Locale import java.util.Locale
var pokemap = ArrayList<Pokemon>() var pokemap by mutableStateOf<ArrayList<Pokemon>>(arrayListOf())
val apiString = "https://pokeapi.co/api/v2/pokemon/" val apiString = "https://pokeapi.co/api/v2/pokemon/"
@OptIn(ExperimentalResourceApi::class) @OptIn(ExperimentalResourceApi::class)
@ -112,12 +112,14 @@ suspend fun loadPokemonData(startId: Int, endId: Int): List<Pokemon> {
} }
suspend fun loadPokemonDataFromName(name: String): Pokemon? { suspend fun loadPokemonDataFromName(name: String): Pokemon? {
println("fetching api, name: ${name}") val trimmedName = name.trim()
if (name.equals("")) return null println("fetching api, name: $name")
var json: JSONObject = JSONObject("{}") if (trimmedName == "") return null
var json: JSONObject
try { try {
json = JSONObject(URL(apiString + name).readText()); json = JSONObject(URL(apiString + trimmedName).readText());
} catch (e: Exception) { } catch (e: Exception) {
println(e)
return null return null
} }
val sprites = json.optJSONObject("sprites") val sprites = json.optJSONObject("sprites")
@ -136,7 +138,3 @@ suspend fun loadPokemonDataFromName(name: String): Pokemon? {
return pokemon return pokemon
} }
fun getPokeMap(): ArrayList<Pokemon> {
return pokemap
}