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 dateTime type

Browse Source
This commit is contained in:
J-Jamet
2021-07-06 19:12:21 +02:00
parent b8aea1f97a
commit 0d2ba54c10
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditView.kt
View File

@@ -56,20 +56,19 @@ class DateTimeEditView @JvmOverloads constructor(context: Context,
setOnDateClickListener?.invoke(dateTime)
}
entryExpiresCheckBox.setOnCheckedChangeListener { _, isChecked ->
mDateTime = if (isChecked) {
DateInstant.IN_ONE_MONTH_DATE_TIME
} else {
DateInstant.NEVER_EXPIRES
}
assignExpiresDateText()
defineDateTimeAfterCheckBoxChange(isChecked)
}
}
private fun assignExpiresDateText() {
entryExpiresTextView.text = if (entryExpiresCheckBox.isChecked) {
mDateTime.getDateTimeString(resources)
private fun defineDateTimeAfterCheckBoxChange(isChecked: Boolean) {
dateTime = if (isChecked) {
when (mDateTime.type) {
DateInstant.Type.DATE_TIME -> DateInstant.IN_ONE_MONTH_DATE_TIME
DateInstant.Type.DATE -> DateInstant.IN_ONE_MONTH_DATE
DateInstant.Type.TIME -> DateInstant.IN_ONE_HOUR_TIME
}
} else {
resources.getString(R.string.never)
DateInstant.NEVER_EXPIRES
}
}
@@ -94,15 +93,8 @@ class DateTimeEditView @JvmOverloads constructor(context: Context,
return entryExpiresCheckBox.isChecked
}
set(value) {
if (!value) {
mDateTime = when (mDateTime.type) {
DateInstant.Type.DATE_TIME -> DateInstant.IN_ONE_MONTH_DATE_TIME
DateInstant.Type.DATE -> DateInstant.IN_ONE_MONTH_DATE
DateInstant.Type.TIME -> DateInstant.IN_ONE_HOUR_TIME
}
}
entryExpiresCheckBox.isChecked = value
assignExpiresDateText()
defineDateTimeAfterCheckBoxChange(value)
}
/**
@@ -117,7 +109,11 @@ class DateTimeEditView @JvmOverloads constructor(context: Context,
}
set(value) {
mDateTime = DateInstant(value.date, mDateTime.type)
assignExpiresDateText()
entryExpiresTextView.text = if (entryExpiresCheckBox.isChecked) {
mDateTime.getDateTimeString(resources)
} else {
resources.getString(R.string.never)
}
}
override var isFieldVisible: Boolean