diff options
| -rw-r--r-- | pages/CreateProfile.qml | 2 | ||||
| -rw-r--r-- | pages/Home.qml | 15 | ||||
| -rw-r--r-- | pages/HomeForm.ui.qml | 206 | ||||
| -rw-r--r-- | pages/TaskList.qml | 6 | ||||
| -rw-r--r-- | pages/TaskListForm.ui.qml | 11 |
5 files changed, 103 insertions, 137 deletions
diff --git a/pages/CreateProfile.qml b/pages/CreateProfile.qml index e4d6f78..048c861 100644 --- a/pages/CreateProfile.qml +++ b/pages/CreateProfile.qml @@ -11,7 +11,7 @@ CreateProfileForm { } skipButton { onClicked: { - stackView.push("qrc:/pages/TaskList.qml") + stackView.push("qrc:/pages/Home.qml") } } } diff --git a/pages/Home.qml b/pages/Home.qml index 7116a43..de25068 100644 --- a/pages/Home.qml +++ b/pages/Home.qml @@ -1,13 +1,12 @@ import QtQuick 2.12 -import id.co.darapsa.kelakon.user 0.1 HomeForm { - width: stackView.width - height: stackView.height + width: stackView.width + height: stackView.height - menuButton { - onClicked: { - drawer.visible = !drawer.visible - } - } + menuButton { + onClicked: { + drawer.visible = !drawer.visible + } + } } diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml index 2fde374..163a20e 100644 --- a/pages/HomeForm.ui.qml +++ b/pages/HomeForm.ui.qml @@ -4,126 +4,88 @@ import QtQuick.Controls 2.12 import QtQuick.Controls.Material 2.12 Rectangle { - id: rectangle - - property alias menuButton: menuButton - property alias taskList: taskList - property alias chevronRight: chevronRight - property alias checkBox: checkBox - - ToolBar { - id: toolbar - height: 56 - font.family: "Google Sans" - anchors.top: parent.top - anchors.topMargin: 0 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - background: Rectangle { - color: "#FFF" - } - - RowLayout { - anchors.fill: parent - spacing: 8 - - ToolButton { - id: menuButton - icon.name: "menu-icon" - icon.source: "/assets/menu-24px.svg" - highlighted: true - } - Label { - id: title - text: qsTr("Today") - font.weight: Font.Medium - wrapMode: Text.WordWrap - color: "#000000" - font.family: "Google Sans" - font.pointSize: 20 - elide: Label.ElideRight - horizontalAlignment: Text.AlignLeft - verticalAlignment: Qt.AlignVCenter - Layout.fillWidth: true - } - ToolButton { - } - } - } - - RowLayout { - id: taskList - height: 72 - anchors.top: toolbar.bottom - anchors.topMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - spacing: 8 - - CheckBox { - id: checkBox - height: 54 - text: qsTr("This is a task title") - padding: 8 - rightPadding: 16 - leftPadding: 16 - bottomPadding: 16 - topPadding: 16 - Layout.fillWidth: true - font.family: "Google Sans" - font.pointSize: 16 - font.weight: Font.Medium - spacing: 24 - } - RoundButton { - id: chevronRight - flat: true - icon.name: "chevron-right-icon" - icon.source: "/assets/chevron-right-24px.svg" - icon.color: "#99000000" - } - } - - RoundButton { - id: roundButton - width: 144 - spacing: 8 - height: 64 - - text: qsTr("New task") - padding: 16 - font.capitalization: Font.MixedCase - font.family: "Google Sans" - font.pointSize: 16 - font.weight: Font.Medium - - rightPadding: 24 - leftPadding: 16 - bottomPadding: 16 - topPadding: 16 - autoExclusive: false - focusPolicy: Qt.NoFocus - anchors.bottom: parent.bottom - anchors.bottomMargin: 16 - anchors.right: parent.right - anchors.rightMargin: 16 - highlighted: true - - icon.name: "add-icon" - icon.source: "/assets/add-24px.svg" - } -} - - - - - - -/*##^## Designer { - D{i:0;autoSize:true;height:480;width:640} + id: rectangle + + property alias menuButton: menuButton + + ToolBar { + id: toolbar + height: 56 + font.family: "Google Sans" + anchors.top: parent.top + anchors.topMargin: 0 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + background: Rectangle { + color: "#FFF" + } + + RowLayout { + anchors.fill: parent + spacing: 8 + + ToolButton { + id: menuButton + icon.name: "menu-icon" + icon.source: "/assets/menu-24px.svg" + highlighted: true + } + Label { + id: title + text: qsTr("Today") + font.weight: Font.Medium + wrapMode: Text.WordWrap + color: "#000000" + font.family: "Google Sans" + font.pointSize: 20 + elide: Label.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Qt.AlignVCenter + Layout.fillWidth: true + } + ToolButton { + } + } + } + + TaskList { + height: 72 + 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: 144 + spacing: 8 + height: 64 + + text: qsTr("New task") + padding: 16 + font.capitalization: Font.MixedCase + font.family: "Google Sans" + font.pointSize: 16 + font.weight: Font.Medium + + rightPadding: 24 + leftPadding: 16 + bottomPadding: 16 + topPadding: 16 + autoExclusive: false + focusPolicy: Qt.NoFocus + anchors.bottom: parent.bottom + anchors.bottomMargin: 16 + anchors.right: parent.right + anchors.rightMargin: 16 + highlighted: true + + icon.name: "add-icon" + icon.source: "/assets/add-24px.svg" + } } - ##^##*/ diff --git a/pages/TaskList.qml b/pages/TaskList.qml index 712eb45..0714a8b 100644 --- a/pages/TaskList.qml +++ b/pages/TaskList.qml @@ -11,11 +11,5 @@ TaskListForm { checkBox.text: subject } - menuButton { - onClicked: { - drawer.visible = !drawer.visible - } - } - ScrollBar.vertical: ScrollBar {} } diff --git a/pages/TaskListForm.ui.qml b/pages/TaskListForm.ui.qml index 5e5734c..1142e96 100644 --- a/pages/TaskListForm.ui.qml +++ b/pages/TaskListForm.ui.qml @@ -4,6 +4,7 @@ import QtQuick.Controls.Material 2.12 import QtQuick.Layouts 1.3 ListView { +<<<<<<< HEAD width: 362 spacing: 12 property alias menuButton: menuButton @@ -84,4 +85,14 @@ ListView { icon.source: "/assets/add-24px.svg" } } +======= + width: 362 + spacing: 12 + + Rectangle { + id: rectangle + anchors.fill: parent + z: -1 + } +>>>>>>> 7331461b29097c08fcdd557461aedb78cfe243d1 } |