From f7044604ac66a6ee1986d93183645aec566f628f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 24 Sep 2019 16:02:41 +0800 Subject: Task related forms from Kelakon --- features/DayListForm.ui.qml | 18 ++++++++++ features/HomeForm.ui.qml | 47 +++++++++++++++++++++---- features/TaskForm.ui.qml | 83 ++++++++++++++++++++++++++++++++++++++++++++ features/TaskListForm.ui.qml | 46 ++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 features/DayListForm.ui.qml create mode 100644 features/TaskForm.ui.qml create mode 100644 features/TaskListForm.ui.qml diff --git a/features/DayListForm.ui.qml b/features/DayListForm.ui.qml new file mode 100644 index 0000000..1b4c937 --- /dev/null +++ b/features/DayListForm.ui.qml @@ -0,0 +1,18 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +Column { + property alias todayItemDelegate: todayItemDelegate + property alias futureItemDelegate: futureItemDelegate + + anchors.fill: parent + ItemDelegate { + id: todayItemDelegate + width: parent.width + } + + ItemDelegate { + id: futureItemDelegate + width: parent.width + } +} diff --git a/features/HomeForm.ui.qml b/features/HomeForm.ui.qml index 8119e9e..c44aac5 100644 --- a/features/HomeForm.ui.qml +++ b/features/HomeForm.ui.qml @@ -1,16 +1,49 @@ import QtQuick 2.12 -import QtQuick.Layouts 1.12 import QtQuick.Controls 2.12 import QtQuick.Controls.Material 2.12 +import QtQuick.Layouts 1.12 Page { - id: page - title: qsTr("Today") + property alias menuButton: menuButton + property alias titleLabel: titleLabel + property alias profileButton: profileButton + property alias contentView: contentView + + header: ToolBar { + background: Rectangle { + color: "#FAFFFFFF" + } + RowLayout { + anchors.fill: parent + spacing: 0 + ToolButton { + id: menuButton + icon.name: "menu-button" + highlighted: true + } + Label { + id: titleLabel + Layout.leftMargin: 16 + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignLeft + wrapMode: Text.WordWrap + font.family: "Work Sans" + font.weight: Font.Medium + font.pointSize: 20 + color: "#000000" + Layout.fillWidth: true + } + ToolButton { + id: profileButton + icon.name: "profile-button" + highlighted: true + } + } + } - Label { - text: qsTr("Load `contentView` here") - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + StackView { + id: contentView + anchors.fill: parent } } diff --git a/features/TaskForm.ui.qml b/features/TaskForm.ui.qml new file mode 100644 index 0000000..57cfbce --- /dev/null +++ b/features/TaskForm.ui.qml @@ -0,0 +1,83 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 + +GridLayout { + property alias task: task + property alias taskTitle: taskTitle + property alias itemDelegate: itemDelegate + + id: task + height: 72 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + + ItemDelegate { + id: itemDelegate + Layout.fillWidth: parent.width + Layout.fillHeight: parent.height + GridLayout { + + anchors.fill: parent + CheckBox { + Layout.leftMargin: 4 + display: AbstractButton.IconOnly + } + ColumnLayout { + Layout.leftMargin: 14 + spacing: 0 + Layout.fillWidth: true + Layout.fillHeight: true + + Text { + id: taskTitle + text: qsTr("Task title") + Layout.rightMargin: 16 + elide: Text.ElideRight + Layout.columnSpan: 0 + Layout.rowSpan: 0 + verticalAlignment: Text.AlignVCenter + Layout.topMargin: 0 + font.weight: Font.Medium + font.family: "Work Sans" + font.pixelSize: 16 + Layout.fillWidth: true + } + Text { + text: qsTr("Truncated task description") + Layout.rightMargin: 16 + font.pixelSize: 14 + Layout.topMargin: 4 + Layout.columnSpan: 0 + Layout.rowSpan: 0 + verticalAlignment: Text.AlignVCenter + Layout.bottomMargin: 0 + color: "#b3000000" + Layout.fillWidth: true + elide: Text.ElideRight + } + Text { + id: taskTimestamp + color: "#8a000000" + text: qsTr("DD/MM/YYYY") + topPadding: 4 + font.pixelSize: 12 + font.family: "Work Sans" + } + } + Image { + id: chevronRight + Layout.minimumHeight: 24 + Layout.minimumWidth: 24 + Layout.rightMargin: 12 + opacity: 0.54 + sourceSize.height: 24 + sourceSize.width: 24 + Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + source: "/assets/chevron-right-24px.svg" + } + } + } +} diff --git a/features/TaskListForm.ui.qml b/features/TaskListForm.ui.qml new file mode 100644 index 0000000..0016bb8 --- /dev/null +++ b/features/TaskListForm.ui.qml @@ -0,0 +1,46 @@ +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Layouts 1.12 + +Page { + id: page + property alias listView: listView + + 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: 12 + + Rectangle { + id: rectangle + anchors.fill: parent + z: -1 + } + + ScrollBar.vertical: ScrollBar {} + } + RoundButton { + anchors.bottom: parent.bottom + anchors.bottomMargin: 8 + anchors.right: parent.right + anchors.rightMargin: 8 + highlighted: true + icon.source: "../assets/add-24px.svg" + height: 64 + width: 64 + } +} + +/*##^## +Designer { + D{i:0;autoSize:true;height:480;width:640} +} +##^##*/ + -- cgit v1.2.3