fix: including all previous week task

vishal2376 · Apr 1, 2024 · 250a58e · 250a58e
1 parent 735166d
commit 250a58e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ain/java/com/vishal2376/snaptick/presentation/this_week_task_screen/ThisWeekTaskScreen.kt b/...ain/java/com/vishal2376/snaptick/presentation/this_week_task_screen/ThisWeekTaskScreen.kt
@@ -58,11 +58,11 @@ fun ThisWeekTaskScreen(
 
  val startDayOfWeek = WeekFields.of(DayOfWeek.MONDAY, 1).weekOfYear()
  val currentWeek = LocalDate.now().get(startDayOfWeek)
- val previousWeek = currentWeek - 1
+ val previousWeek = LocalDate.now().minusWeeks(1)
 
  val thisWeekTasks = tasks.filter { task ->
  val taskWeekOfYear = task.date.get(startDayOfWeek)
- (taskWeekOfYear == currentWeek) || (taskWeekOfYear == previousWeek && task.isRepeated)
+ (taskWeekOfYear == currentWeek) || ((task.date in previousWeek..LocalDate.now()) && task.isRepeated)
  }
 
  Scaffold(topBar = {