1
0
mirror of https://github.com/go-vikunja/app synced 2024-06-01 10:16:53 +00:00

done tasks are not marked past due, minor formatting changes

This commit is contained in:
Paul Nettleton 2022-08-02 18:25:12 -05:00
parent d31368ed27
commit c93e92c302

View File

@ -99,8 +99,9 @@ class _BucketTaskCardState extends State<BucketTaskCard> with AutomaticKeepAlive
), ),
], ],
); );
final duration = widget.task.dueDate.difference(DateTime.now());
if (widget.task.dueDate.year > 2) { if (widget.task.dueDate.year > 2) {
final duration = widget.task.dueDate.difference(DateTime.now());
final pastDue = duration.isNegative && !widget.task.done;
titleRow.children.add(Container( titleRow.children.add(Container(
constraints: chipConstraints, constraints: chipConstraints,
padding: EdgeInsets.only(left: 4), padding: EdgeInsets.only(left: 4),
@ -108,13 +109,13 @@ class _BucketTaskCardState extends State<BucketTaskCard> with AutomaticKeepAlive
child: Chip( child: Chip(
avatar: Icon( avatar: Icon(
Icons.calendar_month, Icons.calendar_month,
color: duration.isNegative ? Colors.red : null, color: pastDue ? Colors.red : null,
), ),
label: Text(durationToHumanReadable(duration)), label: Text(durationToHumanReadable(duration)),
labelStyle: theme.textTheme.labelLarge.copyWith( labelStyle: theme.textTheme.labelLarge.copyWith(
color: duration.isNegative ? Colors.red : null, color: pastDue ? Colors.red : null,
), ),
backgroundColor: duration.isNegative ? Colors.red.withAlpha(20) : null, backgroundColor: pastDue ? Colors.red.withAlpha(20) : null,
), ),
), ),
)); ));
@ -190,15 +191,14 @@ class _BucketTaskCardState extends State<BucketTaskCard> with AutomaticKeepAlive
constraints: rowConstraints, constraints: rowConstraints,
child: identifierRow, child: identifierRow,
), ),
Container(
constraints: rowConstraints,
child: titleRow,
),
Padding( Padding(
padding: labelRow.children.isNotEmpty padding: EdgeInsets.only(top: 4, bottom: labelRow.children.isNotEmpty ? 8 : 0),
? const EdgeInsets.only(top: 8) : EdgeInsets.zero, child: Container(
child: labelRow, constraints: rowConstraints,
child: titleRow,
),
), ),
labelRow,
], ],
), ),
), ),