summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-09-18 14:02:07 +0700
committerAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-09-18 14:02:07 +0700
commit03f6b575155119ee56c64aa1263942434f119858 (patch)
treee9bca4064168f65517cbdca7ff4559ba40b961d5 /features
parentb01c798db658fcea43941d5b4f587f0d11d92fcd (diff)
`EnterPassword`
Diffstat (limited to 'features')
-rw-r--r--features/EnterPassword.qml4
-rw-r--r--features/EnterPasswordForm.ui.qml12
-rw-r--r--features/Login.qml60
-rw-r--r--features/LoginForm.ui.qml53
4 files changed, 77 insertions, 52 deletions
diff --git a/features/EnterPassword.qml b/features/EnterPassword.qml
new file mode 100644
index 0000000..04e1887
--- /dev/null
+++ b/features/EnterPassword.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.4
+
+EnterPasswordForm {
+}
diff --git a/features/EnterPasswordForm.ui.qml b/features/EnterPasswordForm.ui.qml
new file mode 100644
index 0000000..f356bab
--- /dev/null
+++ b/features/EnterPasswordForm.ui.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+
+Page {}
+/*##^##
+Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
+
diff --git a/features/Login.qml b/features/Login.qml
index 842cb5f..465da88 100644
--- a/features/Login.qml
+++ b/features/Login.qml
@@ -4,7 +4,8 @@ import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
LoginForm {
- ToolBar {
+ header:
+ ToolBar {
Material.elevation: 0
background: Rectangle {
color: "#FAFFFFFF"
@@ -23,8 +24,65 @@ LoginForm {
}
}
}
+ footer:
+ RowLayout {
+ id: continueLayout
+ height: 80
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 0
+ anchors.right: parent.right
+ anchors.rightMargin: 0
+ anchors.left: parent.left
+ anchors.leftMargin: 0
+
+ Text {
+ id: disclaimer
+ text: qsTr("By continuing, you are agree to our Terms of Use and Privacy Policy.")
+ Layout.rightMargin: 16
+ Layout.leftMargin: 16
+ font.family: "Roboto"
+ font.pointSize: 12
+ color: "#FA000000"
+ wrapMode: Text.WordWrap
+ verticalAlignment: Text.AlignVCenter
+ rightPadding: 0
+ leftPadding: 0
+ Layout.alignment: Qt.AlignVCenter
+ Layout.fillWidth: true
+ }
+
+ RoundButton {
+ id: continueButton
+ width: 72
+ height: 72
+ Layout.preferredHeight: 64
+ Layout.preferredWidth: 64
+ Layout.minimumHeight: 64
+ Layout.minimumWidth: 64
+ Layout.rightMargin: 16
+ Layout.leftMargin: 16
+ flat: false
+ rightPadding: 0
+ leftPadding: 0
+ bottomPadding: 0
+ topPadding: 0
+ Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+ Material.background: Material.primary
+ display: AbstractButton.IconOnly
+ icon.name: "arrow-forward-icon"
+ icon.source: "../components/icons/arrow-forward-24px.svg"
+ highlighted: true
+
+ onClicked: {
+ stackView.push("EnterPasswordForm.ui.qml")
+ }
+ }
+
+ }
}
+
+
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
diff --git a/features/LoginForm.ui.qml b/features/LoginForm.ui.qml
index 446567d..3076a67 100644
--- a/features/LoginForm.ui.qml
+++ b/features/LoginForm.ui.qml
@@ -45,8 +45,8 @@ Page {
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
- anchors.bottom: continueLayout.top
- anchors.bottomMargin: 16
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 0
spacing: 8
height: 56
@@ -76,55 +76,6 @@ Page {
color: "#000000"
}
}
- RowLayout {
- id: continueLayout
- height: 80
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 0
- anchors.right: parent.right
- anchors.rightMargin: 0
- anchors.left: parent.left
- anchors.leftMargin: 0
-
- Text {
- id: disclaimer
- text: qsTr("By continuing, you are agree to our Terms of Use and Privacy Policy.")
- Layout.rightMargin: 16
- Layout.leftMargin: 16
- font.family: "Roboto"
- font.pointSize: 12
- color: "#FA000000"
- wrapMode: Text.WordWrap
- verticalAlignment: Text.AlignVCenter
- rightPadding: 0
- leftPadding: 0
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- }
-
- RoundButton {
- id: continueButton
- width: 72
- height: 72
- Layout.preferredHeight: 64
- Layout.preferredWidth: 64
- Layout.minimumHeight: 64
- Layout.minimumWidth: 64
- Layout.rightMargin: 16
- Layout.leftMargin: 16
- flat: false
- rightPadding: 0
- leftPadding: 0
- bottomPadding: 0
- topPadding: 0
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
- Material.background: Material.primary
- display: AbstractButton.IconOnly
- icon.name: "arrow-forward-icon"
- icon.source: "../components/icons/arrow-forward-24px.svg"
- highlighted: true
- }
- }
}
/*##^##
Designer {