From 36944fb09811b8f7fa6ce2bad1f96465f85a3a47 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 2 Feb 2022 10:26:39 -0600 Subject: [PATCH] Show full due date in widget overdue group --- .../main/java/org/tasks/widget/ScrollableViewsFactory.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.kt b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.kt index 6a8e84a51..d1426fdf6 100644 --- a/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.kt +++ b/app/src/main/java/org/tasks/widget/ScrollableViewsFactory.kt @@ -9,6 +9,7 @@ import android.view.View import android.widget.RemoteViews import android.widget.RemoteViewsService.RemoteViewsFactory import com.todoroo.andlib.utility.DateUtilities +import com.todoroo.andlib.utility.DateUtilities.now import com.todoroo.astrid.api.Filter import com.todoroo.astrid.core.SortHelper import com.todoroo.astrid.data.Task @@ -31,7 +32,6 @@ import org.tasks.time.DateTimeUtils.startOfDay import org.tasks.ui.CheckBoxProvider import timber.log.Timber import java.time.format.FormatStyle -import java.util.* import kotlin.math.max internal class ScrollableViewsFactory( @@ -308,8 +308,9 @@ internal class ScrollableViewsFactory( } row.setViewVisibility(dueDateRes, View.VISIBLE) val text = if (sortMode == SortHelper.SORT_DUE - && !disableGroups - && task.sortGroup?.startOfDay() == task.dueDate.startOfDay()) { + && task.sortGroup >= now().startOfDay() + && !disableGroups + ) { task.takeIf { it.hasDueTime() }?.let { DateUtilities.getTimeString(context, DateTimeUtils.newDateTime(task.dueDate)) }