From bc1956d78c88ef31824a915134f5cdd56fb08914 Mon Sep 17 00:00:00 2001
From: Anatasof Wirapraja <anatasof.wirapraja@gmail.com>
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

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 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="M0 0h24v24H0V0z"/><path opacity=".87" d="M0 0h24v24H0V0z"/></g><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zM9 6c0-1.66 1.34-3 3-3s3 1.34 3 3v2H9V6zm9 14H6V10h12v10zm-6-3c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/></svg>
\ 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 @@
         <file>pages/UsernameForm.ui.qml</file>
         <file>assets/user-24px.svg</file>
         <file>assets/email-24px.svg</file>
+        <file>assets/lock-24px.svg</file>
     </qresource>
 </RCC>
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.2.3