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

Simplify the code

Browse Source
This commit is contained in:
KristianTashkov
2021-09-12 15:27:03 +03:00
parent 1a56260757
commit 113a5028af
12 changed files with 29 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
View File

@@ -92,20 +92,12 @@ class ScoreList {
}
var previousValue = 0.0
val numericalUnknownDayValue = (targetValue * 2 * 1000) / denominator
for (i in values.indices) {
val offset = values.size - i - 1
if (isNumerical) {
if (values[offset] >= 0)
rollingSum += values[offset]
else if (numericalHabitType == NumericalHabitType.AT_MOST)
rollingSum += numericalUnknownDayValue
rollingSum += max(0, values[offset])
if (offset + denominator < values.size) {
if (values[offset + denominator] >= 0) {
rollingSum -= values[offset + denominator]
} else if (numericalHabitType == NumericalHabitType.AT_MOST) {
rollingSum -= numericalUnknownDayValue
}
rollingSum -= max(0, values[offset + denominator])
}
var percentageCompleted = 0.0

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

@@ -115,10 +115,8 @@ class HistoryCardPresenter(
}
} else {
entries.map {
if (it.value < 0) habit.targetValue * 2.0 * 1000.0 else it.value / 1000.0
}.map {
when {
it <= habit.targetValue -> HistoryChart.Square.ON
max(0, it.value) < 2 * habit.targetValue -> HistoryChart.Square.ON
else -> HistoryChart.Square.OFF
}
}