From 3085f958bd6ecf54360e46ae23c64f13a86c3fa9 Mon Sep 17 00:00:00 2001 From: Joren Date: Tue, 30 Apr 2024 01:49:14 +0200 Subject: [PATCH] When display limit is reached, stop filter --- .../java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt | 2 +- .../java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt b/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt index a318f12..db27440 100644 --- a/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt +++ b/app/src/main/java/com/ti/mobpo/ui/viewmodels/FavouritesViewModel.kt @@ -18,7 +18,7 @@ import kotlinx.coroutines.launch import java.io.IOException class FavouritesViewModel(private val favouritesRepository: FavouritesRepository, featureManager: FeatureManager) : ViewModel() { - private val service = PokeApi.retrofitService; + private val service = PokeApi.retrofitService private val _pokemonDetails = MutableStateFlow?>(null) val pokemonDetails: StateFlow?> = _pokemonDetails.asStateFlow() diff --git a/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt b/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt index 8146c7f..231cbcf 100644 --- a/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt +++ b/app/src/main/java/com/ti/mobpo/ui/viewmodels/PokeSearchViewModel.kt @@ -44,7 +44,10 @@ class PokeSearchViewModel(private val favouritesRepository: FavouritesRepository val filteredList = _initialPokemonList.value?.filter { it.name.contains(query, ignoreCase = true) } val detailsList = mutableListOf() if (filteredList != null) { - for (pokemonSpecies in filteredList.take(SHOW_LIMIT)) { + for (pokemonSpecies in filteredList) { + if (detailsList.size >= SHOW_LIMIT) { + break + } val details = service.getPokemonDetails(extractPokemonId(pokemonSpecies.url)) val isFavorite = favouritesRepository.isFavourite(details.id) detailsList.add(details.copy(isFavorite = isFavorite))