From 45eb0872289c82b68ff0cefc4f26a9604dfb1309 Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Tue, 19 Mar 2019 19:41:41 +0100
Subject: [PATCH] Fixed label display

---
 lib/components/label.dart     | 65 +++++++++++++----------------------
 lib/pages/list/task_edit.dart |  6 ++--
 2 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/lib/components/label.dart b/lib/components/label.dart
index 58e52aa..aa3a972 100644
--- a/lib/components/label.dart
+++ b/lib/components/label.dart
@@ -4,16 +4,9 @@ import 'package:vikunja_app/theme/constants.dart';
 
 class LabelComponent extends StatefulWidget {
   final Label label;
-  final VoidCallback onTap;
   final VoidCallback onDelete;
-  final Color backgroundColor;
 
-  const LabelComponent(
-      {Key key,
-      @required this.label,
-      this.onTap,
-      this.onDelete,
-      this.backgroundColor = vGreen})
+  const LabelComponent({Key key, @required this.label, this.onDelete})
       : super(key: key);
 
   @override
@@ -23,43 +16,31 @@ class LabelComponent extends StatefulWidget {
 }
 
 class LabelComponentState extends State<LabelComponent> {
-  LabelComponentState() {}
-
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: widget.onTap,
-      child: Container(
-        padding: EdgeInsets.symmetric(vertical: 5, horizontal: 8),
-        margin: EdgeInsets.only(top: 5, bottom: 5, right: 10),
+    return Chip(
+      label: Text(
+        widget.label.title,
+        style: TextStyle(
+          color: vWhite,
+        ),
+      ),
+      backgroundColor: vGreen,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.all(Radius.circular(3)),
+      ),
+      onDeleted: widget.onDelete,
+      deleteIconColor: vWhite,
+      deleteIcon: Container(
+        padding: EdgeInsets.all(3),
         decoration: BoxDecoration(
-            color: widget.backgroundColor,
-            borderRadius: BorderRadius.all(Radius.circular(3))),
-        child: Row(
-          children: [
-            Text(
-              widget.label.title,
-              style: TextStyle(
-                color: vWhite,
-              ),
-            ),
-            GestureDetector(
-              child: Container(
-                padding: EdgeInsets.all(3),
-                margin: EdgeInsets.symmetric(horizontal: 3),
-                decoration: BoxDecoration(
-                  color: Color.fromARGB(50, 0, 0, 0),
-                  shape: BoxShape.circle,
-                ),
-                child: Icon(
-                  Icons.close,
-                  color: vWhite,
-                  size: 15,
-                ),
-              ),
-              onTap: widget.onDelete,
-            ),
-          ],
+          color: Color.fromARGB(50, 0, 0, 0),
+          shape: BoxShape.circle,
+        ),
+        child: Icon(
+          Icons.close,
+          color: vWhite,
+          size: 15,
         ),
       ),
     );
diff --git a/lib/pages/list/task_edit.dart b/lib/pages/list/task_edit.dart
index fa20cc3..fb36ec6 100644
--- a/lib/pages/list/task_edit.dart
+++ b/lib/pages/list/task_edit.dart
@@ -229,13 +229,11 @@ class _TaskEditPageState extends State<TaskEditPage> {
                       }).toList(),
                     ),
                   ),
-                  Row(
+                  Wrap(
+                    spacing: 10,
                     children: <Widget>[
                       LabelComponent(
                         label: Label(id: 12134, title: 'Lorem Ipsum'),
-                        onTap: () {
-                          print('tapped');
-                        },
                         onDelete: () {
                           print('deleted');
                         },