diff options
| -rw-r--r-- | Home.qml | 2 | ||||
| -rw-r--r-- | TaskList.qml | 2 | ||||
| -rw-r--r-- | forms/DayListForm.ui.qml | 18 | ||||
| -rw-r--r-- | forms/HomeForm.ui.qml | 55 | ||||
| -rw-r--r-- | forms/TaskForm.ui.qml | 83 | ||||
| -rw-r--r-- | forms/TaskListForm.ui.qml | 46 | ||||
| -rw-r--r-- | kelakon.qrc | 9 | ||||
| m--------- | larva | 0 |
8 files changed, 6 insertions, 209 deletions
@@ -1,6 +1,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import "forms" +import "larva/features" HomeForm { menuButton { diff --git a/TaskList.qml b/TaskList.qml index 6507ac3..ab92327 100644 --- a/TaskList.qml +++ b/TaskList.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "forms" +import "larva/features" TaskListForm { listView { diff --git a/forms/DayListForm.ui.qml b/forms/DayListForm.ui.qml deleted file mode 100644 index 1b4c937..0000000 --- a/forms/DayListForm.ui.qml +++ /dev/null @@ -1,18 +0,0 @@ -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/forms/HomeForm.ui.qml b/forms/HomeForm.ui.qml deleted file mode 100644 index c44aac5..0000000 --- a/forms/HomeForm.ui.qml +++ /dev/null @@ -1,55 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 - -Page { - 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 - } - } - } - - StackView { - id: contentView - anchors.fill: parent - } -} - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ - diff --git a/forms/TaskForm.ui.qml b/forms/TaskForm.ui.qml deleted file mode 100644 index 57cfbce..0000000 --- a/forms/TaskForm.ui.qml +++ /dev/null @@ -1,83 +0,0 @@ -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/forms/TaskListForm.ui.qml b/forms/TaskListForm.ui.qml deleted file mode 100644 index 0016bb8..0000000 --- a/forms/TaskListForm.ui.qml +++ /dev/null @@ -1,46 +0,0 @@ -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} -} -##^##*/ - diff --git a/kelakon.qrc b/kelakon.qrc index 3757956..d36e0d8 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -19,12 +19,12 @@ <file>CreateProfile.qml</file> <file>pages/CreateProfileForm.ui.qml</file> <file>Home.qml</file> - <file>forms/HomeForm.ui.qml</file> - <file>forms/DayListForm.ui.qml</file> + <file>larva/features/HomeForm.ui.qml</file> + <file>larva/features/DayListForm.ui.qml</file> <file>TaskList.qml</file> <file>TaskDetails.qml</file> - <file>forms/TaskListForm.ui.qml</file> - <file>forms/TaskForm.ui.qml</file> + <file>larva/features/TaskListForm.ui.qml</file> + <file>larva/features/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> @@ -34,7 +34,6 @@ <file>assets/user-24px.svg</file> <file>qtquickcontrols2.conf</file> <file>larva/features/EnterPasswordForm.ui.qml</file> - <file>larva/features/HomeForm.ui.qml</file> <file>assets/arrow-back-24px.svg</file> <file>onboarding-1.png</file> <file>larva/features/ProfileForm.ui.qml</file> diff --git a/larva b/larva -Subproject 4a682d953c2352107fee6d3dec8de324207351f +Subproject 372de3c1c8fb8d7be23713d51c1d4c926b7fcb1 |