From 273684416acefe8bfd803c4d3541b34d929ee2c1 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Sun, 15 Sep 2019 14:44:38 +0700 Subject: username text form --- assets/user-24px.svg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 assets/user-24px.svg (limited to 'assets') diff --git a/assets/user-24px.svg b/assets/user-24px.svg new file mode 100644 index 0000000..3eff6de --- /dev/null +++ b/assets/user-24px.svg @@ -0,0 +1,15 @@ + + + + username-24 + Created with Sketch. + + + + + + + + + + \ No newline at end of file -- cgit v1.3 From c8679cd187c0b273bb8cdd8b41e0d3f903d6e24f Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Sun, 15 Sep 2019 16:16:26 +0700 Subject: add email icon, change userEmail RowLayout --- assets/email-24px.svg | 1 + kelakon.qrc | 1 + pages/CreateProfileForm.ui.qml | 33 +++++++++++++++++++-------------- 3 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 assets/email-24px.svg (limited to 'assets') diff --git a/assets/email-24px.svg b/assets/email-24px.svg new file mode 100644 index 0000000..1ed4686 --- /dev/null +++ b/assets/email-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/kelakon.qrc b/kelakon.qrc index 901d3f0..2aa971b 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -30,5 +30,6 @@ pages/Username.qml pages/UsernameForm.ui.qml assets/user-24px.svg + assets/email-24px.svg diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml index 76f0da9..5f0040c 100644 --- a/pages/CreateProfileForm.ui.qml +++ b/pages/CreateProfileForm.ui.qml @@ -61,25 +61,31 @@ Rectangle { } } } - Rectangle { + RowLayout { id: userEmail - height: 48 + height: 56 anchors.top: profilePicture.bottom anchors.topMargin: 16 anchors.right: parent.right anchors.rightMargin: 16 anchors.left: parent.left anchors.leftMargin: 16 + spacing: 8 + + Image { + id: emailIcon + width: 24 + height: 24 + Layout.alignment: Qt.AlignVCenter + fillMode: Image.PreserveAspectFit + source: "../assets/email-24px.svg" + } Label { id: emailAddressLabel - anchors.right: parent.right - anchors.rightMargin: 16 - anchors.left: parent.left - anchors.leftMargin: 16 - anchors.verticalCenter: parent.verticalCenter text: qsTr("your@email.com") + verticalAlignment: Text.AlignVCenter font.family: "Google Sans" font.pointSize: 16 color: "#99000000" @@ -141,11 +147,10 @@ Rectangle { } } - - - -/*##^## Designer { - D{i:0;autoSize:true;height:480;width:640}D{i:1;anchors_width:640}D{i:7;anchors_height:48;anchors_y:143} -D{i:9;anchors_y:322}D{i:11;anchors_y:54} +/*##^## +Designer { + D{i:0;autoSize:true;height:480;width:640}D{i:1;anchors_width:640}D{i:10;anchors_y:322} +D{i:12;anchors_y:54} } - ##^##*/ +##^##*/ + -- cgit v1.3 From bc1956d78c88ef31824a915134f5cdd56fb08914 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Sun, 15 Sep 2019 20:24:25 +0700 Subject: passTextField now RowLayout --- assets/lock-24px.svg | 1 + kelakon.qrc | 1 + pages/PasswordForm.ui.qml | 42 ++++++++++++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 assets/lock-24px.svg (limited to 'assets') diff --git a/assets/lock-24px.svg b/assets/lock-24px.svg new file mode 100644 index 0000000..1dbceea --- /dev/null +++ b/assets/lock-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/kelakon.qrc b/kelakon.qrc index 2aa971b..d6837c0 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -31,5 +31,6 @@ pages/UsernameForm.ui.qml assets/user-24px.svg assets/email-24px.svg + assets/lock-24px.svg diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml index ac084c1..8936ccd 100644 --- a/pages/PasswordForm.ui.qml +++ b/pages/PasswordForm.ui.qml @@ -66,6 +66,7 @@ Rectangle { RowLayout { id: userEmail height: 56 + anchors.horizontalCenterOffset: 0 anchors.horizontalCenter: parent.horizontalCenter width: parent.width spacing: 8 @@ -93,24 +94,37 @@ Rectangle { color: "#99000000" } } - - TextField { + RowLayout { id: passTextField - y: 501 - font.pointSize: 16 + anchors.horizontalCenter: parent.horizontalCenter 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 - } + width: parent.width + spacing: 8 + height: 56 + Image { + width: 24 + height: 24 + Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter + Layout.leftMargin: 16 + fillMode: Image.PreserveAspectFit + source: "../assets/lock-24px.svg" + antialiasing: true + } + + TextField { + 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 -- cgit v1.3