summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------librtclient0
-rw-r--r--pages/CreateProfileForm.ui.qml88
2 files changed, 87 insertions, 1 deletions
diff --git a/librtclient b/librtclient
-Subproject b4ed4766047759c875aa42cc35b52ccecbfcc6e
+Subproject 16b8e66c64ee8acd6ea2ce34372e52406a990d2
diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml
index e1245c3..4d46180 100644
--- a/pages/CreateProfileForm.ui.qml
+++ b/pages/CreateProfileForm.ui.qml
@@ -7,9 +7,14 @@ Rectangle {
id: rectangle
color: "#fff"
+<<<<<<< HEAD
+ property alias enterFullName: enterFullName
+=======
property alias backButton: backButton
+>>>>>>> 58ed74cd70d6de558b8d9cb77844e95b5f72b341
ToolBar {
+ id: toolbar
height: 48
anchors.top: parent.top
anchors.topMargin: 0
@@ -25,6 +30,7 @@ Rectangle {
RowLayout {
anchors.fill: parent
+ spacing: 8
ToolButton {
id: backButton
@@ -42,6 +48,85 @@ Rectangle {
verticalAlignment: Qt.AlignVCenter
Layout.fillWidth: true
}
+ ToolButton {
+ }
+ }
+ }
+ Rectangle {
+ 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
+
+ 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")
+ font.family: "Google Sans"
+ font.pointSize: 16
+ color: "#99000000"
+ }
+ }
+
+ TextField {
+ id: enterFullName
+ anchors.top: userEmail.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
+ echoMode: TextInput.Password
+ }
+
+ RoundButton {
+ id: startUsingKelakon
+ x: 34
+ y: 278
+ text: qsTr("Start using kelakon")
+ font.family: "Google Sans"
+ font.capitalization: Font.MixedCase
+ anchors.right: parent.right
+ anchors.rightMargin: 8
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 8
+ anchors.left: parent.left
+ anchors.leftMargin: 8
+ highlighted: true
+ Material.background: Material.primary
+ }
+
+ Rectangle {
+ id: profilePicture
+ x: 220
+ width: 80
+ height: 80
+ color: "#f0e6fc"
+ radius: 100
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.top: toolbar.bottom
+ anchors.topMargin: 32
+
+ RoundButton {
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: parent.verticalCenter
+ flat: true
+ display: AbstractButton.IconOnly
+ icon.name: "camera-icon"
}
}
}
@@ -50,6 +135,7 @@ Rectangle {
/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}D{i:1;anchors_width:640}
+ 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}
}
##^##*/