Make HomeForm UI independent from implementation-dependent TaskList

3 files changed, 14 insertions, 31 deletions

diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml
index c0c95f2..6c34617 100644
--- a/pages/HomeForm.ui.qml
+++ b/pages/HomeForm.ui.qml
@@ -7,6 +7,7 @@ Rectangle {
     id: rectangle
 
     property alias menuButton: menuButton
+    property alias toolbar: toolbar
 
     ToolBar {
         id: toolbar
@@ -55,16 +56,6 @@ Rectangle {
         }
     }
 
-    TaskList {
-        height: parent.height
-        anchors.top: toolbar.bottom
-        anchors.topMargin: 8
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-    }
-
     RoundButton {
         id: roundButton
         width: 64
diff --git a/pages/TaskList.qml b/pages/TaskList.qml
deleted file mode 100644
index 07a10ba..0000000
--- a/pages/TaskList.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-
-TaskListForm {
-	objectName: "taskList"
-	model: taskList
-	delegate: TaskForm {
-		width: parent.width
-		height: task.height
-		checkBox.text: subject
-	}
-	ScrollBar.vertical: ScrollBar {}
-}
diff --git a/pages/TaskListForm.ui.qml b/pages/TaskListForm.ui.qml
index 3dfd6cc..87f1b1c 100644
--- a/pages/TaskListForm.ui.qml
+++ b/pages/TaskListForm.ui.qml
@@ -1,15 +1,20 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.12
 
 ListView {
-    width: 362
-    spacing: 12
+	width: 362
+	height: parent.height
+	anchors.topMargin: 8
+	anchors.right: parent.right
+	anchors.rightMargin: 0
+	anchors.left: parent.left
+	anchors.leftMargin: 0
+	spacing: 12
 
-    Rectangle {
-        id: rectangle
-        anchors.fill: parent
-        z: -1
-    }
+	Rectangle {
+		id: rectangle
+		anchors.fill: parent
+		z: -1
+	}
 }