error stop overlapping

* changed id in LoginActivity.kt * id added in activity_login.xml for textInputLayout
openfoodfacts · Mar 21, 2022 · bab5772 · bab5772
1 parent 9ae34a6
commit bab5772
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/login/LoginActivity.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/login/LoginActivity.kt
@@ -18,6 +18,7 @@ package openfoodfacts.github.scrachx.openfood.features.login
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
@@ -88,23 +89,26 @@ class LoginActivity : BaseActivity() {
 
         hideKeyboard()
 
+        binding.loginInputLayout.error = null
+        binding.passInputLayout.error = null
+
         // Start checks
         val login = binding.loginInput.text.toString()
         val password = binding.passInput.text.toString()
         if (login.isBlank()) {
-            binding.loginInput.error = getString(R.string.error_field_required)
-            binding.loginInput.requestFocus()
+            binding.loginInputLayout.error = getString(R.string.error_field_required)
+            binding.loginInputLayout.requestFocus()
             updateLoginButtonState(LoginButtonState.Enabled)
             return
         }
         if (password.isBlank()) {
-            binding.passInput.error = getString(R.string.error_field_required)
-            binding.passInput.requestFocus()
+            binding.passInputLayout.error = getText(R.string.error_field_required)
+            binding.passInputLayout.requestFocus()
             updateLoginButtonState(LoginButtonState.Enabled)
             return
         } else if (password.length < 6) {
-            binding.passInput.error = getText(R.string.error_invalid_password)
-            binding.passInput.requestFocus()
+            binding.passInputLayout.error = getText(R.string.error_invalid_password)
+            binding.passInputLayout.requestFocus()
             updateLoginButtonState(LoginButtonState.Enabled)
             return
         }

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -30,13 +30,14 @@
 
 
         <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/login_input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/hintLogin"
             app:startIconDrawable="@drawable/ic_person_grey_24dp">
 
             <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/loginInput"
+                android:id="@+id/login_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
@@ -46,6 +47,7 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/pass_input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:passwordToggleEnabled="true"
@@ -57,8 +59,8 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/hintPass"
                 android:inputType="textPassword"
-
                 android:maxLines="1" />
+
         </com.google.android.material.textfield.TextInputLayout>
 
         <Button