From 30539ba6a0dfe11e7cf45722b6d7003fff5e6cec Mon Sep 17 00:00:00 2001 From: Remigiusz Samborski Date: Wed, 15 May 2019 15:07:35 +0200 Subject: [PATCH] Fixing bug 1142: Habits: Yellow habits should show with 'Weak' filter, not 'Strong' (#1149) Values taken from file: Task.kt (line: 111) --- .../habitrpg/android/habitica/helpers/TaskFilterHelper.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt index 24b4ecab0..401bc17d8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt @@ -67,8 +67,8 @@ class TaskFilterHelper { !task.completed } Task.FILTER_GRAY -> task.completed || !task.isDisplayedActive - Task.FILTER_WEAK -> task.value < 0 - Task.FILTER_STRONG -> task.value >= 0 + Task.FILTER_WEAK -> task.value < 1 + Task.FILTER_STRONG -> task.value >= 1 Task.FILTER_DATED -> task.dueDate != null Task.FILTER_COMPLETED -> task.completed else -> true @@ -107,8 +107,8 @@ class TaskFilterHelper { query.equalTo("completed", false) } Task.FILTER_GRAY -> query = query.equalTo("completed", true).or().equalTo("isDue", false) - Task.FILTER_WEAK -> query = query.lessThan("value", 0.0) - Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 0.0) + Task.FILTER_WEAK -> query = query.lessThan("value", 1.0) + Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0) Task.FILTER_DATED -> query = query.isNotNull("dueDate").equalTo("completed", false) Task.FILTER_COMPLETED -> query = query.equalTo("completed", true) }