mirror of
https://github.com/bitwarden/android.git
synced 2026-10-19 01:31:02 -05:00
[PM-40529] feat: Add 14-day option to Send deletion date dropdown (#7240)
This commit is contained in:
1 parent
274594c2be
commit
898267f48b
3 files changed
+13
No files matched your search
+8
@@ -55,6 +55,8 @@ fun AddEditSendCustomDateChooser(
|
||||
CustomDeletionOption.TwoDays to CustomDeletionOption.TwoDays.getText(clock = clock)(),
|
||||
CustomDeletionOption.ThreeDays to CustomDeletionOption.ThreeDays.getText(clock = clock)(),
|
||||
CustomDeletionOption.SevenDays to CustomDeletionOption.SevenDays.getText(clock = clock)(),
|
||||
CustomDeletionOption.FourteenDays to
|
||||
CustomDeletionOption.FourteenDays.getText(clock = clock)(),
|
||||
CustomDeletionOption.ThirtyDays to CustomDeletionOption.ThirtyDays.getText(clock = clock)(),
|
||||
)
|
||||
var currentSelectionOption: CustomDeletionOption by rememberSaveable(originalSelectionOption) {
|
||||
@@ -134,6 +136,12 @@ private sealed class CustomDeletionOption : Parcelable {
|
||||
override fun getText(clock: Clock): Text = BitwardenString.seven_days.asText()
|
||||
}
|
||||
|
||||
@Parcelize
|
||||
data object FourteenDays : CustomDeletionOption() {
|
||||
override val offsetMillis: Long get() = 14.days.inWholeMilliseconds
|
||||
override fun getText(clock: Clock): Text = BitwardenString.fourteen_days.asText()
|
||||
}
|
||||
|
||||
@Parcelize
|
||||
data object ThirtyDays : CustomDeletionOption() {
|
||||
override val offsetMillis: Long get() = 30.days.inWholeMilliseconds
|
||||
|
||||
+4
@@ -78,6 +78,10 @@ private enum class DeletionOption(
|
||||
text = BitwardenString.seven_days.asText(),
|
||||
offsetMillis = 7.days.inWholeMilliseconds,
|
||||
),
|
||||
FOURTEEN_DAYS(
|
||||
text = BitwardenString.fourteen_days.asText(),
|
||||
offsetMillis = 14.days.inWholeMilliseconds,
|
||||
),
|
||||
THIRTY_DAYS(
|
||||
text = BitwardenString.thirty_days.asText(),
|
||||
offsetMillis = 30.days.inWholeMilliseconds,
|
||||
|
||||
@@ -502,6 +502,7 @@ Scanning will happen automatically.</string>
|
||||
<string name="two_days">2 days</string>
|
||||
<string name="three_days">3 days</string>
|
||||
<string name="seven_days">7 days</string>
|
||||
<string name="fourteen_days">14 days</string>
|
||||
<string name="thirty_days">30 days</string>
|
||||
<string name="custom">Custom</string>
|
||||
<string name="custom_timeout">Custom timeout</string>
|
||||
|
||||
Reference in new issue
Block a user