From a9accc8c42edbba0ed8647751b1fe92f69d5d110 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 4 Mar 2021 18:34:15 +0100
Subject: [PATCH] Replace deprecated Password toggle

---
 .../com/kunzisoft/keepass/activities/EntryEditFragment.kt | 3 ++-
 app/src/main/res/layout/activity_password.xml             | 4 ++--
 app/src/main/res/layout/fragment_entry_edit_contents.xml  | 2 +-
 app/src/main/res/layout/fragment_generate_password.xml    | 4 ++--
 app/src/main/res/layout/fragment_set_otp.xml              | 4 ++--
 app/src/main/res/layout/fragment_set_password.xml         | 8 ++++----
 app/src/main/res/layout/view_keyfile_selection.xml        | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
index 98a975471..c6fe1dbe8 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditFragment.kt
@@ -315,7 +315,8 @@ class EntryEditFragment: StylishFragment() {
         itemView?.id = View.NO_ID
 
         val extraFieldValueContainer: TextInputLayout? = itemView?.findViewById(R.id.entry_extra_field_value_container)
-        extraFieldValueContainer?.isPasswordVisibilityToggleEnabled = extraField.protectedValue.isProtected
+        extraFieldValueContainer?.endIconMode = if (extraField.protectedValue.isProtected)
+             TextInputLayout.END_ICON_PASSWORD_TOGGLE else TextInputLayout.END_ICON_NONE
         extraFieldValueContainer?.hint = extraField.name
         extraFieldValueContainer?.id = View.NO_ID
 
diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml
index 88cde8f97..874e3c8ad 100644
--- a/app/src/main/res/layout/activity_password.xml
+++ b/app/src/main/res/layout/activity_password.xml
@@ -148,8 +148,8 @@
                             android:layout_toEndOf="@+id/password_checkbox"
                             android:importantForAccessibility="no"
                             android:importantForAutofill="no"
-                            app:passwordToggleEnabled="true"
-                            app:passwordToggleTint="?attr/colorAccent">
+                            app:endIconMode="password_toggle"
+                            app:endIconTint="?attr/colorAccent">
 
                             <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/password"
diff --git a/app/src/main/res/layout/fragment_entry_edit_contents.xml b/app/src/main/res/layout/fragment_entry_edit_contents.xml
index 29b46855f..7a838825c 100644
--- a/app/src/main/res/layout/fragment_entry_edit_contents.xml
+++ b/app/src/main/res/layout/fragment_entry_edit_contents.xml
@@ -95,7 +95,7 @@
 					android:id="@+id/entry_edit_container_password"
 					android:layout_width="0dp"
 					android:layout_height="wrap_content"
-					app:passwordToggleEnabled="true"
+					app:endIconMode="password_toggle"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent"
 					app:layout_constraintEnd_toStartOf="@+id/entry_edit_password_generator_button">
diff --git a/app/src/main/res/layout/fragment_generate_password.xml b/app/src/main/res/layout/fragment_generate_password.xml
index b36599659..5343c1d9c 100644
--- a/app/src/main/res/layout/fragment_generate_password.xml
+++ b/app/src/main/res/layout/fragment_generate_password.xml
@@ -46,8 +46,8 @@
                 app:layout_constraintEnd_toStartOf="@+id/password_copy_button"
                 android:importantForAccessibility="no"
                 android:importantForAutofill="no"
-                app:passwordToggleEnabled="true"
-                app:passwordToggleTint="?attr/colorAccent">
+                app:endIconMode="password_toggle"
+                app:endIconTint="?attr/colorAccent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password"
diff --git a/app/src/main/res/layout/fragment_set_otp.xml b/app/src/main/res/layout/fragment_set_otp.xml
index c644902b1..1fcc8a948 100644
--- a/app/src/main/res/layout/fragment_set_otp.xml
+++ b/app/src/main/res/layout/fragment_set_otp.xml
@@ -89,8 +89,8 @@
                     android:id="@+id/setup_otp_secret_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:passwordToggleEnabled="true"
-                    app:passwordToggleTint="?attr/colorAccent">
+                    app:endIconMode="password_toggle"
+                    app:endIconTint="?attr/colorAccent">
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/setup_otp_secret"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_set_password.xml b/app/src/main/res/layout/fragment_set_password.xml
index 7f544eb4e..0e9f164c2 100644
--- a/app/src/main/res/layout/fragment_set_password.xml
+++ b/app/src/main/res/layout/fragment_set_password.xml
@@ -77,8 +77,8 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:importantForAutofill="no"
-                    app:passwordToggleEnabled="true"
-                    app:passwordToggleTint="?attr/colorAccent">
+                    app:endIconMode="password_toggle"
+                    app:endIconTint="?attr/colorAccent">
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/pass_password"
                         android:layout_width="match_parent"
@@ -97,8 +97,8 @@
                     android:importantForAccessibility="no"
                     android:importantForAutofill="no"
                     android:contentDescription="@string/content_description_repeat_toggle_password_visibility"
-                    app:passwordToggleEnabled="true"
-                    app:passwordToggleTint="?attr/colorAccent">
+                    app:endIconMode="password_toggle"
+                    app:endIconTint="?attr/colorAccent">
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/pass_conf_password"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/view_keyfile_selection.xml b/app/src/main/res/layout/view_keyfile_selection.xml
index ec90f575e..2aabcc1da 100644
--- a/app/src/main/res/layout/view_keyfile_selection.xml
+++ b/app/src/main/res/layout/view_keyfile_selection.xml
@@ -14,7 +14,7 @@
         android:id="@+id/input_entry_keyfile"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:passwordToggleEnabled="true"
+        app:endIconMode="password_toggle"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"