Merge remote-tracking branch 'github/development'

4 files changed, 168 insertions, 64 deletions

diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml
index 76f0da9..45087e1 100644
--- a/pages/CreateProfileForm.ui.qml
+++ b/pages/CreateProfileForm.ui.qml
@@ -61,44 +61,92 @@ Rectangle {
             }
         }
     }
-    Rectangle {
+    RowLayout {
         id: userEmail
-        height: 48
-        anchors.top: profilePicture.bottom
-        anchors.topMargin: 16
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.left: parent.left
-        anchors.leftMargin: 16
+        height: 56
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: usernameRowLayout.bottom
+        width: parent.width
+        spacing: 8
+
+        Image {
+            width: 24
+            height: 24
+            Layout.leftMargin: 16
+            Layout.alignment: Qt.AlignVCenter
+            fillMode: Image.PreserveAspectFit
+            source: "../assets/email-24px.svg"
+            antialiasing: true
+        }
 
         Label {
             id: emailAddressLabel
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.left: parent.left
-            anchors.leftMargin: 16
-            anchors.verticalCenter: parent.verticalCenter
-
+            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
+            Layout.leftMargin: 16
+            Layout.alignment: Qt.AlignVCenter
+            fillMode: Image.PreserveAspectFit
+            source: "../assets/profile-24px.svg"
+            antialiasing: true
+        }
 
-    TextField {
-        id: enterFullName
-        anchors.top: userEmail.bottom
+        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
+        height: 56
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        Layout.alignment: Qt.AlignVCenter
+        anchors.top: fullnameRowLayout.bottom
         anchors.topMargin: 16
-        font.pointSize: 16
-        font.family: "Google Sans"
-        Layout.fillWidth: true
-        placeholderText: qsTr("Full name")
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.left: parent.left
-        anchors.leftMargin: 16
-        Layout.maximumHeight: 56
+
+        Image {
+            width: 24
+            height: 24
+            Layout.leftMargin: 16
+            Layout.alignment: Qt.AlignVCenter
+            fillMode: Image.PreserveAspectFit
+            source: "../assets/user-24px.svg"
+            antialiasing: true
+        }
+
+        TextField {
+            Layout.rightMargin: 16
+            Layout.leftMargin: 24
+            font.pointSize: 16
+            font.family: "Google Sans"
+            Layout.fillWidth: true
+            placeholderText: qsTr("Username")
+            Layout.alignment: Qt.AlignVCenter
+        }
     }
 
     RoundButton {
@@ -141,11 +189,9 @@ 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}
 }
- ##^##*/
+##^##*/
+
diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml
index 887bf01..8936ccd 100644
--- a/pages/PasswordForm.ui.qml
+++ b/pages/PasswordForm.ui.qml
@@ -63,48 +63,68 @@ Rectangle {
         font.pointSize: 34
     }
 
-    Rectangle {
+    RowLayout {
         id: userEmail
-        height: 48
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.left: parent.left
-        anchors.leftMargin: 16
+        height: 56
+        anchors.horizontalCenterOffset: 0
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        spacing: 8
         anchors.bottom: passTextField.top
         anchors.bottomMargin: 16
 
+        Image {
+            width: 24
+            height: 24
+            Layout.leftMargin: 16
+            Layout.alignment: Qt.AlignVCenter
+            fillMode: Image.PreserveAspectFit
+            source: "../assets/email-24px.svg"
+            antialiasing: true
+        }
+
         Label {
             id: emailAddressLabel
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.left: parent.left
-            anchors.leftMargin: 16
-            anchors.verticalCenter: parent.verticalCenter
-
+            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"
         }
     }
-
-    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
@@ -124,10 +144,9 @@ Rectangle {
     }
 }
 
-
-
-
-/*##^## Designer {
+/*##^##
+Designer {
     D{i:0;autoSize:true;height:480;width:640}
 }
- ##^##*/
+##^##*/
+
diff --git a/pages/Username.qml b/pages/Username.qml
new file mode 100644
index 0000000..c523226
--- /dev/null
+++ b/pages/Username.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.4
+
+UsernameForm {
+}
diff --git a/pages/UsernameForm.ui.qml b/pages/UsernameForm.ui.qml
new file mode 100644
index 0000000..3771959
--- /dev/null
+++ b/pages/UsernameForm.ui.qml
@@ -0,0 +1,35 @@
+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")
+    }
+}