Skip to content

Commit bac4fd2

Browse files
committed
chore: use same label component everywhere
1 parent c101df8 commit bac4fd2

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

lib/components/BucketTaskCard.dart

+2-11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
44
import 'package:flutter/scheduler.dart';
55
import 'package:dotted_border/dotted_border.dart';
66
import 'package:provider/provider.dart';
7+
import 'package:vikunja_app/components/label.dart';
78
import 'package:vikunja_app/models/task.dart';
89
import 'package:vikunja_app/pages/project/task_edit.dart';
910
import 'package:vikunja_app/utils/misc.dart';
@@ -154,17 +155,7 @@ class _BucketTaskCardState extends State<BucketTaskCard>
154155
);
155156
widget.task.labels.sort((a, b) => a.title.compareTo(b.title));
156157
widget.task.labels.asMap().forEach((i, label) {
157-
labelRow.children.add(Chip(
158-
label: Text(label.title),
159-
labelStyle: theme.textTheme.labelLarge?.copyWith(
160-
color: label.textColor,
161-
),
162-
backgroundColor: label.color,
163-
shape: RoundedRectangleBorder(
164-
borderRadius: BorderRadius.circular(4.0),
165-
side: BorderSide(style: BorderStyle.none),
166-
),
167-
));
158+
labelRow.children.add(LabelComponent(label: label));
168159
});
169160
if (widget.task.hasCheckboxes) {
170161
final checkboxStatistics = widget.task.checkboxStatistics;

lib/components/label.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class LabelComponent extends StatelessWidget {
1919
),
2020
backgroundColor: label.color,
2121
shape: RoundedRectangleBorder(
22-
borderRadius: BorderRadius.all(Radius.circular(3)),
22+
borderRadius: BorderRadius.all(Radius.circular(4)),
23+
side: BorderSide(style: BorderStyle.none),
2324
),
2425
onDeleted: onDelete,
2526
deleteIconColor: label.textColor,

0 commit comments

Comments
 (0)