diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/model/SendStatusIcon.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/model/SendStatusIcon.kt index 7271c4bb8e..43c677f024 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/model/SendStatusIcon.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/model/SendStatusIcon.kt @@ -28,4 +28,8 @@ enum class SendStatusIcon( iconRes = R.drawable.ic_send_max_access_count_reached, contentDescription = R.string.maximum_access_count_reached.asText(), ), + PENDING_DELETE( + iconRes = R.drawable.ic_send_pending_delete, + contentDescription = R.string.pending_delete.asText(), + ), } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt index f9f1fbd879..83e8ca8acd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensions.kt @@ -35,16 +35,19 @@ private fun List.toSendContent(): SendState.ViewState.Content { SendType.FILE -> SendState.ViewState.Content.SendItem.Type.FILE }, iconList = listOfNotNull( - SendStatusIcon.EXPIRED.takeIf { - sendView.expirationDate?.isBefore(Instant.now()) == true - }, + SendStatusIcon.DISABLED.takeIf { sendView.disabled }, sendView.password?.let { SendStatusIcon.PASSWORD }, SendStatusIcon.MAX_ACCESS_COUNT_REACHED.takeIf { sendView.maxAccessCount?.let { maxCount -> sendView.accessCount >= maxCount } == true }, - SendStatusIcon.DISABLED.takeIf { sendView.disabled }, + SendStatusIcon.EXPIRED.takeIf { + sendView.expirationDate?.isBefore(Instant.now()) == true + }, + SendStatusIcon.PENDING_DELETE.takeIf { + sendView.deletionDate.isBefore(Instant.now()) + }, ), ) } diff --git a/app/src/main/res/drawable/ic_send_pending_delete.xml b/app/src/main/res/drawable/ic_send_pending_delete.xml new file mode 100644 index 0000000000..5b7a210fea --- /dev/null +++ b/app/src/main/res/drawable/ic_send_pending_delete.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt index 51d9a53a3b..3637a28694 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/util/SendDataExtensionsTest.kt @@ -55,9 +55,10 @@ class SendDataExtensionsTest { deletionDate = "Oct 27, 2023, 12:00 PM", type = SendState.ViewState.Content.SendItem.Type.FILE, iconList = listOf( - SendStatusIcon.EXPIRED, SendStatusIcon.PASSWORD, SendStatusIcon.MAX_ACCESS_COUNT_REACHED, + SendStatusIcon.EXPIRED, + SendStatusIcon.PENDING_DELETE, ), ), SendState.ViewState.Content.SendItem( @@ -66,9 +67,10 @@ class SendDataExtensionsTest { deletionDate = "Oct 27, 2023, 12:00 PM", type = SendState.ViewState.Content.SendItem.Type.TEXT, iconList = listOf( - SendStatusIcon.EXPIRED, SendStatusIcon.PASSWORD, SendStatusIcon.MAX_ACCESS_COUNT_REACHED, + SendStatusIcon.EXPIRED, + SendStatusIcon.PENDING_DELETE, ), ), ),