diff options
| -rw-r--r-- | FutureForm.ui.qml | 13 | ||||
| -rw-r--r-- | Home.qml | 22 | ||||
| -rw-r--r-- | kelakon.qrc | 5 | ||||
| m--------- | larva | 0 | ||||
| -rw-r--r-- | pages/HomeForm.ui.qml | 77 |
5 files changed, 48 insertions, 69 deletions
diff --git a/FutureForm.ui.qml b/FutureForm.ui.qml new file mode 100644 index 0000000..6f6bc19 --- /dev/null +++ b/FutureForm.ui.qml @@ -0,0 +1,13 @@ +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 + +Page { + title: qsTr("Future task") + + Label { + text: qsTr("You are back to the future.") + anchors.centerIn: parent + } +} @@ -68,6 +68,28 @@ Page { width: window.width * 0.8 height: window.height visible: false + + Column { + anchors.fill: parent + ItemDelegate { + text: qsTr("Today") + width: parent.width + onClicked: { + contentView.pop("HomeForm.ui.qml") + drawer.close() + } + } + + ItemDelegate { + text:qsTr("Future") + width: parent.width + onClicked: { + contentView.push("FutureForm.ui.qml") + drawer.close() + } + + } + } } StackView { diff --git a/kelakon.qrc b/kelakon.qrc index a76c599..d770138 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -41,5 +41,10 @@ <file>larva/features/LoginEmail.qml</file> <file>larva/features/LoginPassword.qml</file> <file>larva/features/Onboarding.qml</file> + <file>larva/features/Home.qml</file> + <file>larva/features/HomeForm.ui.qml</file> + <file>larva/components/icons/menu-24px.svg</file> + <file>Future.qml</file> + <file>FutureForm.ui.qml</file> </qresource> </RCC> diff --git a/larva b/larva -Subproject f1c5203d2b46c7484884d53e61250b7baabe7a7 +Subproject cbd22506b7d0cec453e1a56d72faf07c57ee3a4 diff --git a/pages/HomeForm.ui.qml b/pages/HomeForm.ui.qml index 6c34617..1f92d41 100644 --- a/pages/HomeForm.ui.qml +++ b/pages/HomeForm.ui.qml @@ -3,75 +3,14 @@ import QtQuick.Layouts 1.12 import QtQuick.Controls 2.12 import QtQuick.Controls.Material 2.12 -Rectangle { - id: rectangle - - property alias menuButton: menuButton - property alias toolbar: toolbar - - ToolBar { - id: toolbar - z: 8 - 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: "#FAFFFFFF" - } - - 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 { - id: profileButton - icon.name: "profile-icon" - icon.source: "/assets/profile-24px.svg" - highlighted: true - } - } - } - - RoundButton { - id: roundButton - width: 64 - height: 64 - display: AbstractButton.IconOnly - spacing: 8 - - padding: 16 - anchors.bottom: parent.bottom - anchors.bottomMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 8 - highlighted: true - - icon.name: "add-icon" - icon.source: "/assets/add-24px.svg" +Page { + id: page + title: qsTr("Today") + + Label { + text: qsTr("Load TaskList here") + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter } } |