From d45e482373026f48280f3d72b38f2c0965ec52d2 Mon Sep 17 00:00:00 2001
From: Jocelyne <38375996+joc-a@users.noreply.github.com>
Date: Wed, 23 Sep 2020 22:10:49 +0300
Subject: [PATCH] For #11800: Hide reveal and clear password icons if the
 password is empty when editing a saved login (#15244)

Co-authored-by: Jocelyne Abi Haidar <jocelyne.abihaidar@gotocme.com>
---
 .../logins/fragment/EditLoginFragment.kt      | 35 +++++++++++++++----
 .../mozac_ic_warning_with_bottom_padding.xml  |  9 +++++
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml

diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
index 2117f93fcc..c65654fe0e 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.logins.fragment
 
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.text.Editable
 import android.text.InputType
@@ -13,6 +14,8 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.view.menu.ActionMenuItemView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -114,6 +117,8 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
 
         usernameChanged = false
         passwordChanged = false
+
+        clearUsernameTextButton.isEnabled = oldLogin.username.isNotEmpty()
     }
 
     private fun formatEditableValues() {
@@ -140,7 +145,6 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
             passwordText.isCursorVisible = true
             passwordText.hasFocus()
             inputLayoutPassword.hasFocus()
-            it.isEnabled = false
         }
         revealPasswordButton.setOnClickListener {
             togglePasswordReveal(passwordText, revealPasswordButton)
@@ -168,13 +172,14 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
                         validUsername = true
                         inputLayoutUsername.error = null
                         inputLayoutUsername.errorIconDrawable = null
+                        clearUsernameTextButton.isVisible = true
                     }
                     else -> {
                         usernameChanged = true
-                        clearUsernameTextButton.isEnabled = true
                         setDupeError()
                     }
                 }
+                clearUsernameTextButton.isEnabled = u.toString().isNotEmpty()
                 setSaveButtonState()
             }
 
@@ -192,7 +197,8 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
                 when {
                     p.toString().isEmpty() -> {
                         passwordChanged = true
-                        clearPasswordTextButton.isEnabled = false
+                        revealPasswordButton.isVisible = false
+                        clearPasswordTextButton.isVisible = false
                         setPasswordError()
                     }
                     p.toString() == oldLogin.password -> {
@@ -200,14 +206,16 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
                         validPassword = true
                         inputLayoutPassword.error = null
                         inputLayoutPassword.errorIconDrawable = null
-                        clearPasswordTextButton.isEnabled = true
+                        revealPasswordButton.isVisible = true
+                        clearPasswordTextButton.isVisible = true
                     }
                     else -> {
                         passwordChanged = true
                         validPassword = true
                         inputLayoutPassword.error = null
                         inputLayoutPassword.errorIconDrawable = null
-                        clearPasswordTextButton.isEnabled = true
+                        revealPasswordButton.isVisible = true
+                        clearPasswordTextButton.isVisible = true
                     }
                 }
                 setSaveButtonState()
@@ -231,13 +239,21 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
             inputLayoutUsername?.let {
                 usernameChanged = true
                 validUsername = false
-                it.setErrorIconDrawable(R.drawable.mozac_ic_warning)
                 it.error = context?.getString(R.string.saved_login_duplicate)
+                it.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
+                it.setErrorIconTintList(
+                    ColorStateList.valueOf(
+                        ContextCompat.getColor(requireContext(), R.color.design_error)
+                    )
+                )
+                clearUsernameTextButton.isVisible = false
             }
         } else {
             usernameChanged = true
             validUsername = true
             inputLayoutUsername.error = null
+            inputLayoutUsername.errorIconDrawable = null
+            clearUsernameTextButton.isVisible = true
         }
     }
 
@@ -245,7 +261,12 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
         inputLayoutPassword?.let { layout ->
             validPassword = false
             layout.error = context?.getString(R.string.saved_login_password_required)
-            layout.setErrorIconDrawable(R.drawable.mozac_ic_warning)
+            layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
+            layout.setErrorIconTintList(
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(requireContext(), R.color.design_error)
+                )
+            )
         }
     }
 
diff --git a/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml b/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml
new file mode 100644
index 0000000000..408f4c0770
--- /dev/null
+++ b/app/src/main/res/drawable/mozac_ic_warning_with_bottom_padding.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/mozac_ic_warning"
+        android:bottom="14dp" />
+</layer-list>
\ No newline at end of file