Show full due date in widget overdue group

pull/1760/head
Alex Baker 4 years ago
parent c1afbfbaa8
commit 36944fb098

@ -9,6 +9,7 @@ import android.view.View
import android.widget.RemoteViews import android.widget.RemoteViews
import android.widget.RemoteViewsService.RemoteViewsFactory import android.widget.RemoteViewsService.RemoteViewsFactory
import com.todoroo.andlib.utility.DateUtilities import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.andlib.utility.DateUtilities.now
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.core.SortHelper import com.todoroo.astrid.core.SortHelper
import com.todoroo.astrid.data.Task import com.todoroo.astrid.data.Task
@ -31,7 +32,6 @@ import org.tasks.time.DateTimeUtils.startOfDay
import org.tasks.ui.CheckBoxProvider import org.tasks.ui.CheckBoxProvider
import timber.log.Timber import timber.log.Timber
import java.time.format.FormatStyle import java.time.format.FormatStyle
import java.util.*
import kotlin.math.max import kotlin.math.max
internal class ScrollableViewsFactory( internal class ScrollableViewsFactory(
@ -308,8 +308,9 @@ internal class ScrollableViewsFactory(
} }
row.setViewVisibility(dueDateRes, View.VISIBLE) row.setViewVisibility(dueDateRes, View.VISIBLE)
val text = if (sortMode == SortHelper.SORT_DUE val text = if (sortMode == SortHelper.SORT_DUE
&& task.sortGroup >= now().startOfDay()
&& !disableGroups && !disableGroups
&& task.sortGroup?.startOfDay() == task.dueDate.startOfDay()) { ) {
task.takeIf { it.hasDueTime() }?.let { task.takeIf { it.hasDueTime() }?.let {
DateUtilities.getTimeString(context, DateTimeUtils.newDateTime(task.dueDate)) DateUtilities.getTimeString(context, DateTimeUtils.newDateTime(task.dueDate))
} }

Loading…
Cancel
Save