Add trailing icons for sends (#675)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent c7abbd17dc
commit a1e55297e9
8 changed files with 145 additions and 3 deletions
@@ -25,6 +25,7 @@ import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFl
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.IconData
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
import com.x8bit.bitwarden.ui.util.isProgressBar
@@ -641,6 +642,28 @@ private fun createDisplayItem(number: Int): VaultItemListingState.DisplayItem =
title = "mockTitle-$number",
subtitle = "mockSubtitle-$number",
iconData = IconData.Local(R.drawable.ic_card_item),
extraIconList = listOf(
IconRes(
iconRes = R.drawable.ic_send_disabled,
contentDescription = R.string.disabled.asText(),
),
IconRes(
iconRes = R.drawable.ic_send_password,
contentDescription = R.string.password.asText(),
),
IconRes(
iconRes = R.drawable.ic_send_max_access_count_reached,
contentDescription = R.string.maximum_access_count_reached.asText(),
),
IconRes(
iconRes = R.drawable.ic_send_expired,
contentDescription = R.string.expired.asText(),
),
IconRes(
iconRes = R.drawable.ic_send_pending_delete,
contentDescription = R.string.pending_delete.asText(),
),
),
overflowOptions = listOf(
VaultItemListingState.DisplayItem.OverflowItem(
title = R.string.edit.asText(),
@@ -36,9 +36,17 @@ import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertFalse
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
import java.time.Clock
import java.time.Instant
import java.time.ZoneOffset
class VaultItemListingViewModelTest : BaseViewModelTest() {
private val clock: Clock = Clock.fixed(
Instant.parse("2023-10-27T12:00:00Z"),
ZoneOffset.UTC,
)
private val clipboardManager: BitwardenClipboardManager = mockk()
private val mutableVaultDataStateFlow =
@@ -636,6 +644,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
): VaultItemListingViewModel =
VaultItemListingViewModel(
savedStateHandle = savedStateHandle,
clock = clock,
clipboardManager = clipboardManager,
vaultRepository = vaultRepository,
environmentRepository = environmentRepository,
@@ -17,9 +17,17 @@ import io.mockk.mockkStatic
import io.mockk.unmockkStatic
import org.junit.Assert.assertEquals
import org.junit.Test
import java.time.Clock
import java.time.Instant
import java.time.ZoneOffset
class VaultItemListingDataExtensionsTest {
private val clock: Clock = Clock.fixed(
Instant.parse("2023-10-27T12:00:00Z"),
ZoneOffset.UTC,
)
@Test
@Suppress("MaxLineLength")
fun `determineListingPredicate should return the correct predicate for non trash Login cipherView`() {
@@ -361,6 +369,7 @@ class VaultItemListingDataExtensionsTest {
val result = sendViewList.toViewState(
baseWebSendUrl = Environment.Us.environmentUrlData.baseWebSendUrl,
clock = clock,
)
assertEquals(
@@ -5,6 +5,7 @@ import com.bitwarden.core.SendType
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.IconData
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingsAction
@@ -25,6 +26,7 @@ fun createMockDisplayItemForCipher(
"https://vault.bitwarden.com/icons/www.mockuri.com/icon.png",
fallbackIconRes = R.drawable.ic_login_item,
),
extraIconList = emptyList(),
overflowOptions = emptyList(),
)
}
@@ -35,6 +37,7 @@ fun createMockDisplayItemForCipher(
title = "mockName-$number",
subtitle = null,
iconData = IconData.Local(R.drawable.ic_secure_note_item),
extraIconList = emptyList(),
overflowOptions = emptyList(),
)
}
@@ -45,6 +48,7 @@ fun createMockDisplayItemForCipher(
title = "mockName-$number",
subtitle = "er-$number",
iconData = IconData.Local(R.drawable.ic_card_item),
extraIconList = emptyList(),
overflowOptions = emptyList(),
)
}
@@ -55,6 +59,7 @@ fun createMockDisplayItemForCipher(
title = "mockName-$number",
subtitle = "mockFirstName-${number}mockLastName-$number",
iconData = IconData.Local(R.drawable.ic_identity_item),
extraIconList = emptyList(),
overflowOptions = emptyList(),
)
}
@@ -75,6 +80,16 @@ fun createMockDisplayItemForSend(
title = "mockName-$number",
subtitle = "2023-10-27T12:00:00Z",
iconData = IconData.Local(R.drawable.ic_send_file),
extraIconList = listOf(
IconRes(
iconRes = R.drawable.ic_send_password,
contentDescription = R.string.password.asText(),
),
IconRes(
iconRes = R.drawable.ic_send_max_access_count_reached,
contentDescription = R.string.maximum_access_count_reached.asText(),
),
),
overflowOptions = listOfNotNull(
VaultItemListingState.DisplayItem.OverflowItem(
title = R.string.edit.asText(),
@@ -112,6 +127,16 @@ fun createMockDisplayItemForSend(
title = "mockName-$number",
subtitle = "2023-10-27T12:00:00Z",
iconData = IconData.Local(R.drawable.ic_send_text),
extraIconList = listOf(
IconRes(
iconRes = R.drawable.ic_send_password,
contentDescription = R.string.password.asText(),
),
IconRes(
iconRes = R.drawable.ic_send_max_access_count_reached,
contentDescription = R.string.maximum_access_count_reached.asText(),
),
),
overflowOptions = listOfNotNull(
VaultItemListingState.DisplayItem.OverflowItem(
title = R.string.edit.asText(),