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, 16 insertions, 11 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")
+		}
+	}
 }
- ##^##*/