summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2019-09-19 22:31:01 +0800
committerꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2019-09-19 22:31:01 +0800
commit12255d2fc81bb43fd01a941cd015ef17adfa0f7f (patch)
treeefca3cb812e6a1affdacad2494ea8222b76e1397
parentb7baeea2ab0f999a755226b79242f78a472d5a80 (diff)
Make HomeForm UI independent from implementation-dependent TaskList
-rw-r--r--Home.qml4
-rw-r--r--TaskList.qml (renamed from pages/TaskList.qml)1
-rw-r--r--kelakon.qrc4
-rw-r--r--pages/HomeForm.ui.qml11
-rw-r--r--pages/TaskListForm.ui.qml21
5 files changed, 21 insertions, 20 deletions
diff --git a/Home.qml b/Home.qml
index 99448d2..27f1fd0 100644
--- a/Home.qml
+++ b/Home.qml
@@ -3,4 +3,8 @@ import "pages"
HomeForm {
menuButton.onClicked: drawer.visible = !drawer.visible
+
+ TaskList {
+ anchors.top: toolbar.bottom
+ }
}
diff --git a/pages/TaskList.qml b/TaskList.qml
index 07a10ba..042fcad 100644
--- a/pages/TaskList.qml
+++ b/TaskList.qml
@@ -1,5 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
+import "pages"
TaskListForm {
objectName: "taskList"
diff --git a/kelakon.qrc b/kelakon.qrc
index e216def..667ac33 100644
--- a/kelakon.qrc
+++ b/kelakon.qrc
@@ -24,9 +24,9 @@
<file>pages/CreateProfileForm.ui.qml</file>
<file>Home.qml</file>
<file>pages/HomeForm.ui.qml</file>
- <file>pages/TaskForm.ui.qml</file>
- <file>pages/TaskList.qml</file>
+ <file>TaskList.qml</file>
<file>pages/TaskListForm.ui.qml</file>
+ <file>pages/TaskForm.ui.qml</file>
<file>assets/photo_camera_24px.svg</file>
<file>assets/menu-24px.svg</file>
<file>assets/check-box-outline-24px.svg</file>
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/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
+ }
}