diff options
| -rw-r--r-- | pages/Email.qml | 10 | ||||
| -rw-r--r-- | pages/EmailForm.ui.qml | 88 |
2 files changed, 29 insertions, 69 deletions
diff --git a/pages/Email.qml b/pages/Email.qml index 05ecb45..d808c03 100644 --- a/pages/Email.qml +++ b/pages/Email.qml @@ -6,13 +6,7 @@ EmailForm { loginButton { onClicked: { - appWindow.logIn("62" + phoneTextField.text, passwordTextField.text) + appWindow.logIn("62" + phoneTextField.text) } } - - laterButton { - onClicked: { - stackView.pop() - } - } -} +}
\ No newline at end of file diff --git a/pages/EmailForm.ui.qml b/pages/EmailForm.ui.qml index 4aa692c..1525606 100644 --- a/pages/EmailForm.ui.qml +++ b/pages/EmailForm.ui.qml @@ -10,10 +10,7 @@ Rectangle { border.width: 0 property alias emailTextField: emailTextField - property alias passwordTextField: passwordTextField property alias loginButton: loginButton - property alias laterButton: laterButton - Label { x: 16 y: 398 @@ -21,7 +18,7 @@ Rectangle { text: qsTr("Continue with E-Mail") font.weight: Font.Bold wrapMode: Text.WordWrap - anchors.bottom: buttonLayout.top + anchors.bottom: emailTextField.top anchors.bottomMargin: 16 anchors.left: parent.left anchors.leftMargin: 16 @@ -32,35 +29,27 @@ Rectangle { font.pointSize: 34 } - RowLayout { - x: 34 - y: 411 - id: buttonLayout - width: loginButton.width - height: loginButton.height - anchors.bottom: passwordTextField.top - anchors.bottomMargin: 16 - anchors.horizontalCenter: parent.horizontalCenter - - TextField { - id: emailTextField - width: 303 - Layout.fillWidth: true - placeholderText: "E-mail" - } - } - TextField { - id: passwordTextField - x: 34 - y: 468 - width: loginButton.width - height: loginButton.height + id: emailTextField + y: 501 + font.pointSize: 16 anchors.bottom: loginButton.top anchors.bottomMargin: 16 - anchors.horizontalCenter: parent.horizontalCenter - echoMode: TextInput.Password - placeholderText: qsTr("Password") + font.family: "Google Sans" + Layout.fillWidth: true + placeholderText: qsTr("E-mail") + anchors.right: parent.right + anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 + Layout.maximumHeight: 56 + + background: Rectangle { + color: emailTextField.enabled ? "#f4f4f4" : "#353637" + anchors.verticalCenter: parent.verticalCenter + implicitHeight: 56 + radius: 6 + } } Button { @@ -72,7 +61,7 @@ Rectangle { text: qsTr("Masuk") anchors.right: parent.right anchors.rightMargin: 16 - anchors.bottom: laterButton.top + anchors.bottom: parent.bottom anchors.bottomMargin: 16 anchors.left: parent.left anchors.leftMargin: 16 @@ -89,39 +78,16 @@ Rectangle { background: Rectangle { opacity: enabled ? 1.0 : 0.3 - color: laterButton.down ? "#6d22e9" : "#4F12DA" + color: loginButton.down ? "#6d22e9" : "#4F12DA" radius: 6 } } +} - Button { - id: laterButton - x: 16 - y: 566 - height: 36 - text: qsTr("Nanti saja") - anchors.right: parent.right - anchors.rightMargin: 16 - anchors.bottom: parent.bottom - anchors.bottomMargin: 16 - anchors.left: parent.left - anchors.leftMargin: 16 - contentItem: Text { - text: laterButton.text - color: "#6d22e9" - font.pointSize: 14 - font.family: "Google Sans" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight - } - background: Rectangle { - opacity: enabled ? 0.3 : 1.0 - color: laterButton.down ? "#6d22e9" : "#fff" - border.color: "#6d22e9" - border.width: 1 - radius: 6 - } - } + + +/*##^## Designer { + D{i:2;anchors_x:16} } + ##^##*/ |