diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt index b80c8e16..f90023eb 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt @@ -2,14 +2,13 @@ package es.verdnatura.presentation.view.feature.historicoarticulo.adapter import android.view.LayoutInflater import android.view.ViewGroup - +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import es.verdnatura.R import es.verdnatura.databinding.ItemHistoricoRowBinding import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO -import androidx.core.content.ContextCompat import java.text.SimpleDateFormat -import java.util.* +import java.util.Date class HistoricoAdapter ( private val items: List @@ -38,11 +37,16 @@ class HistoricoAdapter ( val sdf = SimpleDateFormat(res.getString(R.string.dateFormat)) val currentDate = sdf.format(Date()) - if (currentDate == item.shipped){ - historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.getContext(),R.color.verdnatura_pumpkin_orange)) - }else{ - historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.getContext(),R.color.verdnatura_black_5)) + + historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.context, if (currentDate == item.shipped){R.color.verdnatura_pumpkin_orange}else{ + R.color.verdnatura_black_5 + })) + + item?.invalue?.let { + inQuantity.setBackgroundColor(ContextCompat.getColor(historicoDate.context, + if (it > 0) R.color.verdnatura_dark_green_verdnatura else R.color.verdnatura_white)) } + } } } 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 d3fdaa08..07034914 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 @@ -21,7 +21,7 @@ import es.verdnatura.presentation.view.feature.historicoarticulo.adapter.Histori import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoListVO import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO import java.text.SimpleDateFormat -import java.util.* +import java.util.Date @Suppress("UNUSED_ANONYMOUS_PARAMETER") class HistoricoArticuloFragment( @@ -59,14 +59,14 @@ class HistoricoArticuloFragment( val listIcons: ArrayList = ArrayList() val iconReload = ImageView(context) - iconReload.setImageResource(R.drawable.ic_transaction) + iconReload.setImageResource(R.drawable.ic_info_refresh) val iconGargabe = ImageView(context) iconGargabe.setImageResource(R.drawable.alpha_b_circle_outline) val iconFault = ImageView(context) iconFault.setImageResource(R.drawable.alpha_f_circle_outline) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - iconReload.tooltipText = getTooltip(R.drawable.ic_transaction) + iconReload.tooltipText = getTooltip(R.drawable.ic_info_refresh) iconGargabe.tooltipText = getTooltip(R.drawable.alpha_b_circle_outline) iconFault.tooltipText = getTooltip(R.drawable.alpha_f_circle_outline) } diff --git a/app/src/main/res/layout/item_historico_row.xml b/app/src/main/res/layout/item_historico_row.xml index d5c16d5c..a71ea017 100644 --- a/app/src/main/res/layout/item_historico_row.xml +++ b/app/src/main/res/layout/item_historico_row.xml @@ -44,6 +44,7 @@ android:textSize="@dimen/body2" />