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

Merge branch 'develop' into feature/Passkeys

Browse Source
This commit is contained in:
J-Jamet
2025-09-01 19:12:15 +02:00
parent c861fe790c 5e4ee167fc
commit b7f9690a38
71 changed files with 362 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,13 +62,12 @@ open class TextFieldView @JvmOverloads constructor(context: Context,
4f,
resources.displayMetrics
).toInt()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it.marginStart = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP,
4f,
resources.displayMetrics
).toInt()
}
it.marginStart = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP,
4f,
resources.displayMetrics
).toInt()
}
}
protected val valueView = AppCompatTextView(context).apply {
@@ -87,13 +86,11 @@ open class TextFieldView @JvmOverloads constructor(context: Context,
8f,
resources.displayMetrics
).toInt()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it.marginStart = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP,
8f,
resources.displayMetrics
).toInt()
}
it.marginStart = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP,
8f,
resources.displayMetrics
).toInt()
}
setTextIsSelectable(true)
}
@@ -127,9 +124,7 @@ open class TextFieldView @JvmOverloads constructor(context: Context,
id = copyButtonId
layoutParams = (layoutParams as LayoutParams?)?.also {
it.addRule(ALIGN_PARENT_RIGHT)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it.addRule(ALIGN_PARENT_END)
}
it.addRule(ALIGN_PARENT_END)
}
}
showButton.apply {
@@ -137,14 +132,14 @@ open class TextFieldView @JvmOverloads constructor(context: Context,
layoutParams = (layoutParams as LayoutParams?)?.also {
if (copyButton.isVisible) {
it.addRule(LEFT_OF, copyButtonId)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it.addRule(START_OF, copyButtonId)
}
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)
}
it.addRule(ALIGN_PARENT_END)
}
}
}
@@ -152,18 +147,14 @@ open class TextFieldView @JvmOverloads constructor(context: Context,
id = labelViewId
layoutParams = (layoutParams as LayoutParams?)?.also {
it.addRule(LEFT_OF, showButtonId)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it.addRule(START_OF, showButtonId)
}
it.addRule(START_OF, showButtonId)
}
}
valueView.apply {
id = valueViewId
layoutParams = (layoutParams as LayoutParams?)?.also {
it.addRule(LEFT_OF, showButtonId)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
it.addRule(START_OF, showButtonId)
}
it.addRule(START_OF, showButtonId)
it.addRule(BELOW, labelViewId)
}
}