rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy field reference #1027

Browse Source
This commit is contained in:
J-Jamet
2021-08-28 13:45:35 +02:00
parent cf0f665b14
commit 0fa0cac9e6
5 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt
View File

@@ -127,9 +127,16 @@ class TextFieldView @JvmOverloads constructor(context: Context,
showButton.apply {
id = showButtonId
layoutParams = (layoutParams as LayoutParams?).also {
it?.addRule(LEFT_OF, copyButtonId)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it?.addRule(START_OF, copyButtonId)
if (copyButton.isVisible) {
it?.addRule(LEFT_OF, copyButtonId)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it?.addRule(START_OF, copyButtonId)
}
} else {
it?.addRule(ALIGN_PARENT_RIGHT)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it?.addRule(ALIGN_PARENT_END)
}
}
}
}
@@ -219,6 +226,7 @@ class TextFieldView @JvmOverloads constructor(context: Context,
changeProtectedValueParameters()
}
changeProtectedValueParameters()
invalidate()
}
private fun changeProtectedValueParameters() {
@@ -288,10 +296,15 @@ class TextFieldView @JvmOverloads constructor(context: Context,
}
}
}
invalidate()
}
fun setCopyButtonClickListener(onActionClickListener: OnClickListener?) {
setOnActionClickListener(onActionClickListener, null)
fun setCopyButtonClickListener(onActionClickListener: ((label: String, value: String) -> Unit)?) {
val clickListener = if (onActionClickListener != null)
OnClickListener { onActionClickListener.invoke(label, value) }
else
null
setOnActionClickListener(clickListener, null)
}
override fun setOnActionClickListener(
@@ -300,6 +313,7 @@ class TextFieldView @JvmOverloads constructor(context: Context,
) {
copyButton.setOnClickListener(onActionClickListener)
copyButton.isVisible = onActionClickListener != null
invalidate()
}
override var isFieldVisible: Boolean
@@ -310,6 +324,11 @@ class TextFieldView @JvmOverloads constructor(context: Context,
isVisible = value
}
override fun invalidate() {
super.invalidate()
buildViews()
}
enum class ButtonState {
ACTIVATE, DEACTIVATE, GONE
}