From e0c9fc7c6026c855b3f647c4d10171b67809b166 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Mon, 19 Feb 2024 08:25:12 +0100 Subject: [PATCH] refs #6873 feat:modify filter --- .../fragment/HistoricoArticuloFragment.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt index 316ad7eb..cf896d42 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt @@ -84,7 +84,7 @@ class HistoricoArticuloFragment( when (item) { iconReload.drawable -> viewModelwithFilter("all") iconGargabe.drawable -> { - viewModelwithFilter("contenedor") + viewModelwithFilter("merma") item.setTint(getColor(context!!, verdnatura_pumpkin_orange)) } @@ -173,14 +173,9 @@ class HistoricoArticuloFragment( listHistoric.clear() listHistoryAux.clear() lista.forEach { - if (filter.equals("all")) { + if (filter == "all" || (filter == "falta" && it.name?.contains(filter, true) == true) || (filter != "falta" && it.name?.contains("merma", true) == true && !it.name?.contains("falta", true)!!)) { listHistoric.add(it) - } else { - if (it.name?.contains(filter, true)!!) { - listHistoric.add(it) - } } - } adapter = HistoricoAdapter(listHistoric)