From 938de28b49b3eac230519c1797fed98711113def Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sun, 10 Nov 2019 16:30:22 +0100
Subject: [PATCH] Minimized hidden text #373

---
 .../kunzisoft/keepass/view/EntryContentsView.kt    |  7 +------
 .../com/kunzisoft/keepass/view/EntryCustomField.kt |  9 ++-------
 .../java/com/kunzisoft/keepass/view/ViewUtil.kt    | 14 +++++++++++---
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
index cb368e3d6..d4da8e9ff 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt
@@ -20,7 +20,6 @@ package com.kunzisoft.keepass.view
 
 import android.content.Context
 import android.graphics.Color
-import android.text.method.PasswordTransformationMethod
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -199,11 +198,7 @@ class EntryContentsView @JvmOverloads constructor(context: Context,
     }
 
     fun setHiddenPasswordStyle(hiddenStyle: Boolean) {
-        if (!hiddenStyle) {
-            passwordView.transformationMethod = null
-        } else {
-            passwordView.transformationMethod = PasswordTransformationMethod.getInstance()
-        }
+        passwordView.applyHiddenStyle(hiddenStyle)
         // Hidden style for custom fields
         extrasView.let {
             for (i in 0 until it.childCount) {
diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt
index 6935972ba..992660b5e 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryCustomField.kt
@@ -21,13 +21,12 @@ package com.kunzisoft.keepass.view
 
 import android.content.Context
 import android.graphics.Color
-import android.text.method.PasswordTransformationMethod
-import androidx.core.content.ContextCompat
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 
 open class EntryCustomField @JvmOverloads constructor(context: Context,
@@ -72,11 +71,7 @@ open class EntryCustomField @JvmOverloads constructor(context: Context,
     }
 
     fun setHiddenPasswordStyle(hiddenStyle: Boolean) {
-        if (isProtected && hiddenStyle) {
-            valueView.transformationMethod = PasswordTransformationMethod.getInstance()
-        } else {
-            valueView.transformationMethod = null
-        }
+        valueView.applyHiddenStyle(isProtected && hiddenStyle)
     }
 
     fun enableActionButton(enable: Boolean) {
diff --git a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
index d9f48dab2..610f531d1 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt
@@ -21,11 +21,9 @@ package com.kunzisoft.keepass.view
 
 import android.animation.AnimatorSet
 import android.animation.ValueAnimator
-import android.app.Activity
-import android.content.pm.ActivityInfo
-import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Typeface
+import android.text.method.PasswordTransformationMethod
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.TextView
@@ -41,6 +39,16 @@ fun TextView.applyFontVisibility() {
     typeface = typeFace
 }
 
+fun TextView.applyHiddenStyle(hide: Boolean) {
+    if (hide) {
+        transformationMethod = PasswordTransformationMethod.getInstance()
+        maxLines = 1
+    } else {
+        transformationMethod = null
+        maxLines = 800
+    }
+}
+
 fun Snackbar.asError(): Snackbar {
     this.view.apply {
         setBackgroundColor(Color.RED)