Merge branch 'master' of ssh://darapsa.co.id/usr/local/git/kelakon into development

* 'master' of ssh://darapsa.co.id/usr/local/git/kelakon:
  Fixed the android debug label library name
  Set up flows from password form to profile creation form

# Conflicts:
#	pages/CreateProfileForm.ui.qml

5 files changed, 43 insertions, 44 deletions

diff --git a/pages/ConfirmPassword.qml b/pages/ConfirmPassword.qml
index a93afda..78e57f1 100644
--- a/pages/ConfirmPassword.qml
+++ b/pages/ConfirmPassword.qml
@@ -3,16 +3,21 @@ import id.co.darapsa.kelakon.user 0.1
 import id.co.darapsa.kelakon.rtclient 0.1
 
 ConfirmPasswordForm {
-    width: stackView.width
-    height: stackView.height
-    backButton {
-        onClicked: {
-            stackView.pop()
-        }
-    }
-}
+	width: stackView.width
+	height: stackView.height
+
+	backButton {
+		onClicked: {
+			stackView.pop()
+		}
+	}
+
+	emailAddressLabel.text: User.emailAddress
 
-/*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}
+	confirmPassButton {
+		onClicked: {
+			RTClient.logIn(User.emailAddress, User.password)
+			stackView.push("qrc:/pages/CreateProfile.qml")
+		}
+	}
 }
- ##^##*/
diff --git a/pages/ConfirmPasswordForm.ui.qml b/pages/ConfirmPasswordForm.ui.qml
index 152b7e5..34e03ef 100644
--- a/pages/ConfirmPasswordForm.ui.qml
+++ b/pages/ConfirmPasswordForm.ui.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
 
@@ -116,11 +116,3 @@ Rectangle {
         Material.background: Material.primary
     }
 }
-
-
-
-
-/*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/pages/CreateProfile.qml b/pages/CreateProfile.qml
index 77c1742..9cfb615 100644
--- a/pages/CreateProfile.qml
+++ b/pages/CreateProfile.qml
@@ -1,14 +1,12 @@
 import QtQuick 2.12
-import id.co.darapsa.kelakon.user 0.1
-import id.co.darapsa.kelakon.rtclient 0.1
 
 CreateProfileForm {
-    width: stackView.width
-    height: stackView.height
-    }
-}
+	width: stackView.width
+	height: stackView.height
 
-/*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}
+	backButton {
+		onClicked: {
+			stackView.pop()
+		}
+	}
 }
- ##^##*/
diff --git a/pages/CreateProfileForm.ui.qml b/pages/CreateProfileForm.ui.qml
index e4f2a76..4d46180 100644
--- a/pages/CreateProfileForm.ui.qml
+++ b/pages/CreateProfileForm.ui.qml
@@ -7,7 +7,11 @@ Rectangle {
     id: rectangle
     color: "#fff"
 
+<<<<<<< HEAD
     property alias enterFullName: enterFullName
+=======
+    property alias backButton: backButton
+>>>>>>> 58ed74cd70d6de558b8d9cb77844e95b5f72b341
 
     ToolBar {
         id: toolbar
@@ -29,6 +33,7 @@ Rectangle {
             spacing: 8
 
             ToolButton {
+		    id: backButton
                 icon.name: "back-icon"
                 icon.source: "/assets/arrow-back-24px.svg"
                 icon.color: "transparent"
diff --git a/pages/Password.qml b/pages/Password.qml
index befeea5..4a1ae59 100644
--- a/pages/Password.qml
+++ b/pages/Password.qml
@@ -1,22 +1,21 @@
 import QtQuick 2.12
 import id.co.darapsa.kelakon.user 0.1
-import id.co.darapsa.kelakon.rtclient 0.1
 
 PasswordForm {
-    width: stackView.width
-    height: stackView.height
-    backButton {
-        onClicked: {
-            stackView.pop()
-        }
-    }
+	width: stackView.width
+	height: stackView.height
+	backButton {
+		onClicked: {
+			stackView.pop()
+		}
+	}
 
-    createPassButton {
-        onClicked: {
-            User.password = passTextField.text
-            RTClient.logIn(User.emailAddress, User.password)
-        }
-    }
+	emailAddressLabel.text: User.emailAddress
 
-    emailAddressLabel.text: User.emailAddress
+	createPassButton {
+		onClicked: {
+			User.password = passTextField.text
+			stackView.push("qrc:/pages/ConfirmPassword.qml")
+		}
+	}
 }