mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-02-18 21:09:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix deletion date formatting (#704)

Browse source
This commit is contained in:
David Perez 2024-01-21 20:46:09 -06:00 • committed by Álison Fernandes
parent d706a20211
commit 0bfb9a24dc
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt
View file

@ -9,12 +9,15 @@ import com.bitwarden.core.SendType
import com.bitwarden.core.SendView import com.bitwarden.core.SendView
import com.x8bit.bitwarden.R import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.components.model.IconData import com.x8bit.bitwarden.ui.platform.components.model.IconData
import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern
import com.x8bit.bitwarden.ui.tools.feature.send.util.toLabelIcons import com.x8bit.bitwarden.ui.tools.feature.send.util.toLabelIcons
import com.x8bit.bitwarden.ui.tools.feature.send.util.toOverflowActions import com.x8bit.bitwarden.ui.tools.feature.send.util.toOverflowActions
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState
import com.x8bit.bitwarden.ui.vault.feature.vault.util.toLoginIconData import com.x8bit.bitwarden.ui.vault.feature.vault.util.toLoginIconData
import java.time.Clock import java.time.Clock
private const val DELETION_DATE_PATTERN: String = "MMM d, uuuu, hh:mm a"
/** /**
* Determines a predicate to filter a list of [CipherView] based on the * Determines a predicate to filter a list of [CipherView] based on the
* [VaultItemListingState.ItemListingType]. * [VaultItemListingState.ItemListingType].
@ -197,7 +200,7 @@ private fun SendView.toDisplayItem(
VaultItemListingState.DisplayItem( VaultItemListingState.DisplayItem(
id = id.orEmpty(), id = id.orEmpty(),
title = name, title = name,
subtitle = deletionDate.toString(), subtitle = deletionDate.toFormattedPattern(DELETION_DATE_PATTERN, clock.zone),
iconData = IconData.Local( iconData = IconData.Local(
iconRes = when (type) { iconRes = when (type) {
SendType.TEXT -> R.drawable.ic_send_text SendType.TEXT -> R.drawable.ic_send_text

4
app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt
View file

@ -78,7 +78,7 @@ fun createMockDisplayItemForSend(
VaultItemListingState.DisplayItem( VaultItemListingState.DisplayItem(
id = "mockId-$number", id = "mockId-$number",
title = "mockName-$number", title = "mockName-$number",
subtitle = "2023-10-27T12:00:00Z", subtitle = "Oct 27, 2023, 12:00 PM",
iconData = IconData.Local(R.drawable.ic_send_file), iconData = IconData.Local(R.drawable.ic_send_file),
extraIconList = listOf( extraIconList = listOf(
IconRes( IconRes(
@ -108,7 +108,7 @@ fun createMockDisplayItemForSend(
VaultItemListingState.DisplayItem( VaultItemListingState.DisplayItem(
id = "mockId-$number", id = "mockId-$number",
title = "mockName-$number", title = "mockName-$number",
subtitle = "2023-10-27T12:00:00Z", subtitle = "Oct 27, 2023, 12:00 PM",
iconData = IconData.Local(R.drawable.ic_send_text), iconData = IconData.Local(R.drawable.ic_send_text),
extraIconList = listOf( extraIconList = listOf(
IconRes( IconRes(