diff options
| -rw-r--r-- | LoginForm.ui.qml | 9 | ||||
| -rw-r--r-- | kelakon.qrc | 2 | ||||
| -rw-r--r-- | main.qml | 21 | ||||
| -rw-r--r-- | pages/ExistingLogin.qml | 12 | ||||
| -rw-r--r-- | pages/ExistingLoginForm.ui.qml | 123 | ||||
| -rw-r--r-- | pages/PasswordForm.ui.qml | 30 |
6 files changed, 168 insertions, 29 deletions
diff --git a/LoginForm.ui.qml b/LoginForm.ui.qml index 0406185..6075ffd 100644 --- a/LoginForm.ui.qml +++ b/LoginForm.ui.qml @@ -77,11 +77,11 @@ Rectangle { Image { id: image anchors.top: logotext.bottom - anchors.topMargin: 56 + anchors.topMargin: 48 anchors.right: parent.right - anchors.rightMargin: 16 + anchors.rightMargin: 56 anchors.left: parent.left - anchors.leftMargin: 16 + anchors.leftMargin: 56 anchors.bottom: onboarding_text_1.top anchors.bottomMargin: 16 source: "onboarding-1.png" @@ -107,8 +107,7 @@ Rectangle { - /*##^## Designer { - D{i:4;anchors_width:100;anchors_x:130;anchors_y:69}D{i:5;anchors_height:258;anchors_width:258;anchors_x:51;anchors_y:80} + D{i:5;anchors_height:258;anchors_width:258;anchors_x:51;anchors_y:80} } ##^##*/ diff --git a/kelakon.qrc b/kelakon.qrc index 98784b9..68b5b49 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -11,5 +11,7 @@ <file>pages/Password.qml</file> <file>pages/PasswordForm.ui.qml</file> <file>qtquickcontrols2.conf</file> + <file>pages/ExistingLogin.qml</file> + <file>pages/ExistingLoginForm.ui.qml</file> </qresource> </RCC> @@ -11,27 +11,6 @@ ApplicationWindow { Material.accent: Material.DeepPurple - header: ToolBar { - RowLayout { - anchors.fill: parent - ToolButton { - text: qsTr("‹") - onClicked: stack.pop() - } - Label { - text: "Title" - elide: Label.ElideRight - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - Layout.fillWidth: true - } - ToolButton { - text: qsTr("⋮") - onClicked: menu.open() - } - } - } - StackView { id: stackView anchors.fill : parent diff --git a/pages/ExistingLogin.qml b/pages/ExistingLogin.qml new file mode 100644 index 0000000..6833c6a --- /dev/null +++ b/pages/ExistingLogin.qml @@ -0,0 +1,12 @@ +import QtQuick 2.12 +import id.co.darapsa.kelakon.user 0.1 + +ExistingLoginForm { + width: stackView.width + height: stackView.height + backButton { + onClicked: { + stackView.pop() + } + } +} diff --git a/pages/ExistingLoginForm.ui.qml b/pages/ExistingLoginForm.ui.qml new file mode 100644 index 0000000..9cbc5f4 --- /dev/null +++ b/pages/ExistingLoginForm.ui.qml @@ -0,0 +1,123 @@ +import QtQuick 2.12 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 + +Rectangle { + id: rectangle + color: "#fff" + border.width: 0 + + property alias backButton: backButton + property alias passTextField: passTextField + property alias createPassButton: loginButton + + Rectangle { + id: appBar + height: 56 + color: "#ffffff" + anchors.top: parent.top + anchors.topMargin: 0 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + + RoundButton { + id: backButton + flat: true + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + display: AbstractButton.IconOnly + icon.name: "back-icon" + icon.source: "/assets/arrow-back-24px.svg" + icon.color: "transparent" + } + } + + Label { + x: 16 + y: 232 + color: "#2b2626" + text: qsTr("Welcome Back!") + anchors.bottom: userEmail.top + anchors.bottomMargin: 16 + font.letterSpacing: 0.25 + lineHeight: 1 + font.weight: Font.Bold + wrapMode: Text.WordWrap + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.right: parent.right + anchors.rightMargin: 88 + + font.family: "Google Sans" + font.pointSize: 34 + } + + Rectangle { + id: userEmail + height: 48 + anchors.right: parent.right + anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.bottom: passTextField.top + anchors.bottomMargin: 16 + + Label { + anchors.right: parent.right + anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.verticalCenter: parent.verticalCenter + + text: qsTr("your@email.com") + font.family: "Google Sans" + font.pointSize: 16 + color: "#99000000" + } + } + + TextField { + id: passTextField + y: 501 + font.pointSize: 16 + anchors.bottom: createPassButton.top + anchors.bottomMargin: 16 + font.family: "Google Sans" + Layout.fillWidth: true + placeholderText: qsTr("Password") + anchors.right: parent.right + anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 + Layout.maximumHeight: 56 + echoMode: TextInput.Password + } + + RoundButton { + id: loginButton + x: 34 + y: 278 + text: qsTr("Login") + font.family: "Google Sans" + font.capitalization: Font.MixedCase + anchors.right: parent.right + anchors.rightMargin: 8 + anchors.bottom: parent.bottom + anchors.bottomMargin: 8 + anchors.left: parent.left + anchors.leftMargin: 8 + highlighted: true + Material.background: Material.primary + } +} + + + + +/*##^## Designer { + D{i:0;autoSize:true;height:480;width:640} +} + ##^##*/ diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml index 96efb37..98c90a2 100644 --- a/pages/PasswordForm.ui.qml +++ b/pages/PasswordForm.ui.qml @@ -37,15 +37,15 @@ Rectangle { Label { x: 16 - y: 398 + y: 232 color: "#2b2626" text: qsTr("Create password") + anchors.bottom: userEmail.top + anchors.bottomMargin: 16 font.letterSpacing: 0.25 lineHeight: 1 font.weight: Font.Bold wrapMode: Text.WordWrap - anchors.bottom: passTextField.top - anchors.bottomMargin: 16 anchors.left: parent.left anchors.leftMargin: 16 anchors.right: parent.right @@ -55,6 +55,30 @@ Rectangle { font.pointSize: 34 } + Rectangle { + id: userEmail + height: 48 + anchors.right: parent.right + anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.bottom: passTextField.top + anchors.bottomMargin: 16 + + Label { + anchors.right: parent.right + anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.verticalCenter: parent.verticalCenter + + text: qsTr("your@email.com") + font.family: "Google Sans" + font.pointSize: 16 + color: "#99000000" + } + } + TextField { id: passTextField y: 501 |