From c0f3c0293f353114757ef7591824cd230212f03a Mon Sep 17 00:00:00 2001 From: Carlos Macaneta Date: Mon, 14 Oct 2024 14:42:59 +0200 Subject: [PATCH] chore: updating the color tones of TEIs --- .../java/org/saudigitus/rei/utils/SearchTeiStyle.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rei/src/main/java/org/saudigitus/rei/utils/SearchTeiStyle.kt b/rei/src/main/java/org/saudigitus/rei/utils/SearchTeiStyle.kt index ca0fbaa3e1..1a2096d608 100644 --- a/rei/src/main/java/org/saudigitus/rei/utils/SearchTeiStyle.kt +++ b/rei/src/main/java/org/saudigitus/rei/utils/SearchTeiStyle.kt @@ -4,6 +4,9 @@ import androidx.compose.ui.graphics.Color import org.dhis2.commons.data.SearchTeiModel import org.hisp.dhis.android.core.D2 import org.hisp.dhis.android.core.event.EventStatus +import org.saudigitus.rei.ui.theme.Light_Error +import org.saudigitus.rei.ui.theme.Light_Success +import org.saudigitus.rei.ui.theme.Light_Warning class SearchTeiStyle(private val d2: D2) { fun getTeiCardBackground(searchTeiModel: SearchTeiModel): Pair { @@ -15,13 +18,13 @@ class SearchTeiStyle(private val d2: D2) { .one().blockingGet() when (event?.status()) { - EventStatus.COMPLETED -> Pair(EventStatus.COMPLETED.name.capital(), Color.Green) - EventStatus.OVERDUE -> Pair(EventStatus.OVERDUE.name.capital(), Color.Yellow) - EventStatus.SCHEDULE -> Pair(EventStatus.ACTIVE.name.capital(), Color.Red) - else -> Pair(EventStatus.ACTIVE.name.capital(), Color.LightGray) + EventStatus.COMPLETED -> Pair(EventStatus.COMPLETED.name.capital(), Light_Success.copy(.2f)) + EventStatus.OVERDUE -> Pair(EventStatus.OVERDUE.name.capital(), Light_Warning.copy(.2f)) + EventStatus.SCHEDULE -> Pair(EventStatus.ACTIVE.name.capital(), Light_Error.copy(.2f)) + else -> Pair(EventStatus.ACTIVE.name.capital(), Color.Transparent) } } else { - Pair(EventStatus.ACTIVE.name.capital(), Color.LightGray) + Pair(EventStatus.ACTIVE.name.capital(), Color.Transparent) } } }