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

1 files changed, 14 insertions, 15 deletions

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")
+		}
+	}
 }