build.gradle.kts

@@ -18,6 +18,5 @@ allprojects {
         maven(url = "https://plugins.gradle.org/m2/")
         maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
         maven(url = "https://jitpack.io")
-        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers/") // Repository for kotlin-css-jvm old versions, now that the Gradle Plugin Portal no longer brings these in by mirroring JCenter
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt

@@ -54,6 +54,7 @@ class ShowHabitView(context: Context) : FrameLayout(context) {
         binding.barCard.setState(data.bar)
         if (data.isNumerical) {
             binding.overviewCard.visibility = GONE
+            binding.streakCard.visibility = GONE
         } else {
             binding.targetCard.visibility = GONE
         }

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

@@ -61,7 +61,7 @@ data class Habit(
         return if (isNumerical) {
             when (targetType) {
                 NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValue
-                NumericalHabitType.AT_MOST -> false
+                NumericalHabitType.AT_MOST -> value != Entry.UNKNOWN && value / 1000.0 <= targetValue
             }
         } else {
             value != Entry.NO && value != Entry.UNKNOWN
@@ -100,10 +100,7 @@ data class Habit(
         streaks.recompute(
             computedEntries,
             from,
-            to,
+            to
-            isNumerical,
-            targetValue,
-            targetType
         )
     }
 

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

@@ -37,25 +37,12 @@ class StreakList {
     fun recompute(
         computedEntries: EntryList,
         from: Timestamp,
-        to: Timestamp,
+        to: Timestamp
-        isNumerical: Boolean,
-        targetValue: Double,
-        targetType: NumericalHabitType
     ) {
         list.clear()
         val timestamps = computedEntries
             .getByInterval(from, to)
-            .filter {
+            .filter { it.value > 0 }
-                val value = it.value
-                if (isNumerical) {
-                    when (targetType) {
-                        NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValue
-                        NumericalHabitType.AT_MOST -> value != Entry.UNKNOWN && value / 1000.0 <= targetValue
-                    }
-                } else {
-                    value > 0
-                }
-            }
             .map { it.timestamp }
             .toTypedArray()
 

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

@@ -24,7 +24,6 @@ import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
 import org.isoron.uhabits.core.commands.DeleteHabitsCommand
 import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.tasks.Task
@@ -121,7 +120,7 @@ class NotificationTray @Inject constructor(
 
         override fun onPostExecute() {
             systemTray.log("Showing notification for habit=" + habit.id)
-            if (isCompleted && habit.targetType != NumericalHabitType.AT_MOST) {
+            if (isCompleted) {
                 systemTray.log(
                     String.format(
                         Locale.US,

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

@@ -110,10 +110,10 @@ class HabitTest : BaseUnitTest() {
         assertFalse(h.isCompletedToday())
         h.originalEntries.add(Entry(getToday(), 100000))
         h.recompute()
-        assertFalse(h.isCompletedToday())
+        assertTrue(h.isCompletedToday())
         h.originalEntries.add(Entry(getToday(), 50000))
         h.recompute()
-        assertFalse(h.isCompletedToday())
+        assertTrue(h.isCompletedToday())
     }
 
     @Test