isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

modify review comments

Browse Source
This commit is contained in:
KristianTashkov
2021-09-26 22:58:24 +03:00
parent 17ed85fc1b
commit 07e55f1c76
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
View File

@@ -59,10 +59,9 @@ data class Habit(
val today = DateUtils.getTodayWithOffset() val today = DateUtils.getTodayWithOffset()
val value = computedEntries.get(today).value val value = computedEntries.get(today).value
return if (isNumerical) { return if (isNumerical) {
val targetValuePerDay = (targetValue / frequency.denominator)
when (targetType) { when (targetType) {
NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValuePerDay NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValue
NumericalHabitType.AT_MOST -> value / 1000.0 <= targetValuePerDay NumericalHabitType.AT_MOST -> value / 1000.0 <= targetValue
} }
} else { } else {
value != Entry.NO && value != Entry.UNKNOWN value != Entry.NO && value != Entry.UNKNOWN
@@ -73,10 +72,9 @@ data class Habit(
val today = DateUtils.getTodayWithOffset() val today = DateUtils.getTodayWithOffset()
val value = computedEntries.get(today).value val value = computedEntries.get(today).value
return if (isNumerical) { return if (isNumerical) {
val targetValuePerDay = (targetValue / frequency.denominator)
when (targetType) { when (targetType) {
NumericalHabitType.AT_LEAST -> value / 1000.0 < targetValuePerDay NumericalHabitType.AT_LEAST -> value / 1000.0 < targetValue
NumericalHabitType.AT_MOST -> value / 1000.0 > targetValuePerDay NumericalHabitType.AT_MOST -> value / 1000.0 > targetValue
} }
} else { } else {
value == Entry.NO value == Entry.NO

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
View File

@@ -117,7 +117,7 @@ class HistoryCardPresenter(
} else { } else {
entries.map { entries.map {
when { when {
max(0.0, it.value / 1000.0) < 2 * habit.targetValue -> HistoryChart.Square.ON max(0.0, it.value / 1000.0) <= habit.targetValue -> HistoryChart.Square.ON
else -> HistoryChart.Square.OFF else -> HistoryChart.Square.OFF
} }
} }