diff --git a/composeApp/build/generated/compose/resourceGenerator/kotlin/HomeScreen.kt b/composeApp/build/generated/compose/resourceGenerator/kotlin/HomeScreen.kt index fb938d3..40bf772 100644 --- a/composeApp/build/generated/compose/resourceGenerator/kotlin/HomeScreen.kt +++ b/composeApp/build/generated/compose/resourceGenerator/kotlin/HomeScreen.kt @@ -1,3 +1,4 @@ + import androidx.compose.foundation.Canvas import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -13,12 +14,14 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.material.Icon +import androidx.compose.material.IconButton import androidx.compose.material.OutlinedTextField import androidx.compose.material.Text -import androidx.compose.material.TextField -import androidx.compose.material.TextFieldColors +import androidx.compose.material.TextFieldDefaults +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Search import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -55,6 +58,50 @@ class HomeScreen: Screen { val coroutineScope = rememberCoroutineScope() var searchQuery by remember { mutableStateOf("") } Box(modifier = Modifier.background(color = orange).fillMaxSize()) { + OutlinedTextField( + value = searchQuery, + onValueChange = { newName -> searchQuery = newName }, + modifier = Modifier.fillMaxWidth(0.8f) + .padding(horizontal = 16.dp) + .padding(top = 16.dp) + .background(color = Color.White), + trailingIcon = { + IconButton( + onClick = { + if (searchQuery.length >= 3 && PokemonNames.names.any { name -> name.contains(searchQuery.lowercase( + Locale.getDefault())) }) { + coroutineScope.launch { + withContext(Dispatchers.IO) { + println("Searching for pokemon, query: $searchQuery") + val names: List = PokemonNames.names.filter { name -> name.contains(searchQuery.lowercase( + Locale.getDefault())) } + val newMap = arrayListOf() + names.forEach { name -> + loadPokemonDataFromName(name)?.let { + newMap.add(it) + } + } + println(names) + println(newMap) + if (newMap.isNotEmpty()) { + pokemap.clear() + pokemap.addAll(newMap) + } + } + } + } + } + ) { + Icon(Icons.Default.Search, contentDescription = "Search") + } + }, + colors = TextFieldDefaults.outlinedTextFieldColors( + focusedBorderColor = Color(0xFFffa500), // Orange color + unfocusedBorderColor = Color(0xFFffa500), // Orange color + textColor = Color.Black + ) + ) + //Grid LazyVerticalGrid( columns = GridCells.Adaptive(minSize = 256.dp), ) { @@ -104,20 +151,6 @@ class HomeScreen: Screen { } } } - OutlinedTextField( - value = searchQuery, - onValueChange = { newName -> searchQuery = newName; - if (PokemonNames.names.contains(searchQuery.lowercase(Locale.getDefault()))) { - coroutineScope.launch { - withContext(Dispatchers.IO) { - val newMap = loadPokemonDataFromName(searchQuery); - newMap?.let { pokemap.clear(); pokemap.addAll(it) } - } - } - } - }, - modifier = Modifier.background(color = Color.White), - ) } } diff --git a/composeApp/src/commonMain/composeResources/files/pokemon-names.txt b/composeApp/src/commonMain/composeResources/files/pokemon-names.txt index a98bd22..c884b4d 100644 --- a/composeApp/src/commonMain/composeResources/files/pokemon-names.txt +++ b/composeApp/src/commonMain/composeResources/files/pokemon-names.txt @@ -1,1025 +1 @@ -Bulbasaur -Ivysaur -Venusaur -Charmander -Charmeleon -Charizard -Squirtle -Wartortle -Blastoise -Caterpie -Metapod -Butterfree -Weedle -Kakuna -Beedrill -Pidgey -Pidgeotto -Pidgeot -Rattata -Raticate -Spearow -Fearow -Ekans -Arbok -Pikachu -Raichu -Sandshrew -Sandslash -Nidoran -Nidorina -Nidoqueen -Nidoran -Nidorino -Nidoking -Clefairy -Clefable -Vulpix -Ninetales -Jigglypuff -Wigglytuff -Zubat -Golbat -Oddish -Gloom -Vileplume -Paras -Parasect -Venonat -Venomoth -Diglett -Dugtrio -Meowth -Persian -Psyduck -Golduck -Mankey -Primeape -Growlithe -Arcanine -Poliwag -Poliwhirl -Poliwrath -Abra -Kadabra -Alakazam -Machop -Machoke -Machamp -Bellsprout -Weepinbell -Victreebel -Tentacool -Tentacruel -Geodude -Graveler -Golem -Ponyta -Rapidash -Slowpoke -Slowbro -Magnemite -Magneton -Farfetch'd -Doduo -Dodrio -Seel -Dewgong -Grimer -Muk -Shellder -Cloyster -Gastly -Haunter -Gengar -Onix -Drowzee -Hypno -Krabby -Kingler -Voltorb -Electrode -Exeggcute -Exeggutor -Cubone -Marowak -Hitmonlee -Hitmonchan -Lickitung -Koffing -Weezing -Rhyhorn -Rhydon -Chansey -Tangela -Kangaskhan -Horsea -Seadra -Goldeen -Seaking -Staryu -Starmie -Mr. Mime -Scyther -Jynx -Electabuzz -Magmar -Pinsir -Tauros -Magikarp -Gyarados -Lapras -Ditto -Eevee -Vaporeon -Jolteon -Flareon -Porygon -Omanyte -Omastar -Kabuto -Kabutops -Aerodactyl -Snorlax -Articuno -Zapdos -Moltres -Dratini -Dragonair -Dragonite -Mewtwo -Mew -Chikorita -Bayleef -Meganium -Cyndaquil -Quilava -Typhlosion -Totodile -Croconaw -Feraligatr -Sentret -Furret -Hoothoot -Noctowl -Ledyba -Ledian -Spinarak -Ariados -Crobat -Chinchou -Lanturn -Pichu -Cleffa -Igglybuff -Togepi -Togetic -Natu -Xatu -Mareep -Flaaffy -Ampharos -Bellossom -Marill -Azumarill -Sudowoodo -Politoed -Hoppip -Skiploom -Jumpluff -Aipom -Sunkern -Sunflora -Yanma -Wooper -Quagsire -Espeon -Umbreon -Murkrow -Slowking -Misdreavus -Unown -Wobbuffet -Girafarig -Pineco -Forretress -Dunsparce -Gligar -Steelix -Snubbull -Granbull -Qwilfish -Scizor -Shuckle -Heracross -Sneasel -Teddiursa -Ursaring -Slugma -Magcargo -Swinub -Piloswine -Corsola -Remoraid -Octillery -Delibird -Mantine -Skarmory -Houndour -Houndoom -Kingdra -Phanpy -Donphan -Porygon2 -Stantler -Smeargle -Tyrogue -Hitmontop -Smoochum -Elekid -Magby -Miltank -Blissey -Raikou -Entei -Suicune -Larvitar -Pupitar -Tyranitar -Lugia -Ho-oh -Celebi -Treecko -Grovyle -Sceptile -Torchic -Combusken -Blaziken -Mudkip -Marshtomp -Swampert -Poochyena -Mightyena -Zigzagoon -Linoone -Wurmple -Silcoon -Beautifly -Cascoon -Dustox -Lotad -Lombre -Ludicolo -Seedot -Nuzleaf -Shiftry -Taillow -Swellow -Wingull -Pelipper -Ralts -Kirlia -Gardevoir -Surskit -Masquerain -Shroomish -Breloom -Slakoth -Vigoroth -Slaking -Nincada -Ninjask -Shedinja -Whismur -Loudred -Exploud -Makuhita -Hariyama -Azurill -Nosepass -Skitty -Delcatty -Sableye -Mawile -Aron -Lairon -Aggron -Meditite -Medicham -Electrike -Manectric -Plusle -Minun -Volbeat -Illumise -Roselia -Gulpin -Swalot -Carvanha -Sharpedo -Wailmer -Wailord -Numel -Camerupt -Torkoal -Spoink -Grumpig -Spinda -Trapinch -Vibrava -Flygon -Cacnea -Cacturne -Swablu -Altaria -Zangoose -Seviper -Lunatone -Solrock -Barboach -Whiscash -Corphish -Crawdaunt -Baltoy -Claydol -Lileep -Cradily -Anorith -Armaldo -Feebas -Milotic -Castform -Kecleon -Shuppet -Banette -Duskull -Dusclops -Tropius -Chimecho -Absol -Wynaut -Snorunt -Glalie -Spheal -Sealeo -Walrein -Clamperl -Huntail -Gorebyss -Relicanth -Luvdisc -Bagon -Shelgon -Salamence -Beldum -Metang -Metagross -Regirock -Regice -Registeel -Latias -Latios -Kyogre -Groudon -Rayquaza -Jirachi -Deoxys -Turtwig -Grotle -Torterra -Chimchar -Monferno -Infernape -Piplup -Prinplup -Empoleon -Starly -Staravia -Staraptor -Bidoof -Bibarel -Kricketot -Kricketune -Shinx -Luxio -Luxray -Budew -Roserade -Cranidos -Rampardos -Shieldon -Bastiodon -Burmy -Wormadam -Mothim -Combee -Vespiquen -Pachirisu -Buizel -Floatzel -Cherubi -Cherrim -Shellos -Gastrodon -Ambipom -Drifloon -Drifblim -Buneary -Lopunny -Mismagius -Honchkrow -Glameow -Purugly -Chingling -Stunky -Skuntank -Bronzor -Bronzong -Bonsly -Mime Jr. -Happiny -Chatot -Spiritomb -Gible -Gabite -Garchomp -Munchlax -Riolu -Lucario -Hippopotas -Hippowdon -Skorupi -Drapion -Croagunk -Toxicroak -Carnivine -Finneon -Lumineon -Mantyke -Snover -Abomasnow -Weavile -Magnezone -Lickilicky -Rhyperior -Tangrowth -Electivire -Magmortar -Togekiss -Yanmega -Leafeon -Glaceon -Gliscor -Mamoswine -Porygon-Z -Gallade -Probopass -Dusknoir -Froslass -Rotom -Uxie -Mesprit -Azelf -Dialga -Palkia -Heatran -Regigigas -Giratina -Cresselia -Phione -Manaphy -Darkrai -Shaymin -Arceus -Victini -Snivy -Servine -Serperior -Tepig -Pignite -Emboar -Oshawott -Dewott -Samurott -Patrat -Watchog -Lillipup -Herdier -Stoutland -Purrloin -Liepard -Pansage -Simisage -Pansear -Simisear -Panpour -Simipour -Munna -Musharna -Pidove -Tranquill -Unfezant -Blitzle -Zebstrika -Roggenrola -Boldore -Gigalith -Woobat -Swoobat -Drilbur -Excadrill -Audino -Timburr -Gurdurr -Conkeldurr -Tympole -Palpitoad -Seismitoad -Throh -Sawk -Sewaddle -Swadloon -Leavanny -Venipede -Whirlipede -Scolipede -Cottonee -Whimsicott -Petilil -Lilligant -Basculin -Sandile -Krokorok -Krookodile -Darumaka -Darmanitan -Maractus -Dwebble -Crustle -Scraggy -Scrafty -Sigilyph -Yamask -Cofagrigus -Tirtouga -Carracosta -Archen -Archeops -Trubbish -Garbodor -Zorua -Zoroark -Minccino -Cinccino -Gothita -Gothorita -Gothitelle -Solosis -Duosion -Reuniclus -Ducklett -Swanna -Vanillite -Vanillish -Vanilluxe -Deerling -Sawsbuck -Emolga -Karrablast -Escavalier -Foongus -Amoonguss -Frillish -Jellicent -Alomomola -Joltik -Galvantula -Ferroseed -Ferrothorn -Klink -Klang -Klinklang -Tynamo -Eelektrik -Eelektross -Elgyem -Beheeyem -Litwick -Lampent -Chandelure -Axew -Fraxure -Haxorus -Cubchoo -Beartic -Cryogonal -Shelmet -Accelgor -Stunfisk -Mienfoo -Mienshao -Druddigon -Golett -Golurk -Pawniard -Bisharp -Bouffalant -Rufflet -Braviary -Vullaby -Mandibuzz -Heatmor -Durant -Deino -Zweilous -Hydreigon -Larvesta -Volcarona -Cobalion -Terrakion -Virizion -Tornadus -Thundurus -Reshiram -Zekrom -Landorus -Kyurem -Keldeo -Meloetta -Genesect -Chespin -Quilladin -Chesnaught -Fennekin -Braixen -Delphox -Froakie -Frogadier -Greninja -Bunnelby -Diggersby -Fletchling -Fletchinder -Talonflame -Scatterbug -Spewpa -Vivillon -Litleo -Pyroar -Flabébé -Floette -Florges -Skiddo -Gogoat -Pancham -Pangoro -Furfrou -Espurr -Meowstic -Honedge -Doublade -Aegislash -Spritzee -Aromatisse -Swirlix -Slurpuff -Inkay -Malamar -Binacle -Barbaracle -Skrelp -Dragalge -Clauncher -Clawitzer -Helioptile -Heliolisk -Tyrunt -Tyrantrum -Amaura -Aurorus -Sylveon -Hawlucha -Dedenne -Carbink -Goomy -Sliggoo -Goodra -Klefki -Phantump -Trevenant -Pumpkaboo -Gourgeist -Bergmite -Avalugg -Noibat -Noivern -Xerneas -Yveltal -Zygarde -Diancie -Hoopa -Volcanion -Rowlet -Dartrix -Decidueye -Litten -Torracat -Incineroar -Popplio -Brionne -Primarina -Pikipek -Trumbeak -Toucannon -Yungoos -Gumshoos -Grubbin -Charjabug -Vikavolt -Crabrawler -Crabominable -Oricorio -Cutiefly -Ribombee -Rockruff -Lycanroc -Wishiwashi -Mareanie -Toxapex -Mudbray -Mudsdale -Dewpider -Araquanid -Fomantis -Lurantis -Morelull -Shiinotic -Salandit -Salazzle -Stufful -Bewear -Bounsweet -Steenee -Tsareena -Comfey -Oranguru -Passimian -Wimpod -Golisopod -Sandygast -Palossand -Pyukumuku -Type: Null -Silvally -Minior -Komala -Turtonator -Togedemaru -Mimikyu -Bruxish -Drampa -Dhelmise -Jangmo-o -Hakamo-o -Kommo-o -Tapu Koko -Tapu Lele -Tapu Bulu -Tapu Fini -Cosmog -Cosmoem -Solgaleo -Lunala -Nihilego -Buzzwole -Pheromosa -Xurkitree -Celesteela -Kartana -Guzzlord -Necrozma -Magearna -Marshadow -Poipole -Naganadel -Stakataka -Blacephalon -Zeraora -Meltan -Melmetal -Grookey -Thwackey -Rillaboom -Scorbunny -Raboot -Cinderace -Sobble -Drizzile -Inteleon -Skwovet -Greedent -Rookidee -Corvisquire -Corviknight -Blipbug -Dottler -Orbeetle -Nickit -Thievul -Gossifleur -Eldegoss -Wooloo -Dubwool -Chewtle -Drednaw -Yamper -Boltund -Rolycoly -Carkol -Coalossal -Applin -Flapple -Appletun -Silicobra -Sandaconda -Cramorant -Arrokuda -Barraskewda -Toxel -Toxtricity -Sizzlipede -Centiskorch -Clobbopus -Grapploct -Sinistea -Polteageist -Hatenna -Hattrem -Hatterene -Impidimp -Morgrem -Grimmsnarl -Obstagoon -Perrserker -Cursola -Sirfetch'd -Mr. Rime -Runerigus -Milcery -Alcremie -Falinks -Pincurchin -Snom -Frosmoth -Stonjourner -Eiscue -Indeedee -Morpeko -Cufant -Copperajah -Dracozolt -Arctozolt -Dracovish -Arctovish -Duraludon -Dreepy -Drakloak -Dragapult -Zacian -Zamazenta -Eternatus -Kubfu -Urshifu -Zarude -Regieleki -Regidrago -Glastrier -Spectrier -Calyrex -Wyrdeer -Kleavor -Ursaluna -Basculegion -Sneasler -Overqwil -Enamorus -Sprigatito -Floragato -Meowscarada -Fuecoco -Crocalor -Skeledirge -Quaxly -Quaxwell -Quaquaval -Lechonk -Oinkologne -Tarountula -Spidops -Nymble -Lokix -Pawmi -Pawmo -Pawmot -Tandemaus -Maushold -Fidough -Dachsbun -Smoliv -Dolliv -Arboliva -Squawkabilly -Nacli -Naclstack -Garganacl -Charcadet -Armarouge -Ceruledge -Tadbulb -Bellibolt -Wattrel -Kilowattrel -Maschiff -Mabosstiff -Shroodle -Grafaiai -Bramblin -Brambleghast -Toedscool -Toedscruel -Klawf -Capsakid -Scovillain -Rellor -Rabsca -Flittle -Espathra -Tinkatink -Tinkatuff -Tinkaton -Wiglett -Wugtrio -Bombirdier -Finizen -Palafin -Varoom -Revavroom -Cyclizar -Orthworm -Glimmet -Glimmora -Greavard -Houndstone -Flamigo -Cetoddle -Cetitan -Veluza -Dondozo -Tatsugiri -Annihilape -Clodsire -Farigiraf -Dudunsparce -Kingambit -Great Tusk -Scream Tail -Brute Bonnet -Flutter Mane -Slither Wing -Sandy Shocks -Iron Treads -Iron Bundle -Iron Hands -Iron Jugulis -Iron Moth -Iron Thorns -Frigibax -Arctibax -Baxcalibur -Gimmighoul -Gholdengo -Wo-Chien -Chien-Pao -Ting-Lu -Chi-Yu -Roaring Moon -Iron Valiant -Koraidon -Miraidon -Walking Wake -Iron Leaves -Dipplin -Poltchageist -Sinistcha -Okidogi -Munkidori -Fezandipiti -Ogerpon -Archaludon -Hydrapple -Gouging Fire -Raging Bolt -Iron Boulder -Iron Crown -Terapagos -Pecharunt \ No newline at end of file +bulbasaur, ivysaur, venusaur, charmander, charmeleon, charizard, squirtle, wartortle, blastoise, caterpie, metapod, butterfree, weedle, kakuna, beedrill, pidgey, pidgeotto, pidgeot, rattata, raticate, spearow, fearow, ekans, arbok, pikachu, raichu, sandshrew, sandslash, nidoran-f, nidorina, nidoqueen, nidoran-m, nidorino, nidoking, clefairy, clefable, vulpix, ninetales, jigglypuff, wigglytuff, zubat, golbat, oddish, gloom, vileplume, paras, parasect, venonat, venomoth, diglett, dugtrio, meowth, persian, psyduck, golduck, mankey, primeape, growlithe, arcanine, poliwag, poliwhirl, poliwrath, abra, kadabra, alakazam, machop, machoke, machamp, bellsprout, weepinbell, victreebel, tentacool, tentacruel, geodude, graveler, golem, ponyta, rapidash, slowpoke, slowbro, magnemite, magneton, farfetchd, doduo, dodrio, seel, dewgong, grimer, muk, shellder, cloyster, gastly, haunter, gengar, onix, drowzee, hypno, krabby, kingler, voltorb, electrode, exeggcute, exeggutor, cubone, marowak, hitmonlee, hitmonchan, lickitung, koffing, weezing, rhyhorn, rhydon, chansey, tangela, kangaskhan, horsea, seadra, goldeen, seaking, staryu, starmie, mr-mime, scyther, jynx, electabuzz, magmar, pinsir, tauros, magikarp, gyarados, lapras, ditto, eevee, vaporeon, jolteon, flareon, porygon, omanyte, omastar, kabuto, kabutops, aerodactyl, snorlax, articuno, zapdos, moltres, dratini, dragonair, dragonite, mewtwo, mew, chikorita, bayleef, meganium, cyndaquil, quilava, typhlosion, totodile, croconaw, feraligatr, sentret, furret, hoothoot, noctowl, ledyba, ledian, spinarak, ariados, crobat, chinchou, lanturn, pichu, cleffa, igglybuff, togepi, togetic, natu, xatu, mareep, flaaffy, ampharos, bellossom, marill, azumarill, sudowoodo, politoed, hoppip, skiploom, jumpluff, aipom, sunkern, sunflora, yanma, wooper, quagsire, espeon, umbreon, murkrow, slowking, misdreavus, unown, wobbuffet, girafarig, pineco, forretress, dunsparce, gligar, steelix, snubbull, granbull, qwilfish, scizor, shuckle, heracross, sneasel, teddiursa, ursaring, slugma, magcargo, swinub, piloswine, corsola, remoraid, octillery, delibird, mantine, skarmory, houndour, houndoom, kingdra, phanpy, donphan, porygon2, stantler, smeargle, tyrogue, hitmontop, smoochum, elekid, magby, miltank, blissey, raikou, entei, suicune, larvitar, pupitar, tyranitar, lugia, ho-oh, celebi, treecko, grovyle, sceptile, torchic, combusken, blaziken, mudkip, marshtomp, swampert, poochyena, mightyena, zigzagoon, linoone, wurmple, silcoon, beautifly, cascoon, dustox, lotad, lombre, ludicolo, seedot, nuzleaf, shiftry, taillow, swellow, wingull, pelipper, ralts, kirlia, gardevoir, surskit, masquerain, shroomish, breloom, slakoth, vigoroth, slaking, nincada, ninjask, shedinja, whismur, loudred, exploud, makuhita, hariyama, azurill, nosepass, skitty, delcatty, sableye, mawile, aron, lairon, aggron, meditite, medicham, electrike, manectric, plusle, minun, volbeat, illumise, roselia, gulpin, swalot, carvanha, sharpedo, wailmer, wailord, numel, camerupt, torkoal, spoink, grumpig, spinda, trapinch, vibrava, flygon, cacnea, cacturne, swablu, altaria, zangoose, seviper, lunatone, solrock, barboach, whiscash, corphish, crawdaunt, baltoy, claydol, lileep, cradily, anorith, armaldo, feebas, milotic, castform, kecleon, shuppet, banette, duskull, dusclops, tropius, chimecho, absol, wynaut, snorunt, glalie, spheal, sealeo, walrein, clamperl, huntail, gorebyss, relicanth, luvdisc, bagon, shelgon, salamence, beldum, metang, metagross, regirock, regice, registeel, latias, latios, kyogre, groudon, rayquaza, jirachi, deoxys-normal, turtwig, grotle, torterra, chimchar, monferno, infernape, piplup, prinplup, empoleon, starly, staravia, staraptor, bidoof, bibarel, kricketot, kricketune, shinx, luxio, luxray, budew, roserade, cranidos, rampardos, shieldon, bastiodon, burmy, wormadam-plant, mothim, combee, vespiquen, pachirisu, buizel, floatzel, cherubi, cherrim, shellos, gastrodon, ambipom, drifloon, drifblim, buneary, lopunny, mismagius, honchkrow, glameow, purugly, chingling, stunky, skuntank, bronzor, bronzong, bonsly, mime-jr, happiny, chatot, spiritomb, gible, gabite, garchomp, munchlax, riolu, lucario, hippopotas, hippowdon, skorupi, drapion, croagunk, toxicroak, carnivine, finneon, lumineon, mantyke, snover, abomasnow, weavile, magnezone, lickilicky, rhyperior, tangrowth, electivire, magmortar, togekiss, yanmega, leafeon, glaceon, gliscor, mamoswine, porygon-z, gallade, probopass, dusknoir, froslass, rotom, uxie, mesprit, azelf, dialga, palkia, heatran, regigigas, giratina-altered, cresselia, phione, manaphy, darkrai, shaymin-land, arceus, victini, snivy, servine, serperior, tepig, pignite, emboar, oshawott, dewott, samurott, patrat, watchog, lillipup, herdier, stoutland, purrloin, liepard, pansage, simisage, pansear, simisear, panpour, simipour, munna, musharna, pidove, tranquill, unfezant, blitzle, zebstrika, roggenrola, boldore, gigalith, woobat, swoobat, drilbur, excadrill, audino, timburr, gurdurr, conkeldurr, tympole, palpitoad, seismitoad, throh, sawk, sewaddle, swadloon, leavanny, venipede, whirlipede, scolipede, cottonee, whimsicott, petilil, lilligant, basculin-red-striped, sandile, krokorok, krookodile, darumaka, darmanitan-standard, maractus, dwebble, crustle, scraggy, scrafty, sigilyph, yamask, cofagrigus, tirtouga, carracosta, archen, archeops, trubbish, garbodor, zorua, zoroark, minccino, cinccino, gothita, gothorita, gothitelle, solosis, duosion, reuniclus, ducklett, swanna, vanillite, vanillish, vanilluxe, deerling, sawsbuck, emolga, karrablast, escavalier, foongus, amoonguss, frillish, jellicent, alomomola, joltik, galvantula, ferroseed, ferrothorn, klink, klang, klinklang, tynamo, eelektrik, eelektross, elgyem, beheeyem, litwick, lampent, chandelure, axew, fraxure, haxorus, cubchoo, beartic, cryogonal, shelmet, accelgor, stunfisk, mienfoo, mienshao, druddigon, golett, golurk, pawniard, bisharp, bouffalant, rufflet, braviary, vullaby, mandibuzz, heatmor, durant, deino, zweilous, hydreigon, larvesta, volcarona, cobalion, terrakion, virizion, tornadus-incarnate, thundurus-incarnate, reshiram, zekrom, landorus-incarnate, kyurem, keldeo-ordinary, meloetta-aria, genesect, chespin, quilladin, chesnaught, fennekin, braixen, delphox, froakie, frogadier, greninja, bunnelby, diggersby, fletchling, fletchinder, talonflame, scatterbug, spewpa, vivillon, litleo, pyroar, flabebe, floette, florges, skiddo, gogoat, pancham, pangoro, furfrou, espurr, meowstic-male, honedge, doublade, aegislash-shield, spritzee, aromatisse, swirlix, slurpuff, inkay, malamar, binacle, barbaracle, skrelp, dragalge, clauncher, clawitzer, helioptile, heliolisk, tyrunt, tyrantrum, amaura, aurorus, sylveon, hawlucha, dedenne, carbink, goomy, sliggoo, goodra, klefki, phantump, trevenant, pumpkaboo-average, gourgeist-average, bergmite, avalugg, noibat, noivern, xerneas, yveltal, zygarde-50, diancie, hoopa, volcanion, rowlet, dartrix, decidueye, litten, torracat, incineroar, popplio, brionne, primarina, pikipek, trumbeak, toucannon, yungoos, gumshoos, grubbin, charjabug, vikavolt, crabrawler, crabominable, oricorio-baile, cutiefly, ribombee, rockruff, lycanroc-midday, wishiwashi-solo, mareanie, toxapex, mudbray, mudsdale, dewpider, araquanid, fomantis, lurantis, morelull, shiinotic, salandit, salazzle, stufful, bewear, bounsweet, steenee, tsareena, comfey, oranguru, passimian, wimpod, golisopod, sandygast, palossand, pyukumuku, type-null, silvally, minior-red-meteor, komala, turtonator, togedemaru, mimikyu-disguised, bruxish, drampa, dhelmise, jangmo-o, hakamo-o, kommo-o, tapu-koko, tapu-lele, tapu-bulu, tapu-fini, cosmog, cosmoem, solgaleo, lunala, nihilego, buzzwole, pheromosa, xurkitree, celesteela, kartana, guzzlord, necrozma, magearna, marshadow, poipole, naganadel, stakataka, blacephalon, zeraora, meltan, melmetal, grookey, thwackey, rillaboom, scorbunny, raboot, cinderace, sobble, drizzile, inteleon, skwovet, greedent, rookidee, corvisquire, corviknight, blipbug, dottler, orbeetle, nickit, thievul, gossifleur, eldegoss, wooloo, dubwool, chewtle, drednaw, yamper, boltund, rolycoly, carkol, coalossal, applin, flapple, appletun, silicobra, sandaconda, cramorant, arrokuda, barraskewda, toxel, toxtricity-amped, sizzlipede, centiskorch, clobbopus, grapploct, sinistea, polteageist, hatenna, hattrem, hatterene, impidimp, morgrem, grimmsnarl, obstagoon, perrserker, cursola, sirfetchd, mr-rime, runerigus, milcery, alcremie, falinks, pincurchin, snom, frosmoth, stonjourner, eiscue-ice, indeedee-male, morpeko-full-belly, cufant, copperajah, dracozolt, arctozolt, dracovish, arctovish, duraludon, dreepy, drakloak, dragapult, zacian, zamazenta, eternatus, kubfu, urshifu-single-strike, zarude, regieleki, regidrago, glastrier, spectrier, calyrex, wyrdeer, kleavor, ursaluna, basculegion-male, sneasler, overqwil, enamorus-incarnate, sprigatito, floragato, meowscarada, fuecoco, crocalor, skeledirge, quaxly, quaxwell, quaquaval, lechonk, oinkologne, tarountula, spidops, nymble, lokix, pawmi, pawmo, pawmot, tandemaus, maushold, fidough, dachsbun, smoliv, dolliv, arboliva, squawkabilly, nacli, naclstack, garganacl, charcadet, armarouge, ceruledge, tadbulb, bellibolt, wattrel, kilowattrel, maschiff, mabosstiff, shroodle, grafaiai, bramblin, brambleghast, toedscool, toedscruel, klawf, capsakid, scovillain, rellor, rabsca, flittle, espathra, tinkatink, tinkatuff, tinkaton, wiglett, wugtrio, bombirdier, finizen, palafin, varoom, revavroom, cyclizar, orthworm, glimmet, glimmora, greavard, houndstone, flamigo, cetoddle, cetitan, veluza, dondozo, tatsugiri, annihilape, clodsire, farigiraf, dudunsparce, kingambit, great-tusk, scream-tail, brute-bonnet, flutter-mane, slither-wing, sandy-shocks, iron-treads, iron-bundle, iron-hands, iron-jugulis, iron-moth, iron-thorns, frigibax, arctibax, baxcalibur, gimmighoul, gholdengo, wo-chien, chien-pao, ting-lu, chi-yu, roaring-moon, iron-valiant, koraidon, miraidon, walking-wake, iron-leaves, dipplin, poltchageist, sinistcha, okidogi, munkidori, fezandipiti, ogerpon, archaludon, hydrapple, gouging-fire, raging-bolt, iron-boulder, iron-crown, terapagos, pecharunt \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt index 66ea70c..e925210 100644 --- a/composeApp/src/commonMain/kotlin/App.kt +++ b/composeApp/src/commonMain/kotlin/App.kt @@ -77,10 +77,6 @@ fun App() { loadPokemonData(1, 10) } as ArrayList - pokemap.forEach { pokemon -> - println(pokemon) - } - dataLoaded = true } @@ -90,6 +86,7 @@ fun App() { Navigator(screen = HomeScreen()) { navigator -> SlideTransition(navigator) } + print(PokemonNames.names) } } } @@ -114,7 +111,8 @@ suspend fun loadPokemonData(startId: Int, endId: Int): List { return pokemap } -suspend fun loadPokemonDataFromName(name: String): ArrayList? { +suspend fun loadPokemonDataFromName(name: String): Pokemon? { + println("fetching api, name: ${name}") if (name.equals("")) return null var json: JSONObject = JSONObject("{}") try { @@ -136,7 +134,7 @@ suspend fun loadPokemonDataFromName(name: String): ArrayList? { pokemap.add(pokemon) - return pokemap + return pokemon } fun getPokeMap(): ArrayList { diff --git a/composeApp/src/commonMain/kotlin/PokemonNames.kt b/composeApp/src/commonMain/kotlin/PokemonNames.kt index a01eeb7..ccd1531 100644 --- a/composeApp/src/commonMain/kotlin/PokemonNames.kt +++ b/composeApp/src/commonMain/kotlin/PokemonNames.kt @@ -1,5 +1,4 @@ object PokemonNames { - val names: ArrayList = arrayListOf( - - ) + val string: String = "bulbasaur, ivysaur, venusaur, charmander, charmeleon, charizard, squirtle, wartortle, blastoise, caterpie, metapod, butterfree, weedle, kakuna, beedrill, pidgey, pidgeotto, pidgeot, rattata, raticate, spearow, fearow, ekans, arbok, pikachu, raichu, sandshrew, sandslash, nidoran-f, nidorina, nidoqueen, nidoran-m, nidorino, nidoking, clefairy, clefable, vulpix, ninetales, jigglypuff, wigglytuff, zubat, golbat, oddish, gloom, vileplume, paras, parasect, venonat, venomoth, diglett, dugtrio, meowth, persian, psyduck, golduck, mankey, primeape, growlithe, arcanine, poliwag, poliwhirl, poliwrath, abra, kadabra, alakazam, machop, machoke, machamp, bellsprout, weepinbell, victreebel, tentacool, tentacruel, geodude, graveler, golem, ponyta, rapidash, slowpoke, slowbro, magnemite, magneton, farfetchd, doduo, dodrio, seel, dewgong, grimer, muk, shellder, cloyster, gastly, haunter, gengar, onix, drowzee, hypno, krabby, kingler, voltorb, electrode, exeggcute, exeggutor, cubone, marowak, hitmonlee, hitmonchan, lickitung, koffing, weezing, rhyhorn, rhydon, chansey, tangela, kangaskhan, horsea, seadra, goldeen, seaking, staryu, starmie, mr-mime, scyther, jynx, electabuzz, magmar, pinsir, tauros, magikarp, gyarados, lapras, ditto, eevee, vaporeon, jolteon, flareon, porygon, omanyte, omastar, kabuto, kabutops, aerodactyl, snorlax, articuno, zapdos, moltres, dratini, dragonair, dragonite, mewtwo, mew, chikorita, bayleef, meganium, cyndaquil, quilava, typhlosion, totodile, croconaw, feraligatr, sentret, furret, hoothoot, noctowl, ledyba, ledian, spinarak, ariados, crobat, chinchou, lanturn, pichu, cleffa, igglybuff, togepi, togetic, natu, xatu, mareep, flaaffy, ampharos, bellossom, marill, azumarill, sudowoodo, politoed, hoppip, skiploom, jumpluff, aipom, sunkern, sunflora, yanma, wooper, quagsire, espeon, umbreon, murkrow, slowking, misdreavus, unown, wobbuffet, girafarig, pineco, forretress, dunsparce, gligar, steelix, snubbull, granbull, qwilfish, scizor, shuckle, heracross, sneasel, teddiursa, ursaring, slugma, magcargo, swinub, piloswine, corsola, remoraid, octillery, delibird, mantine, skarmory, houndour, houndoom, kingdra, phanpy, donphan, porygon2, stantler, smeargle, tyrogue, hitmontop, smoochum, elekid, magby, miltank, blissey, raikou, entei, suicune, larvitar, pupitar, tyranitar, lugia, ho-oh, celebi, treecko, grovyle, sceptile, torchic, combusken, blaziken, mudkip, marshtomp, swampert, poochyena, mightyena, zigzagoon, linoone, wurmple, silcoon, beautifly, cascoon, dustox, lotad, lombre, ludicolo, seedot, nuzleaf, shiftry, taillow, swellow, wingull, pelipper, ralts, kirlia, gardevoir, surskit, masquerain, shroomish, breloom, slakoth, vigoroth, slaking, nincada, ninjask, shedinja, whismur, loudred, exploud, makuhita, hariyama, azurill, nosepass, skitty, delcatty, sableye, mawile, aron, lairon, aggron, meditite, medicham, electrike, manectric, plusle, minun, volbeat, illumise, roselia, gulpin, swalot, carvanha, sharpedo, wailmer, wailord, numel, camerupt, torkoal, spoink, grumpig, spinda, trapinch, vibrava, flygon, cacnea, cacturne, swablu, altaria, zangoose, seviper, lunatone, solrock, barboach, whiscash, corphish, crawdaunt, baltoy, claydol, lileep, cradily, anorith, armaldo, feebas, milotic, castform, kecleon, shuppet, banette, duskull, dusclops, tropius, chimecho, absol, wynaut, snorunt, glalie, spheal, sealeo, walrein, clamperl, huntail, gorebyss, relicanth, luvdisc, bagon, shelgon, salamence, beldum, metang, metagross, regirock, regice, registeel, latias, latios, kyogre, groudon, rayquaza, jirachi, deoxys-normal, turtwig, grotle, torterra, chimchar, monferno, infernape, piplup, prinplup, empoleon, starly, staravia, staraptor, bidoof, bibarel, kricketot, kricketune, shinx, luxio, luxray, budew, roserade, cranidos, rampardos, shieldon, bastiodon, burmy, wormadam-plant, mothim, combee, vespiquen, pachirisu, buizel, floatzel, cherubi, cherrim, shellos, gastrodon, ambipom, drifloon, drifblim, buneary, lopunny, mismagius, honchkrow, glameow, purugly, chingling, stunky, skuntank, bronzor, bronzong, bonsly, mime-jr, happiny, chatot, spiritomb, gible, gabite, garchomp, munchlax, riolu, lucario, hippopotas, hippowdon, skorupi, drapion, croagunk, toxicroak, carnivine, finneon, lumineon, mantyke, snover, abomasnow, weavile, magnezone, lickilicky, rhyperior, tangrowth, electivire, magmortar, togekiss, yanmega, leafeon, glaceon, gliscor, mamoswine, porygon-z, gallade, probopass, dusknoir, froslass, rotom, uxie, mesprit, azelf, dialga, palkia, heatran, regigigas, giratina-altered, cresselia, phione, manaphy, darkrai, shaymin-land, arceus, victini, snivy, servine, serperior, tepig, pignite, emboar, oshawott, dewott, samurott, patrat, watchog, lillipup, herdier, stoutland, purrloin, liepard, pansage, simisage, pansear, simisear, panpour, simipour, munna, musharna, pidove, tranquill, unfezant, blitzle, zebstrika, roggenrola, boldore, gigalith, woobat, swoobat, drilbur, excadrill, audino, timburr, gurdurr, conkeldurr, tympole, palpitoad, seismitoad, throh, sawk, sewaddle, swadloon, leavanny, venipede, whirlipede, scolipede, cottonee, whimsicott, petilil, lilligant, basculin-red-striped, sandile, krokorok, krookodile, darumaka, darmanitan-standard, maractus, dwebble, crustle, scraggy, scrafty, sigilyph, yamask, cofagrigus, tirtouga, carracosta, archen, archeops, trubbish, garbodor, zorua, zoroark, minccino, cinccino, gothita, gothorita, gothitelle, solosis, duosion, reuniclus, ducklett, swanna, vanillite, vanillish, vanilluxe, deerling, sawsbuck, emolga, karrablast, escavalier, foongus, amoonguss, frillish, jellicent, alomomola, joltik, galvantula, ferroseed, ferrothorn, klink, klang, klinklang, tynamo, eelektrik, eelektross, elgyem, beheeyem, litwick, lampent, chandelure, axew, fraxure, haxorus, cubchoo, beartic, cryogonal, shelmet, accelgor, stunfisk, mienfoo, mienshao, druddigon, golett, golurk, pawniard, bisharp, bouffalant, rufflet, braviary, vullaby, mandibuzz, heatmor, durant, deino, zweilous, hydreigon, larvesta, volcarona, cobalion, terrakion, virizion, tornadus-incarnate, thundurus-incarnate, reshiram, zekrom, landorus-incarnate, kyurem, keldeo-ordinary, meloetta-aria, genesect, chespin, quilladin, chesnaught, fennekin, braixen, delphox, froakie, frogadier, greninja, bunnelby, diggersby, fletchling, fletchinder, talonflame, scatterbug, spewpa, vivillon, litleo, pyroar, flabebe, floette, florges, skiddo, gogoat, pancham, pangoro, furfrou, espurr, meowstic-male, honedge, doublade, aegislash-shield, spritzee, aromatisse, swirlix, slurpuff, inkay, malamar, binacle, barbaracle, skrelp, dragalge, clauncher, clawitzer, helioptile, heliolisk, tyrunt, tyrantrum, amaura, aurorus, sylveon, hawlucha, dedenne, carbink, goomy, sliggoo, goodra, klefki, phantump, trevenant, pumpkaboo-average, gourgeist-average, bergmite, avalugg, noibat, noivern, xerneas, yveltal, zygarde-50, diancie, hoopa, volcanion, rowlet, dartrix, decidueye, litten, torracat, incineroar, popplio, brionne, primarina, pikipek, trumbeak, toucannon, yungoos, gumshoos, grubbin, charjabug, vikavolt, crabrawler, crabominable, oricorio-baile, cutiefly, ribombee, rockruff, lycanroc-midday, wishiwashi-solo, mareanie, toxapex, mudbray, mudsdale, dewpider, araquanid, fomantis, lurantis, morelull, shiinotic, salandit, salazzle, stufful, bewear, bounsweet, steenee, tsareena, comfey, oranguru, passimian, wimpod, golisopod, sandygast, palossand, pyukumuku, type-null, silvally, minior-red-meteor, komala, turtonator, togedemaru, mimikyu-disguised, bruxish, drampa, dhelmise, jangmo-o, hakamo-o, kommo-o, tapu-koko, tapu-lele, tapu-bulu, tapu-fini, cosmog, cosmoem, solgaleo, lunala, nihilego, buzzwole, pheromosa, xurkitree, celesteela, kartana, guzzlord, necrozma, magearna, marshadow, poipole, naganadel, stakataka, blacephalon, zeraora, meltan, melmetal, grookey, thwackey, rillaboom, scorbunny, raboot, cinderace, sobble, drizzile, inteleon, skwovet, greedent, rookidee, corvisquire, corviknight, blipbug, dottler, orbeetle, nickit, thievul, gossifleur, eldegoss, wooloo, dubwool, chewtle, drednaw, yamper, boltund, rolycoly, carkol, coalossal, applin, flapple, appletun, silicobra, sandaconda, cramorant, arrokuda, barraskewda, toxel, toxtricity-amped, sizzlipede, centiskorch, clobbopus, grapploct, sinistea, polteageist, hatenna, hattrem, hatterene, impidimp, morgrem, grimmsnarl, obstagoon, perrserker, cursola, sirfetchd, mr-rime, runerigus, milcery, alcremie, falinks, pincurchin, snom, frosmoth, stonjourner, eiscue-ice, indeedee-male, morpeko-full-belly, cufant, copperajah, dracozolt, arctozolt, dracovish, arctovish, duraludon, dreepy, drakloak, dragapult, zacian, zamazenta, eternatus, kubfu, urshifu-single-strike, zarude, regieleki, regidrago, glastrier, spectrier, calyrex, wyrdeer, kleavor, ursaluna, basculegion-male, sneasler, overqwil, enamorus-incarnate, sprigatito, floragato, meowscarada, fuecoco, crocalor, skeledirge, quaxly, quaxwell, quaquaval, lechonk, oinkologne, tarountula, spidops, nymble, lokix, pawmi, pawmo, pawmot, tandemaus, maushold, fidough, dachsbun, smoliv, dolliv, arboliva, squawkabilly, nacli, naclstack, garganacl, charcadet, armarouge, ceruledge, tadbulb, bellibolt, wattrel, kilowattrel, maschiff, mabosstiff, shroodle, grafaiai, bramblin, brambleghast, toedscool, toedscruel, klawf, capsakid, scovillain, rellor, rabsca, flittle, espathra, tinkatink, tinkatuff, tinkaton, wiglett, wugtrio, bombirdier, finizen, palafin, varoom, revavroom, cyclizar, orthworm, glimmet, glimmora, greavard, houndstone, flamigo, cetoddle, cetitan, veluza, dondozo, tatsugiri, annihilape, clodsire, farigiraf, dudunsparce, kingambit, great-tusk, scream-tail, brute-bonnet, flutter-mane, slither-wing, sandy-shocks, iron-treads, iron-bundle, iron-hands, iron-jugulis, iron-moth, iron-thorns, frigibax, arctibax, baxcalibur, gimmighoul, gholdengo, wo-chien, chien-pao, ting-lu, chi-yu, roaring-moon, iron-valiant, koraidon, miraidon, walking-wake, iron-leaves, dipplin, poltchageist, sinistcha, okidogi, munkidori, fezandipiti, ogerpon, archaludon, hydrapple, gouging-fire, raging-bolt, iron-boulder, iron-crown, terapagos, pecharunt" + val names: ArrayList = arrayListOf(*string.split(",").toTypedArray()) } \ No newline at end of file