Merge LoginEmail logics to Login's

because it was too simple to be separate.

3 files changed, 12 insertions, 17 deletions

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>