rearrange `Login` flow

5 files changed, 39 insertions, 50 deletions

diff --git a/features/Login.qml b/features/Login.qml
index 44bf53c..863e908 100644
--- a/features/Login.qml
+++ b/features/Login.qml
@@ -3,8 +3,39 @@ import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
 
-LoginForm {}
+Page {
+    header:
+    ToolBar {
 
+        background: Rectangle {
+        color: "#FAFFFFFF"
+        }
+        RowLayout {
+            ToolButton {
+                id: toolButton
+                icon.name: "back-button"
+                icon.source: "../components/icons/arrow-back-24px.svg"
+                highlighted: true
+                onClicked: {
+                    if (pageView.depth > 1) {
+                        pageView.pop()
+                    } else {
+                        drawer.open()
+                    }
+                }
+            }
+        }
+    }
+
+
+StackView {
+    id: contentView
+    anchors.topMargin: 432
+    anchors.fill: parent
+    initialItem: LoginEmail{
+    }
+}
+}
 /*##^##
 Designer {
     D{i:0;autoSize:true;height:480;width:640}
diff --git a/features/LoginEmail.qml b/features/LoginEmail.qml
index bfb1e52..3352f4a 100644
--- a/features/LoginEmail.qml
+++ b/features/LoginEmail.qml
@@ -3,50 +3,8 @@ import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
 
-Page {
-    header:
-    ToolBar {
+LoginEmailForm {}
 
-        background: Rectangle {
-        color: "#FAFFFFFF"
-        }
-        RowLayout {
-            ToolButton {
-                id: toolButton
-                icon.name: "back-button"
-                icon.source: "../components/icons/arrow-back-24px.svg"
-                highlighted: true
-                onClicked: {
-                    if (pageView.depth > 1) {
-                        pageView.pop()
-                    } else {
-                        drawer.open()
-                    }
-                }
-            }
-
-            Label {
-                text: contentView.currentItem.title
-                font.family: "Work Sans"
-                font.weight: Font.Medium
-                font.pointSize: 20
-                wrapMode: Text.WordWrap
-                elide: Label.ElideRight
-                horizontalAlignment: Qt.AlignHCenter
-                verticalAlignment: Qt.AlignVCenter
-            }
-        }
-    }
-
-
-StackView {
-    id: contentView
-    anchors.topMargin: 432
-    anchors.fill: parent
-    initialItem: Login{
-    }
-}
-}
 /*##^##
 Designer {
     D{i:0;autoSize:true;height:480;width:640}
diff --git a/features/LoginForm.ui.qml b/features/LoginEmailForm.ui.qml
index c69791b..501b575 100644
--- a/features/LoginForm.ui.qml
+++ b/features/LoginEmailForm.ui.qml
@@ -11,7 +11,7 @@ Page {
 
     Text {
         id: pageTitle
-        text: pageView.currentItem.title
+        text: contentView.currentItem.title
         verticalAlignment: Text.AlignVCenter
         wrapMode: Text.WordWrap
         anchors.right: parent.right
@@ -27,7 +27,7 @@ Page {
     Text {
         id: pageInstruction
         color: "#000000"
-        text: qsTr("Get sh** done today, chill tomorrow.")
+        text: qsTr("Continue with your email.")
         verticalAlignment: Text.AlignVCenter
         wrapMode: Text.WordWrap
         anchors.right: parent.right
diff --git a/features/Onboarding.qml b/features/Onboarding.qml
index 38e9cf9..1860896 100644
--- a/features/Onboarding.qml
+++ b/features/Onboarding.qml
@@ -2,7 +2,7 @@ import QtQuick 2.4
 
 OnboardingForm {
     objectName: "onboarding"
-    loginButton.onClicked: pageView.push("LoginEmail.qml")
+    loginButton.onClicked: pageView.push("Login.qml")
 }
 
 /*##^##
diff --git a/features/OnboardingForm.ui.qml b/features/OnboardingForm.ui.qml
index 13db636..b6a2cff 100644
--- a/features/OnboardingForm.ui.qml
+++ b/features/OnboardingForm.ui.qml
@@ -48,17 +48,17 @@ Page {
     }
     Text {
         id: onboardingText1
-        text: qsTr("Achieve more today, chill tomorrow.")
+        text: qsTr("Get things done today, chill tomorrow.")
         anchors.bottom: registerButton.top
         anchors.bottomMargin: 16
         wrapMode: Text.WordWrap
         anchors.right: parent.right
-        anchors.rightMargin: 16
+        anchors.rightMargin: 72
         anchors.left: parent.left
         anchors.leftMargin: 16
         font.pointSize: 24
         font.family: "Work Sans"
-        font.weight: Font.Medium
+        font.weight: Font.Bold
     }
     RoundButton {
         id: registerButton