sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-22 05:38:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing bug 1142: Habits: Yellow habits should show with 'Weak' filter, not 'Strong' (#1149)

Browse source 
Values taken from file: Task.kt (line: 111)
This commit is contained in:
Remigiusz Samborski 2019-05-15 15:07:35 +02:00 committed by Phillip Thelen
parent 29d8f761aa
commit 30539ba6a0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
View file

@ -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)
}