error stop overlapping (#4568)

* changed id in LoginActivity.kt * id added in activity_login.xml for textInputLayout
openfoodfacts · Mar 24, 2022 · 6cb1e4f · 6cb1e4f
1 parent 84d2ff6
commit 6cb1e4f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 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
@@ -29,27 +29,28 @@
             android:id="@+id/linearLayout3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center"
             android:orientation="vertical"
-            android:padding="20dp"
-            android:gravity="center">
+            android:padding="20dp">
 
             <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"
                     android:inputType="text"
                     android:maxLines="1" />
-
             </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"
@@ -61,7 +62,6 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/hintPass"
                     android:inputType="textPassword"
-
                     android:maxLines="1" />
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -74,6 +74,7 @@
                 android:text="@string/txtSignIn"
                 android:textColor="@android:color/white" />
 
+
             <TextView
                 android:id="@+id/txt_info_login"
                 android:layout_width="match_parent"