Merge branch 'master' into dev

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

@@ -22,6 +22,7 @@ import org.isoron.uhabits.core.models.Score.Companion.compute
 import java.util.ArrayList
 import java.util.HashMap
 import javax.annotation.concurrent.ThreadSafe
+import kotlin.math.max
 import kotlin.math.min
 
 @ThreadSafe
@@ -93,11 +94,15 @@ class ScoreList {
         for (i in values.indices) {
             val offset = values.size - i - 1
             if (isNumerical) {
-                rollingSum += values[offset]
+                rollingSum += max(0, values[offset])
                 if (offset + denominator < values.size) {
                     rollingSum -= values[offset + denominator]
                 }
-                val percentageCompleted = min(1.0, rollingSum / 1000 / targetValue)
+                val percentageCompleted = if (targetValue > 0) {
+                    min(1.0, rollingSum / 1000 / targetValue)
+                } else {
+                    1.0
+                }
                 previousValue = compute(freq, previousValue, percentageCompleted)
             } else {
                 if (values[offset] == Entry.YES_MANUAL) {

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt

@@ -136,6 +136,7 @@ class BarChart(
             canvas.drawLine(0.0, y, width, y)
             canvas.setColor(theme.mediumContrastTextColor)
             canvas.setTextAlign(TextAlign.CENTER)
+            canvas.setFontSize(theme.smallTextSize)
             var prevMonth = -1
             var prevYear = -1
             val isLargeInterval = axis.size < 2 || (axis[0].distanceTo(axis[1]) > 300)

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt

@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.core.models
 
+import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.number.IsCloseTo
 import org.hamcrest.number.OrderingComparison
@@ -121,6 +122,14 @@ class ScoreListTest : BaseUnitTest() {
         checkScoreValues(expectedValues)
     }
 
+    @Test
+    fun test_withZeroTarget() {
+        habit = fixtures.createNumericalHabit()
+        habit.targetValue = 0.0
+        habit.recompute()
+        assertTrue(habit.scores[today].value.isFinite())
+    }
+
     @Test
     fun test_imperfectNonDaily() {
         // If the habit should be performed 3 times per week and the user misses 1 repetition