From c2731c03c381743185b18e9fa75b1450b4bfcedc Mon Sep 17 00:00:00 2001 From: Jakub Kalinowski Date: Sun, 20 Mar 2022 17:06:57 +0100 Subject: [PATCH] Resolving hiqua's comments --- .../java/org/isoron/uhabits/core/models/Entry.kt | 2 +- .../ui/screens/habits/show/views/HistoryCard.kt | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt index 226ddafc1..88d0593ef 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Entry.kt @@ -27,7 +27,7 @@ data class Entry( /** * Value indicating that the habit is not applicable for this timestamp. */ - const val SKIP = -2 + const val SKIP = 3 /** * Value indicating that the user has performed the habit at this timestamp. diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt index aca6c3811..a5b65fdc9 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt @@ -153,15 +153,11 @@ class HistoryCardPresenter( val series = if (habit.isNumerical) { entries.map { when { - it.value == SKIP -> { - HistoryChart.Square.HATCHED - } - it.value > 0 -> { - HistoryChart.Square.ON - } - else -> { - HistoryChart.Square.OFF - } + it.value == Entry.UNKNOWN -> OFF + it.value == SKIP -> HATCHED + (habit.targetType == AT_MOST) && (it.value / 1000.0 <= habit.targetValue) -> ON + (habit.targetType == AT_LEAST) && (it.value / 1000.0 >= habit.targetValue) -> ON + else -> GREY } } } else {