From 640c6bd31354dd5810e104fe919d34300b145834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?=
 =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?=
 =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= <erik@darapsa.co.id>
Date: Wed, 25 Sep 2019 10:24:55 +0800
Subject: Merge LoginEmail logics to Login's

because it was too simple to be separate.
---
 Login.qml      | 13 ++++++++++++-
 LoginEmail.qml | 15 ---------------
 kelakon.qrc    |  1 -
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 LoginEmail.qml

diff --git a/Login.qml b/Login.qml
index bcbbf50..1aadecc 100644
--- a/Login.qml
+++ b/Login.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.12
+import KelakonUser 0.1
 import "larva/features"
 
 LoginForm {
@@ -8,5 +9,15 @@ LoginForm {
 				else
 					drawer.open()
 
-	contentView.initialItem: LoginEmail{}
+	contentView.initialItem: LoginEmailForm {
+		emailTextField.onTextChanged: {
+			if (!emailTextField.text || !continueButton.enabled)
+				continueButton.enabled = !continueButton.enabled
+		}
+
+		continueButton.onClicked: {
+			User.name = emailTextField.text
+			contentView.push("LoginPassword.qml")
+		}
+	}
 }
diff --git a/LoginEmail.qml b/LoginEmail.qml
deleted file mode 100644
index 67d45f4..0000000
--- a/LoginEmail.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 2.12
-import KelakonUser 0.1
-import "larva/features"
-
-LoginEmailForm {
-	emailTextField.onTextChanged: {
-		if (!emailTextField.text || !continueButton.enabled)
-			continueButton.enabled = !continueButton.enabled
-	}
-
-	continueButton.onClicked: {
-			User.name = emailTextField.text
-			contentView.push("LoginPassword.qml")
-		}
-}
diff --git a/kelakon.qrc b/kelakon.qrc
index 0d641ee..1342d52 100644
--- a/kelakon.qrc
+++ b/kelakon.qrc
@@ -2,7 +2,6 @@
 	<qresource prefix="/">
 		<file>main.qml</file>
 		<file>Login.qml</file>
-		<file>LoginEmail.qml</file>
 		<file>LoginPassword.qml</file>
 		<file>Home.qml</file>
 		<file>TaskList.qml</file>
-- 
cgit v1.2.3