Move StackView and TaskBrief back here

with ListView taking TaskHistory's place

1 files changed, 46 insertions, 13 deletions

diff --git a/features/TaskDetailForm.ui.qml b/features/TaskDetailForm.ui.qml
index dc01776..dc8b346 100644
--- a/features/TaskDetailForm.ui.qml
+++ b/features/TaskDetailForm.ui.qml
@@ -8,6 +8,8 @@ Page {
     title: qsTr("Task detail page")
 
     property alias backButton: backButton
+    property alias listView: listView
+    property alias ticketBriefForm: ticketBriefForm
 
     header: ToolBar {
         background: Rectangle {
@@ -32,19 +34,50 @@ Page {
             }
         }
     }
-    ListView {
-        id: listView
-        width: parent.width
-        height: parent.height
-        anchors.topMargin: 8
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        spacing: 8
-
-        ScrollBar.vertical: ScrollBar {}
-    }
+	StackView {
+		id: contentView
+		anchors.fill: parent
+		background: Rectangle {
+			color: "#FFFFFF"
+		}
+
+		TaskBriefForm {
+			id: ticketBriefForm
+			anchors.top: parent.top
+			anchors.topMargin: 0
+			anchors.right: parent.right
+			anchors.rightMargin: 0
+			anchors.left: parent.left
+			anchors.leftMargin: 0
+		}
+
+		Label {
+			id: separator
+			color: "#000000"
+			text: qsTr("Activities")
+			font.weight: Font.Medium
+			font.pixelSize: 16
+			font.family: "Work Sans"
+			anchors.left: parent.left
+			anchors.leftMargin: 16
+			anchors.top: ticketBriefForm.bottom
+			anchors.topMargin: 8
+		}
+
+		ListView {
+			id: listView
+			width: parent.width
+			height: parent.height
+			anchors.topMargin: 8
+			anchors.right: parent.right
+			anchors.rightMargin: 0
+			anchors.left: parent.left
+			anchors.leftMargin: 0
+			spacing: 8
+
+			ScrollBar.vertical: ScrollBar {}
+		}
+	}
 }
 
 /*##^##