From a77acd56c720757ea884a8e6f869edc58ea3e8ea Mon Sep 17 00:00:00 2001 From: Joren Date: Mon, 29 Apr 2024 16:15:09 +0200 Subject: [PATCH] When nothing is entered display so --- app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt | 4 ++-- app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt b/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt index 24c1aa5..3129be2 100644 --- a/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt +++ b/app/src/main/java/com/ti/mobpo/ui/PokeSearchViewModel.kt @@ -50,7 +50,7 @@ class PokeSearchViewModel : ViewModel() { try { val response = service.getPokemonSpecies() _initialPokemonList.value = response.results - _filteredPokemonList.value = response.results.take(SHOW_LIMIT) + _filteredPokemonList.value = listOf(PokemonSpecies("Please enter a search term", "")); } catch (e: IOException) { /*TODO*/ } @@ -63,7 +63,7 @@ class PokeSearchViewModel : ViewModel() { val filteredList = initialPokemonList.filter { it.name.contains(query, ignoreCase = true) } _filteredPokemonList.value = filteredList.take(SHOW_LIMIT); } else { - _filteredPokemonList.value = initialPokemonList?.take(SHOW_LIMIT); + _filteredPokemonList.value = listOf(PokemonSpecies("Please enter a search term", "")); } } } \ No newline at end of file diff --git a/app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt b/app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt index f7e3a02..ffc78f1 100644 --- a/app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt +++ b/app/src/main/java/com/ti/mobpo/ui/screens/PokeSearch.kt @@ -42,14 +42,16 @@ fun PokeSearch(pokeSearchViewModel: PokeSearchViewModel) { Spacer(modifier = Modifier.height(16.dp)) - searchResults?.let { results -> - if (results.isNotEmpty()) { - results.forEach { pokemon -> + if (searchResults != null) { + if (searchResults!!.isNotEmpty()) { + searchResults!!.forEach { pokemon -> Text(text = pokemon.name) } } else { Text("No results found") } + } else { + Text("Enter a pokemon name to search") } } }