From 13df4883c897a1fc0386d1601762054dbecfde3f 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 19:09:04 +0800 Subject: Reuse path --- controller.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/controller.cxx b/controller.cxx index d007855..8447242 100644 --- a/controller.cxx +++ b/controller.cxx @@ -10,13 +10,11 @@ Controller::Controller(QObject* parent) : QObject{parent} { #ifdef ANDROID + QDir location{QStandardPaths::writableLocation + (QStandardPaths::AppDataLocation)}; + QString path{location.absolutePath() % "/ca-certificates.crt"}; QFile file{"assets:/certs/ca-certificates.crt"}; - file.copy(QDir{QStandardPaths::writableLocation - (QStandardPaths::AppDataLocation)}.absolutePath() - % "/ca-certificates.crt"); - auto path = QDir{QStandardPaths::writableLocation - (QStandardPaths::AppDataLocation)}.absolutePath() - % "/ca-certificates.crt"; + file.copy(path); auto client = new RTClient::Client{"https://darapsa.co.id/rt" , path.toLatin1().constData()}; #else -- cgit v1.2.3 From 7ed328595cb95c94d70c426953cb5d77ecb512fa 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 19:14:03 +0800 Subject: Update qrtclient --- qrtclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrtclient b/qrtclient index 1897791..ddeb4c5 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit 18977911a7645333c1887bfbbee96520226b3989 +Subproject commit ddeb4c5f70dba8644d75a084335b787b642f449e -- cgit v1.2.3 From f1251b08ee37f44998d5a20e7bfcce5e9c9e1cb5 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 22:05:32 +0800 Subject: All forms and icons are moved to Larva --- ConfirmPassword.qml | 9 +- CreateProfile.qml | 13 +-- Email.qml | 9 +- ExistingLogin.qml | 8 ++ Home.qml | 13 +-- Login.qml | 36 ++----- LoginEmail.qml | 5 +- LoginPassword.qml | 5 +- Onboarding.qml | 1 + Password.qml | 9 +- Profile.qml | 2 +- Username.qml | 4 + assets/add-24px.svg | 1 - assets/arrow-back-24px.svg | 1 - assets/arrow-forward-24px.svg | 1 - assets/check-box-outline-24px.svg | 1 - assets/chevron-right-24px.svg | 1 - assets/close-24px.svg | 1 - assets/email-24px.svg | 1 - assets/lock-24px.svg | 1 - assets/menu-24px.svg | 1 - assets/photo_camera_24px.svg | 1 - assets/profile-24px.svg | 1 - assets/user-24px.svg | 15 --- kelakon.pro | 5 +- kelakon.qrc | 61 ++++------- larva | 2 +- larva.qrc | 19 ++++ main.qml | 4 +- pages/CreateProfileForm.ui.qml | 212 -------------------------------------- pages/EmailForm.ui.qml | 125 ---------------------- pages/ExistingLogin.qml | 8 -- pages/ExistingLoginForm.ui.qml | 128 ----------------------- pages/PasswordForm.ui.qml | 161 ----------------------------- pages/Username.qml | 4 - pages/UsernameForm.ui.qml | 35 ------- 36 files changed, 79 insertions(+), 825 deletions(-) create mode 100644 ExistingLogin.qml create mode 100644 Username.qml delete mode 100644 assets/add-24px.svg delete mode 100644 assets/arrow-back-24px.svg delete mode 100644 assets/arrow-forward-24px.svg delete mode 100644 assets/check-box-outline-24px.svg delete mode 100644 assets/chevron-right-24px.svg delete mode 100644 assets/close-24px.svg delete mode 100644 assets/email-24px.svg delete mode 100644 assets/lock-24px.svg delete mode 100644 assets/menu-24px.svg delete mode 100644 assets/photo_camera_24px.svg delete mode 100644 assets/profile-24px.svg delete mode 100644 assets/user-24px.svg create mode 100644 larva.qrc delete mode 100644 pages/CreateProfileForm.ui.qml delete mode 100644 pages/EmailForm.ui.qml delete mode 100644 pages/ExistingLogin.qml delete mode 100644 pages/ExistingLoginForm.ui.qml delete mode 100644 pages/PasswordForm.ui.qml delete mode 100644 pages/Username.qml delete mode 100644 pages/UsernameForm.ui.qml diff --git a/ConfirmPassword.qml b/ConfirmPassword.qml index 58e2173..e70922e 100644 --- a/ConfirmPassword.qml +++ b/ConfirmPassword.qml @@ -1,15 +1,10 @@ import QtQuick 2.12 import KelakonUser 0.1 -import "pages" +import "larva/features" PasswordForm { - backButton { - icon.source: "../assets/arrow-back-24px.svg" - onClicked: pageView.pop() - } - + backButton.onClicked: pageView.pop() userEmail.y: 292 - passImage.source: "../assets/lock-24px.svg" instructionLabel.text: qsTr("Re-Enter password") emailAddressLabel.text: User.name diff --git a/CreateProfile.qml b/CreateProfile.qml index 91ce39c..2a22a4b 100644 --- a/CreateProfile.qml +++ b/CreateProfile.qml @@ -1,20 +1,15 @@ import QtQuick 2.12 import KelakonUser 0.1 -import "pages" +import "larva/features" CreateProfileForm { - backButton { - icon.source: "../assets/arrow-back-24px.svg" - onClicked: pageView.pop() - } - + backButton.onClicked: pageView.pop() skipButton.onClicked: pageView.push("Home.qml") - emailImage.source: "../assets/email-24px.svg" emailAddressLabel.text: User.emailAddress startUsingKelakon.onClicked: { User.name = userNameLabel.text User.realName = enterFullName.text - onboarding.ticketNew("Kelakon", User.realName + " <" + User.emailAddress - + ">") + onboarding.ticketNew("Kelakon", User.realName + " <" + + User.emailAddress + ">") } } diff --git a/Email.qml b/Email.qml index a1951fe..d0d3d80 100644 --- a/Email.qml +++ b/Email.qml @@ -1,14 +1,9 @@ import QtQuick 2.12 import KelakonUser 0.1 -import "pages" +import "larva/features" EmailForm { - backButton { - icon.source: "assets/arrow-back-24px.svg" - onClicked: pageView.pop() - } - - emailImage.source: "assets/email-24px.svg" + backButton.onClicked: pageView.pop() emailTextField.onTextChanged: { if (!emailTextField.text || !loginButton.enabled) diff --git a/ExistingLogin.qml b/ExistingLogin.qml new file mode 100644 index 0000000..8e78a09 --- /dev/null +++ b/ExistingLogin.qml @@ -0,0 +1,8 @@ +import QtQuick 2.12 +import KelakonUser 0.1 + +ExistingLoginForm { + width: stackView.width + height: stackView.height + backButton.onClicked: stackView.pop() +} diff --git a/Home.qml b/Home.qml index 369a908..3c670cc 100644 --- a/Home.qml +++ b/Home.qml @@ -3,17 +3,8 @@ import QtQuick.Controls 2.12 import "larva/features" HomeForm { - menuButton { - icon.source: "assets/menu-24px.svg" - onClicked: drawer.open() - } - - titleLabel.text: contentView.currentItem.title - - profileButton { - icon.source: "assets/profile-24px.svg" - onClicked: pageView.push("Profile.qml") - } + menuButton.onClicked: drawer.open() + profileButton.onClicked: pageView.push("Profile.qml") Drawer { id: drawer diff --git a/Login.qml b/Login.qml index 2f0f1c8..bcbbf50 100644 --- a/Login.qml +++ b/Login.qml @@ -1,32 +1,12 @@ import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 +import "larva/features" -Page { - header: ToolBar { - background: Rectangle { - color: "#FAFFFFFF" - } - RowLayout { - ToolButton { - id: toolButton - icon.name: "back-button" - icon.source: "assets/arrow-back-24px.svg" - highlighted: true - onClicked: - if (pageView.depth > 1) - pageView.pop() - else - drawer.open() - } - } - } +LoginForm { + toolButton.onClicked: + if (pageView.depth > 1) + pageView.pop() + else + drawer.open() - StackView { - id: contentView - anchors.topMargin: 432 - anchors.fill: parent - initialItem: LoginEmail{} - } + contentView.initialItem: LoginEmail{} } diff --git a/LoginEmail.qml b/LoginEmail.qml index d699e19..67d45f4 100644 --- a/LoginEmail.qml +++ b/LoginEmail.qml @@ -8,11 +8,8 @@ LoginEmailForm { continueButton.enabled = !continueButton.enabled } - continueButton { - icon.source: "assets/arrow-forward-24px.svg" - onClicked: { + continueButton.onClicked: { User.name = emailTextField.text contentView.push("LoginPassword.qml") } - } } diff --git a/LoginPassword.qml b/LoginPassword.qml index d2e8064..2d8bbba 100644 --- a/LoginPassword.qml +++ b/LoginPassword.qml @@ -8,11 +8,8 @@ LoginPasswordForm { if (!passwordTextField.text || !continueButton.enabled) continueButton.enabled = !continueButton.enabled - continueButton { - icon.source: "assets/arrow-forward-24px.svg" - onClicked: { + continueButton.onClicked: { User.password = passwordTextField.text onboarding.logIn(User.name, User.password) } - } } diff --git a/Onboarding.qml b/Onboarding.qml index 9e54625..6b9bcf7 100644 --- a/Onboarding.qml +++ b/Onboarding.qml @@ -10,6 +10,7 @@ OnboardingForm { objectName: "onboarding" logoImage.source: "kelakon-logo.png" + onboardingImage.source: "onboarding-1.png" registerButton.onClicked: pageView.push("Email.qml") loginButton.onClicked: pageView.push("Login.qml") } diff --git a/Password.qml b/Password.qml index d2a5626..7368cac 100644 --- a/Password.qml +++ b/Password.qml @@ -1,14 +1,9 @@ import QtQuick 2.12 import KelakonUser 0.1 -import "pages" +import "larva/features" PasswordForm { - backButton { - icon.source: "assets/arrow-back-24px.svg" - onClicked: pageView.pop() - } - - passImage.source: "assets/lock-24px.svg" + backButton.onClicked: pageView.pop() emailAddressLabel.text: User.name passTextField.onTextChanged: { diff --git a/Profile.qml b/Profile.qml index 04f7cf0..02d8713 100644 --- a/Profile.qml +++ b/Profile.qml @@ -15,7 +15,7 @@ Page { ToolButton { id: backButton icon.name: "back-button" - icon.source: "assets/arrow-back-24px.svg" + icon.source: "/components/icons/arrow-back-24px.svg" highlighted: true onClicked: { pageView.pop() diff --git a/Username.qml b/Username.qml new file mode 100644 index 0000000..c523226 --- /dev/null +++ b/Username.qml @@ -0,0 +1,4 @@ +import QtQuick 2.4 + +UsernameForm { +} diff --git a/assets/add-24px.svg b/assets/add-24px.svg deleted file mode 100644 index ff2ae4c..0000000 --- a/assets/add-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/arrow-back-24px.svg b/assets/arrow-back-24px.svg deleted file mode 100644 index 9d5f05f..0000000 --- a/assets/arrow-back-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/arrow-forward-24px.svg b/assets/arrow-forward-24px.svg deleted file mode 100644 index 842e7d0..0000000 --- a/assets/arrow-forward-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/check-box-outline-24px.svg b/assets/check-box-outline-24px.svg deleted file mode 100644 index 68d3447..0000000 --- a/assets/check-box-outline-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/chevron-right-24px.svg b/assets/chevron-right-24px.svg deleted file mode 100644 index acabc29..0000000 --- a/assets/chevron-right-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/close-24px.svg b/assets/close-24px.svg deleted file mode 100644 index 0fd6b0d..0000000 --- a/assets/close-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/email-24px.svg b/assets/email-24px.svg deleted file mode 100644 index 1ed4686..0000000 --- a/assets/email-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/lock-24px.svg b/assets/lock-24px.svg deleted file mode 100644 index 1dbceea..0000000 --- a/assets/lock-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/menu-24px.svg b/assets/menu-24px.svg deleted file mode 100644 index 770b192..0000000 --- a/assets/menu-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/photo_camera_24px.svg b/assets/photo_camera_24px.svg deleted file mode 100644 index 5a9866b..0000000 --- a/assets/photo_camera_24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/profile-24px.svg b/assets/profile-24px.svg deleted file mode 100644 index beed9cb..0000000 --- a/assets/profile-24px.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/user-24px.svg b/assets/user-24px.svg deleted file mode 100644 index 3eff6de..0000000 --- a/assets/user-24px.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - username-24 - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/kelakon.pro b/kelakon.pro index 97b543a..bfb2a51 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -6,7 +6,10 @@ SOURCES += \ controller.cxx \ main.cxx -RESOURCES += kelakon.qrc +RESOURCES += \ + kelakon.qrc \ + larva.qrc \ + larva/material-design-icons.qrc INCLUDEPATH += \ $$PWD/qrtclient \ diff --git a/kelakon.qrc b/kelakon.qrc index d36e0d8..2ff8636 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -1,45 +1,20 @@ - - main.qml - Onboarding.qml - larva/features/OnboardingForm.ui.qml - kelakon-logo.png - Login.qml - LoginEmail.qml - larva/features/LoginEmailForm.ui.qml - assets/arrow-forward-24px.svg - LoginPassword.qml - larva/features/LoginPasswordForm.ui.qml - Profile.qml - Email.qml - pages/EmailForm.ui.qml - Password.qml - pages/PasswordForm.ui.qml - ConfirmPassword.qml - CreateProfile.qml - pages/CreateProfileForm.ui.qml - Home.qml - larva/features/HomeForm.ui.qml - larva/features/DayListForm.ui.qml - TaskList.qml - TaskDetails.qml - larva/features/TaskListForm.ui.qml - larva/features/TaskForm.ui.qml - assets/photo_camera_24px.svg - assets/menu-24px.svg - assets/check-box-outline-24px.svg - assets/chevron-right-24px.svg - assets/add-24px.svg - assets/profile-24px.svg - assets/user-24px.svg - qtquickcontrols2.conf - larva/features/EnterPasswordForm.ui.qml - assets/arrow-back-24px.svg - onboarding-1.png - larva/features/ProfileForm.ui.qml - assets/email-24px.svg - assets/lock-24px.svg - larva/features/ProfileEditForm.ui.qml - larva/features/TaskDetailForm.ui.qml - + + main.qml + Onboarding.qml + Login.qml + LoginEmail.qml + LoginPassword.qml + Home.qml + TaskList.qml + TaskDetails.qml + Profile.qml + Email.qml + Password.qml + ConfirmPassword.qml + CreateProfile.qml + qtquickcontrols2.conf + kelakon-logo.png + onboarding-1.png + diff --git a/larva b/larva index 372de3c..e5d1cb6 160000 --- a/larva +++ b/larva @@ -1 +1 @@ -Subproject commit 372de3c1c8fb8d7be23713d51c1d4c926b7fcb10 +Subproject commit e5d1cb6db260c71e2205c4f65d383628bb518f5e diff --git a/larva.qrc b/larva.qrc new file mode 100644 index 0000000..7fc08fc --- /dev/null +++ b/larva.qrc @@ -0,0 +1,19 @@ + + + larva/features/OnboardingForm.ui.qml + larva/features/LoginForm.ui.qml + larva/features/LoginEmailForm.ui.qml + larva/features/LoginPasswordForm.ui.qml + larva/features/HomeForm.ui.qml + larva/features/DayListForm.ui.qml + larva/features/TaskListForm.ui.qml + larva/features/TaskForm.ui.qml + larva/features/EnterPasswordForm.ui.qml + larva/features/ProfileForm.ui.qml + larva/features/ProfileEditForm.ui.qml + larva/features/TaskDetailForm.ui.qml + larva/features/EmailForm.ui.qml + larva/features/PasswordForm.ui.qml + larva/features/CreateProfileForm.ui.qml + + diff --git a/main.qml b/main.qml index 05f372b..eb0f23f 100644 --- a/main.qml +++ b/main.qml @@ -18,9 +18,7 @@ ApplicationWindow { anchors.fill: parent initialItem: Onboarding { id: onboarding - logoImage.source: ("../kelakon-logo.png") - onboardingImage.source: ("../onboarding-1.png") - onboardingText1.text: qsTr("Get things done today, chill tomorrow.") + onboardingText1.text: qsTr("Get things done today, chill tomorrow.") } } } diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml deleted file mode 100644 index 2eec4d7..0000000 --- a/pages/CreateProfileForm.ui.qml +++ /dev/null @@ -1,212 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 - -Rectangle { - id: rectangle - color: "#fff" - - property alias backButton: backButton - property alias titleLabel: titleLabel - property alias skipButton: skipButton - property alias enterFullName: enterFullName - property alias userNameLabel: userNameLabel - property alias emailImage: emailImage - property alias emailAddressLabel: emailAddressLabel - property alias startUsingKelakon: startUsingKelakon - - 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: backButton - icon.name: "back-icon" - icon.source: "/assets/arrow-back-24px.svg" - highlighted: true - } - Label { - id: titleLabel - text: qsTr("Create Profile") - font.weight: Font.Medium - wrapMode: Text.WordWrap - color: "#000" - font.family: "Google Sans" - font.pointSize: 20 - elide: Label.ElideRight - horizontalAlignment: Qt.AlignHCenter - verticalAlignment: Qt.AlignVCenter - Layout.fillWidth: true - } - ToolButton { - id: skipButton - text: qsTr("Skip") - font.weight: Font.Medium - display: AbstractButton.TextOnly - font.family: "Google Sans" - font.pointSize: 14 - font.capitalization: Font.MixedCase - highlighted: true - } - } - } - RowLayout { - id: userEmail - height: 56 - anchors.topMargin: 16 - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: usernameRowLayout.bottom - width: parent.width - spacing: 8 - - Image { - id: emailImage - width: 24 - height: 24 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.leftMargin: 16 - Layout.alignment: Qt.AlignVCenter - fillMode: Image.PreserveAspectFit - source: "../assets/email-24px.svg" - antialiasing: true - } - - Label { - id: emailAddressLabel - Layout.fillWidth: true - text: qsTr("Your@email.com") - Layout.rightMargin: 16 - Layout.leftMargin: 24 - verticalAlignment: Text.AlignVCenter - font.family: "Google Sans" - font.pointSize: 16 - color: "#99000000" - } - } - RowLayout { - id: fullnameRowLayout - height: 56 - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: profilePicture.bottom - anchors.topMargin: 32 - width: parent.width - Image { - width: 24 - height: 24 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.leftMargin: 16 - Layout.alignment: Qt.AlignVCenter - fillMode: Image.PreserveAspectFit - source: "../assets/profile-24px.svg" - antialiasing: true - } - - TextField { - id: enterFullName - Layout.rightMargin: 16 - Layout.leftMargin: 24 - font.pointSize: 16 - font.family: "Google Sans" - Layout.fillWidth: true - placeholderText: qsTr("Full name") - Layout.alignment: Qt.AlignVCenter - } - } - RowLayout { - id: usernameRowLayout - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - height: 56 - Layout.alignment: Qt.AlignVCenter - anchors.top: fullnameRowLayout.bottom - anchors.topMargin: 16 - - Image { - width: 24 - height: 24 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.leftMargin: 16 - Layout.alignment: Qt.AlignVCenter - fillMode: Image.PreserveAspectFit - source: "../assets/user-24px.svg" - antialiasing: true - } - - TextField { - id: userNameLabel - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.rightMargin: 16 - Layout.leftMargin: 24 - font.pointSize: 16 - font.family: "Google Sans" - Layout.fillWidth: true - placeholderText: qsTr("Username") - } - } - - RoundButton { - id: startUsingKelakon - x: 34 - y: 278 - text: qsTr("Start using kelakon") - 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 - } - - Rectangle { - id: profilePicture - width: 80 - height: 80 - color: "#f0e6fc" - radius: 100 - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: toolbar.bottom - anchors.topMargin: 32 - - RoundButton { - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - flat: true - display: AbstractButton.IconOnly - icon.name: "camera-icon" - icon.source: "/assets/photo_camera_24px.svg" - icon.color: "#6D22E9" - } - } -} - -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640}D{i:1;anchors_width:640} -} -##^##*/ - diff --git a/pages/EmailForm.ui.qml b/pages/EmailForm.ui.qml deleted file mode 100644 index 0f22dbc..0000000 --- a/pages/EmailForm.ui.qml +++ /dev/null @@ -1,125 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -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 instructionLabel: instructionLabel - property alias emailImage: emailImage - property alias emailTextField: emailTextField - property alias loginButton: loginButton - - 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: backButton - icon.name: "back-icon" - icon.source: "/assets/arrow-back-24px.svg" - highlighted: true - } - } - } - - Label { - id: instructionLabel - x: 16 - y: 398 - color: "#2b2626" - text: qsTr("Sign up") - font.letterSpacing: 0.25 - lineHeight: 1 - font.weight: Font.Bold - wrapMode: Text.WordWrap - anchors.bottom: emailLayout.top - anchors.bottomMargin: 16 - anchors.left: parent.left - anchors.leftMargin: 16 - anchors.right: parent.right - anchors.rightMargin: 88 - - font.family: "Google Sans" - font.pointSize: 34 - } - - RowLayout { - id: emailLayout - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - anchors.bottom: loginButton.top - anchors.bottomMargin: 16 - width: parent.width - height: 56 - spacing: 8 - - Image { - id: emailImage - width: 24 - height: 24 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.leftMargin: 16 - Layout.alignment: Qt.AlignVCenter - fillMode: Image.PreserveAspectFit - source: "../assets/email-24px.svg" - antialiasing: true - } - - TextField { - id: emailTextField - Layout.rightMargin: 16 - Layout.leftMargin: 24 - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - font.pointSize: 16 - font.family: "Google Sans" - Layout.fillWidth: true - placeholderText: qsTr("Email") - } - } - - RoundButton { - id: loginButton - text: qsTr("Next") - enabled: false - 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/ExistingLogin.qml b/pages/ExistingLogin.qml deleted file mode 100644 index 8e78a09..0000000 --- a/pages/ExistingLogin.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.12 -import KelakonUser 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 deleted file mode 100644 index 0c39c5a..0000000 --- a/pages/ExistingLoginForm.ui.qml +++ /dev/null @@ -1,128 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -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 - - 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: backButton - icon.name: "back-icon" - icon.source: "/assets/arrow-back-24px.svg" - highlighted: true - } - } - } - - 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 - y: 299 - 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: 362 - font.pointSize: 16 - anchors.bottom: loginButton.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 deleted file mode 100644 index 011af8c..0000000 --- a/pages/PasswordForm.ui.qml +++ /dev/null @@ -1,161 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -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 instructionLabel: instructionLabel - property alias userEmail: userEmail - property alias passImage: passImage - property alias passTextField: passTextField - property alias createPassButton: createPassButton - property alias emailAddressLabel: emailAddressLabel - - 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: backButton - icon.name: "back-icon" - icon.source: "/assets/arrow-back-24px.svg" - highlighted: true - } - } - } - - Label { - id: instructionLabel - x: 16 - 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.left: parent.left - anchors.leftMargin: 16 - anchors.right: parent.right - anchors.rightMargin: 88 - - font.family: "Google Sans" - font.pointSize: 34 - } - - RowLayout { - id: userEmail - height: 56 - anchors.bottom: passTextFieldLayout.top - anchors.bottomMargin: 16 - anchors.horizontalCenterOffset: 0 - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - spacing: 8 - - Image { - width: 24 - height: 24 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.leftMargin: 16 - Layout.alignment: Qt.AlignVCenter - fillMode: Image.PreserveAspectFit - source: "../assets/email-24px.svg" - antialiasing: true - } - - Label { - id: emailAddressLabel - Layout.fillWidth: true - text: qsTr("your@email.com") - Layout.leftMargin: 24 - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - font.family: "Google Sans" - font.pointSize: 16 - color: "#99000000" - } - } - RowLayout { - id: passTextFieldLayout - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: createPassButton.top - anchors.bottomMargin: 16 - width: parent.width - spacing: 8 - height: 56 - - Image { - id: passImage - width: 24 - height: 24 - opacity: 0.54 - sourceSize.height: 24 - sourceSize.width: 24 - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.leftMargin: 16 - fillMode: Image.PreserveAspectFit - source: "../assets/lock-24px.svg" - antialiasing: true - } - - TextField { - id: passTextField - Layout.rightMargin: 16 - Layout.leftMargin: 24 - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - font.pointSize: 16 - anchors.bottomMargin: 16 - font.family: "Google Sans" - Layout.fillWidth: true - placeholderText: qsTr("Password") - echoMode: TextInput.Password - } - } - RoundButton { - id: createPassButton - x: 34 - y: 278 - text: qsTr("Next") - enabled: false - 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/Username.qml b/pages/Username.qml deleted file mode 100644 index c523226..0000000 --- a/pages/Username.qml +++ /dev/null @@ -1,4 +0,0 @@ -import QtQuick 2.4 - -UsernameForm { -} diff --git a/pages/UsernameForm.ui.qml b/pages/UsernameForm.ui.qml deleted file mode 100644 index 3771959..0000000 --- a/pages/UsernameForm.ui.qml +++ /dev/null @@ -1,35 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 - -RowLayout { - - id: userName - width: fillWidth - height: 54 - anchors.topMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - spacing: 16 - - Image { - id: icon - width: 24 - height: 24 - Layout.leftMargin: 16 - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - fillMode: Image.PreserveAspectFit - source: "../assets/user-24px.svg" - } - - TextField { - id: textField - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - font.pointSize: 16 - font.family: "Google Sans" - Layout.fillWidth: true - placeholderText: qsTr("Username") - } -} -- cgit v1.2.3