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 --- 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 ------- 7 files changed, 673 deletions(-) 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 (limited to 'pages') 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