UNT-T21169 - Day4 - Bugfix/Login - ForgotPassword Issue

Fix Forgot Password Click not working
Fix Login Screen Password Check

Add Validator.kt to perform Validations

Author: priyanshu-simformsolutions

app/src/main/java/simform/gitexcercise/android/LoginActivity.kt

@@ -6,6 +6,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import simform.gitexcercise.android.databinding.ActivityLoginBinding
 import simform.gitexcercise.android.validation.Validator
+import simform.gitexcercise.android.validation.Validator.ValidLogin
 
 class LoginActivity : AppCompatActivity() {
 
@@ -30,19 +31,23 @@ class LoginActivity : AppCompatActivity() {
     private fun performLogin() = with(binding) {
         val txtEmail = etEmail.text.trim().toString()
         val txtPassword = etPassword.text.trim().toString()
-        if (Validator.isValidEmail(txtEmail)) {
-            if (Validator.isValidPassword(txtPassword)) {
+        when (Validator.isValidLogin(email = txtEmail, password = txtPassword)) {
+            ValidLogin.VALID -> {
                 Toast.makeText(
                     this@LoginActivity,
                     getString(R.string.msg_login_successfully),
                     Toast.LENGTH_SHORT
                 ).show()
                 gotoProfile()
-            } else {
+            }
+
+            ValidLogin.INVALID_EMAIL -> {
+                etEmail.error = getString(R.string.errr_valid_email)
+            }
+
+            ValidLogin.INVALID_PASSWORD -> {
                 etPassword.error = getString(R.string.err_password_8_chars)
             }
-        } else {
-            etEmail.error = getString(R.string.errr_valid_email)
         }
     }
 

app/src/main/java/simform/gitexcercise/android/validation/Validator.kt

@@ -7,6 +7,22 @@ object Validator {
         const val MAX_LENGTH = 16
     }
 
+    enum class ValidLogin {
+        VALID, INVALID_EMAIL, INVALID_PASSWORD
+    }
+
+    fun isValidLogin(email: String, password: String): ValidLogin {
+        return if (isValidEmail(email)) {
+            return if (isValidPassword(password)) {
+                ValidLogin.VALID
+            } else {
+                ValidLogin.INVALID_PASSWORD
+            }
+        } else {
+            ValidLogin.INVALID_EMAIL
+        }
+    }
+
     fun isValidEmail(email: String) =
         email.isNotEmpty() && android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches()