From 0cb8e369ae9826082006d56de8a83d1d7d6baffe Mon Sep 17 00:00:00 2001 From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:38:55 -0400 Subject: [PATCH] PM-12667 Update the names of the the existing icon assets to match with design language (#4040) --- .../data/autofill/model/AutofillCipher.kt | 4 +-- .../CompleteRegistrationScreen.kt | 2 +- .../ui/auth/feature/login/LoginScreen.kt | 2 +- .../MasterPasswordGuidanceScreen.kt | 2 +- .../PreventAccountLockoutScreen.kt | 2 +- .../StartRegistrationScreen.kt | 2 +- .../appbar/BitwardenMediumTopAppBar.kt | 2 +- .../action/BitwardenOverflowActionItem.kt | 2 +- .../button/BitwardenFilledButtonWithIcon.kt | 2 +- .../button/BitwardenFilledIconButton.kt | 2 +- .../BitwardenFilledTonalButtonWithIcon.kt | 2 +- .../button/BitwardenStandardIconButton.kt | 2 +- .../card/BitwardenActionCardSmall.kt | 2 +- .../dialog/BitwardenDateSelectButton.kt | 2 +- .../dialog/BitwardenTimeSelectButton.kt | 2 +- .../dropdown/BitwardenMultiSelectButton.kt | 4 +-- .../dropdown/EnvironmentSelector.kt | 2 +- .../field/BitwardenPasswordField.kt | 4 +-- .../field/BitwardenTextFieldWithActions.kt | 2 +- .../components/listitem/BitwardenGroupItem.kt | 4 +-- .../components/listitem/BitwardenListItem.kt | 4 +-- .../components/row/BitwardenRowOfActions.kt | 4 +-- .../toggle/BitwardenSwitchWithActions.kt | 2 +- .../search/util/SearchTypeDataExtensions.kt | 12 +++---- .../feature/settings/SettingsScreen.kt | 2 +- .../blockautofill/BlockAutoFillScreen.kt | 2 +- .../ui/tools/feature/send/SendContent.kt | 4 +-- .../ui/tools/feature/send/SendListItem.kt | 2 +- .../ui/tools/feature/send/SendViewModel.kt | 4 +-- .../feature/send/addsend/AddSendContent.kt | 4 +-- .../feature/send/model/SendStatusIcon.kt | 2 +- .../feature/addedit/VaultAddEditCardItems.kt | 2 +- .../addedit/VaultAddEditIdentityItems.kt | 2 +- .../feature/addedit/VaultAddEditLoginItems.kt | 2 +- .../addedit/VaultAddEditSecureNotesItems.kt | 2 +- .../ui/vault/feature/item/VaultItemScreen.kt | 2 +- .../itemlisting/VaultItemListingContent.kt | 2 +- .../util/VaultItemListingDataExtensions.kt | 12 +++---- .../ui/vault/feature/vault/VaultContent.kt | 12 +++---- .../vault/feature/vault/VaultEntryListItem.kt | 2 +- .../ui/vault/feature/vault/VaultFilter.kt | 2 +- .../ui/vault/feature/vault/VaultViewModel.kt | 8 ++--- .../feature/vault/util/VaultDataExtensions.kt | 4 +-- .../verificationcode/VerificationCodeItem.kt | 2 +- .../VerificationCodeViewModel.kt | 2 +- .../ui/vault/model/VaultTrailingIcon.kt | 4 +-- ...gin_item_passkey.xml => ic_bw_passkey.xml} | 0 ...ic_expand_down.xml => ic_chevron_down.xml} | 0 ...navigate_next.xml => ic_chevron_right.xml} | 0 .../{ic_expand_up.xml => ic_chevron_up.xml} | 0 .../{access_time.xml => ic_clock.xml} | 0 .../{ic_collection.xml => ic_collections.xml} | 0 ...lect_dropdown.xml => ic_down_triangle.xml} | 0 ...izontal.xml => ic_ellipsis_horizontal.xml} | 0 .../{ic_more.xml => ic_ellipsis_vertical.xml} | 0 .../{ic_visibility.xml => ic_eye.xml} | 0 ...ic_visibility_off.xml => ic_eye_slash.xml} | 0 .../{ic_send_file.xml => ic_file.xml} | 0 .../{ic_send_text.xml => ic_file_text.xml} | 0 .../{ic_login_item.xml => ic_globe.xml} | 0 .../{ic_identity_item.xml => ic_id_card.xml} | 0 .../{ic_send_password.xml => ic_key.xml} | 0 .../drawable/{ic_device.xml => ic_mobile.xml} | 0 .../{ic_secure_note_item.xml => ic_note.xml} | 0 .../{ic_attachment.xml => ic_paperclip.xml} | 0 .../{ic_card_item.xml => ic_payment_card.xml} | 0 .../drawable/{ic_edit.xml => ic_pencil.xml} | 0 .../{ic_edit_alt.xml => ic_pencil_square.xml} | 0 ...{ic_tooltip.xml => ic_question_circle.xml} | 0 ...small.xml => ic_question_circle_small.xml} | 0 .../InlinePresentationSpecExtensionsTest.kt | 8 ++--- .../feature/search/util/SearchUtil.kt | 32 +++++++++---------- .../itemlisting/VaultItemListingScreenTest.kt | 4 +-- .../VaultItemListingViewModelTest.kt | 4 +-- .../VaultItemListingDataExtensionsTest.kt | 4 +-- .../util/VaultItemListingDataUtil.kt | 32 +++++++++---------- .../vault/util/VaultDataExtensionsTest.kt | 12 +++---- 77 files changed, 123 insertions(+), 123 deletions(-) rename app/src/main/res/drawable/{ic_login_item_passkey.xml => ic_bw_passkey.xml} (100%) rename app/src/main/res/drawable/{ic_expand_down.xml => ic_chevron_down.xml} (100%) rename app/src/main/res/drawable/{ic_navigate_next.xml => ic_chevron_right.xml} (100%) rename app/src/main/res/drawable/{ic_expand_up.xml => ic_chevron_up.xml} (100%) rename app/src/main/res/drawable/{access_time.xml => ic_clock.xml} (100%) rename app/src/main/res/drawable/{ic_collection.xml => ic_collections.xml} (100%) rename app/src/main/res/drawable/{ic_region_select_dropdown.xml => ic_down_triangle.xml} (100%) rename app/src/main/res/drawable/{ic_more_horizontal.xml => ic_ellipsis_horizontal.xml} (100%) rename app/src/main/res/drawable/{ic_more.xml => ic_ellipsis_vertical.xml} (100%) rename app/src/main/res/drawable/{ic_visibility.xml => ic_eye.xml} (100%) rename app/src/main/res/drawable/{ic_visibility_off.xml => ic_eye_slash.xml} (100%) rename app/src/main/res/drawable/{ic_send_file.xml => ic_file.xml} (100%) rename app/src/main/res/drawable/{ic_send_text.xml => ic_file_text.xml} (100%) rename app/src/main/res/drawable/{ic_login_item.xml => ic_globe.xml} (100%) rename app/src/main/res/drawable/{ic_identity_item.xml => ic_id_card.xml} (100%) rename app/src/main/res/drawable/{ic_send_password.xml => ic_key.xml} (100%) rename app/src/main/res/drawable/{ic_device.xml => ic_mobile.xml} (100%) rename app/src/main/res/drawable/{ic_secure_note_item.xml => ic_note.xml} (100%) rename app/src/main/res/drawable/{ic_attachment.xml => ic_paperclip.xml} (100%) rename app/src/main/res/drawable/{ic_card_item.xml => ic_payment_card.xml} (100%) rename app/src/main/res/drawable/{ic_edit.xml => ic_pencil.xml} (100%) rename app/src/main/res/drawable/{ic_edit_alt.xml => ic_pencil_square.xml} (100%) rename app/src/main/res/drawable/{ic_tooltip.xml => ic_question_circle.xml} (100%) rename app/src/main/res/drawable/{ic_tooltip_small.xml => ic_question_circle_small.xml} (100%) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/model/AutofillCipher.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/model/AutofillCipher.kt index f1d2a665c..bd7524ead 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/model/AutofillCipher.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/model/AutofillCipher.kt @@ -48,7 +48,7 @@ sealed class AutofillCipher { val number: String, ) : AutofillCipher() { override val iconRes: Int - @DrawableRes get() = R.drawable.ic_card_item + @DrawableRes get() = R.drawable.ic_payment_card override val isTotpEnabled: Boolean get() = false @@ -67,6 +67,6 @@ sealed class AutofillCipher { val username: String, ) : AutofillCipher() { override val iconRes: Int - @DrawableRes get() = R.drawable.ic_login_item + @DrawableRes get() = R.drawable.ic_globe } } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt index c2337905c..102a162fa 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt @@ -213,7 +213,7 @@ private fun CompleteRegistrationContent( ) Spacer(modifier = Modifier.height(24.dp)) BitwardenActionCardSmall( - actionIcon = rememberVectorPainter(id = R.drawable.ic_tooltip), + actionIcon = rememberVectorPainter(id = R.drawable.ic_question_circle), actionText = stringResource(id = R.string.what_makes_a_password_strong), callToActionText = stringResource(id = R.string.learn_more), onCardClicked = handler.onMakeStrongPassword, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt index 1d708a4fa..0b9eb75e5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt @@ -275,7 +275,7 @@ private fun LoginScreenContent( if (state.shouldShowLoginWithDevice) { BitwardenOutlinedButtonWithIcon( label = stringResource(id = R.string.log_in_with_device), - icon = rememberVectorPainter(id = R.drawable.ic_device), + icon = rememberVectorPainter(id = R.drawable.ic_mobile), onClick = onLoginWithDeviceClick, modifier = Modifier .testTag("LogInWithAnotherDeviceButton") diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt index b26ea8248..d1c339b16 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt @@ -168,7 +168,7 @@ private fun TryGeneratorCard( .fillMaxWidth(), trailingContent = { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_navigate_next), + painter = rememberVectorPainter(id = R.drawable.ic_chevron_right), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, modifier = Modifier diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt index f6d5a3dac..5be5caadf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt @@ -131,7 +131,7 @@ private fun NeverLoseAccessContent( AccountRecoveryTipRow( title = stringResource(R.string.write_your_password_down), description = stringResource(R.string.keep_it_secret_keep_it_safe), - icon = rememberVectorPainter(id = R.drawable.ic_edit), + icon = rememberVectorPainter(id = R.drawable.ic_pencil), modifier = Modifier.padding(horizontal = 16.dp), ) Spacer(modifier = Modifier.height(16.dp)) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt index 32c6b2ea6..867e1188f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt @@ -264,7 +264,7 @@ private fun StartRegistrationContent( ) if (isNewOnboardingUiEnabled) { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip_small, + vectorIconRes = R.drawable.ic_question_circle_small, contentDescription = stringResource(R.string.help_with_server_geolocations), onClick = handler.onServerGeologyHelpClick, contentColor = BitwardenTheme.colorScheme.icon.secondary, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenMediumTopAppBar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenMediumTopAppBar.kt index 1ac2d234d..9302c2629 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenMediumTopAppBar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/BitwardenMediumTopAppBar.kt @@ -67,7 +67,7 @@ private fun BitwardenMediumTopAppBar_preview() { ), actions = { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_more, + vectorIconRes = R.drawable.ic_ellipsis_vertical, contentDescription = "", onClick = { }, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt index f2d05a17e..151301144 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/appbar/action/BitwardenOverflowActionItem.kt @@ -52,7 +52,7 @@ fun BitwardenOverflowActionItem( modifier = modifier, ) { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_more, + vectorIconRes = R.drawable.ic_ellipsis_vertical, contentDescription = stringResource(id = R.string.more), onClick = { isOverflowMenuVisible = !isOverflowMenuVisible }, modifier = Modifier.testTag(tag = "HeaderBarOptionsButton"), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButtonWithIcon.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButtonWithIcon.kt index 20baab60f..1571546b5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButtonWithIcon.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButtonWithIcon.kt @@ -64,7 +64,7 @@ private fun BitwardenFilledButtonWithIcon_preview() { BitwardenTheme { BitwardenFilledButtonWithIcon( label = "Test Button", - icon = rememberVectorPainter(id = R.drawable.ic_tooltip), + icon = rememberVectorPainter(id = R.drawable.ic_question_circle), onClick = {}, isEnabled = true, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt index 3b16f627f..1f8564e9d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt @@ -47,7 +47,7 @@ fun BitwardenFilledIconButton( private fun BitwardenFilledIconButton_preview() { BitwardenTheme { BitwardenFilledIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = "Sample Icon", onClick = {}, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButtonWithIcon.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButtonWithIcon.kt index 6549f8105..9ee84ecef 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButtonWithIcon.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledTonalButtonWithIcon.kt @@ -62,7 +62,7 @@ private fun BitwardenFilledTonalButtonWithIcon_preview() { BitwardenTheme { BitwardenFilledTonalButtonWithIcon( label = "Sample Text", - icon = rememberVectorPainter(id = R.drawable.ic_tooltip), + icon = rememberVectorPainter(id = R.drawable.ic_question_circle), onClick = {}, modifier = Modifier.padding(horizontal = 16.dp), ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenStandardIconButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenStandardIconButton.kt index 35c66db24..6284302a1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenStandardIconButton.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenStandardIconButton.kt @@ -78,7 +78,7 @@ fun BitwardenStandardIconButton( private fun BitwardenStandardIconButton_preview() { BitwardenTheme { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = "Sample Icon", onClick = {}, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenActionCardSmall.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenActionCardSmall.kt index bb705a934..1da6f1d97 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenActionCardSmall.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenActionCardSmall.kt @@ -109,7 +109,7 @@ private fun ActionCardSmallWithTrailingIcon_preview() { onCardClicked = {}, trailingContent = { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_navigate_next), + painter = rememberVectorPainter(id = R.drawable.ic_chevron_right), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt index 1948ed40f..f9167f407 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenDateSelectButton.kt @@ -92,7 +92,7 @@ fun BitwardenDateSelectButton( enabled = shouldShowDialog, trailingIcon = { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_region_select_dropdown), + painter = rememberVectorPainter(id = R.drawable.ic_down_triangle), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt index 4c79ef90a..9ad60278f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dialog/BitwardenTimeSelectButton.kt @@ -77,7 +77,7 @@ fun BitwardenTimeSelectButton( enabled = shouldShowDialog, trailingIcon = { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_region_select_dropdown), + painter = rememberVectorPainter(id = R.drawable.ic_down_triangle), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/BitwardenMultiSelectButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/BitwardenMultiSelectButton.kt index 12a0bdcb5..262da8b39 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/BitwardenMultiSelectButton.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/BitwardenMultiSelectButton.kt @@ -111,7 +111,7 @@ fun BitwardenMultiSelectButton( tooltip?.let { Spacer(modifier = Modifier.width(3.dp)) BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip_small, + vectorIconRes = R.drawable.ic_question_circle_small, contentDescription = it.contentDescription, onClick = it.onClick, isEnabled = isEnabled, @@ -126,7 +126,7 @@ fun BitwardenMultiSelectButton( enabled = shouldShowDialog, trailingIcon = { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_region_select_dropdown), + painter = rememberVectorPainter(id = R.drawable.ic_down_triangle), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt index 4d0089b06..86895e842 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt @@ -83,7 +83,7 @@ fun EnvironmentSelector( modifier = Modifier.padding(end = 8.dp), ) Icon( - painter = rememberVectorPainter(id = R.drawable.ic_region_select_dropdown), + painter = rememberVectorPainter(id = R.drawable.ic_down_triangle), contentDescription = stringResource(id = R.string.region), tint = BitwardenTheme.colorScheme.icon.secondary, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt index c54ca94e4..3f2203453 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt @@ -103,9 +103,9 @@ fun BitwardenPasswordField( BitwardenStandardIconButton( modifier = Modifier.semantics { showPasswordTestTag?.let { testTag = it } }, vectorIconRes = if (showPassword) { - R.drawable.ic_visibility_off + R.drawable.ic_eye_slash } else { - R.drawable.ic_visibility + R.drawable.ic_eye }, contentDescription = stringResource( id = if (showPassword) R.string.hide else R.string.show, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt index d4209e8c3..ff05ee34c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextFieldWithActions.kt @@ -98,7 +98,7 @@ private fun BitwardenTextFieldWithActions_preview() { onValueChange = {}, actions = { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_tooltip), + painter = rememberVectorPainter(id = R.drawable.ic_question_circle), contentDescription = "Action 1", ) Icon( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenGroupItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenGroupItem.kt index 9842613e9..a19aa1309 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenGroupItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenGroupItem.kt @@ -91,7 +91,7 @@ fun BitwardenGroupItem( ) Icon( - painter = rememberVectorPainter(id = R.drawable.ic_navigate_next), + painter = rememberVectorPainter(id = R.drawable.ic_chevron_right), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, modifier = Modifier @@ -108,7 +108,7 @@ private fun BitwardenGroupItem_preview() { BitwardenGroupItem( label = "Sample Label", supportingLabel = "5", - startIcon = rememberVectorPainter(id = R.drawable.ic_send_text), + startIcon = rememberVectorPainter(id = R.drawable.ic_file_text), startIconTestTag = "Test Tag", onClick = {}, ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt index 10cdb9f12..841c790e5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/listitem/BitwardenListItem.kt @@ -152,7 +152,7 @@ fun BitwardenListItem( if (selectionDataList.isNotEmpty()) { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_more_horizontal, + vectorIconRes = R.drawable.ic_ellipsis_horizontal, contentDescription = stringResource(id = R.string.options), onClick = { shouldShowDialog = true }, modifier = Modifier.semantics { optionsTestTag?.let { testTag = it } }, @@ -196,7 +196,7 @@ private fun BitwardenListItem_preview() { BitwardenListItem( label = "Sample Label", supportingLabel = "Jan 3, 2024, 10:35 AM", - startIcon = IconData.Local(R.drawable.ic_send_text), + startIcon = IconData.Local(R.drawable.ic_file_text), onClick = {}, selectionDataList = persistentListOf(), ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt index 8ef731de0..c5e2fb86b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt @@ -44,12 +44,12 @@ private fun BitwardenRowOfIconButtons_preview() { BitwardenTheme { BitwardenRowOfActions { Icon( - painter = rememberVectorPainter(id = R.drawable.ic_tooltip), + painter = rememberVectorPainter(id = R.drawable.ic_question_circle), contentDescription = "Icon 1", modifier = Modifier.size(24.dp), ) Icon( - painter = rememberVectorPainter(id = R.drawable.ic_tooltip), + painter = rememberVectorPainter(id = R.drawable.ic_question_circle), contentDescription = "Icon 2", modifier = Modifier.size(24.dp), ) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitchWithActions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitchWithActions.kt index d5eb714a8..e2699f06a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitchWithActions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitchWithActions.kt @@ -77,7 +77,7 @@ private fun BitwardenSwitchWithActions_preview() { onCheckedChange = {}, actions = { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = stringResource( id = R.string.master_password_re_prompt_help, ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt index 880c9001b..93c7b21aa 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchTypeDataExtensions.kt @@ -243,10 +243,10 @@ private fun CipherView.toIconData( @get:DrawableRes private val CipherType.iconRes: Int get() = when (this) { - CipherType.LOGIN -> R.drawable.ic_login_item - CipherType.SECURE_NOTE -> R.drawable.ic_secure_note_item - CipherType.CARD -> R.drawable.ic_card_item - CipherType.IDENTITY -> R.drawable.ic_identity_item + CipherType.LOGIN -> R.drawable.ic_globe + CipherType.SECURE_NOTE -> R.drawable.ic_note + CipherType.CARD -> R.drawable.ic_payment_card + CipherType.IDENTITY -> R.drawable.ic_id_card } /** @@ -351,8 +351,8 @@ private fun SendView.toDisplayItem( subtitleTestTag = "SendDateLabel", iconData = IconData.Local( iconRes = when (type) { - SendType.TEXT -> R.drawable.ic_send_text - SendType.FILE -> R.drawable.ic_send_file + SendType.TEXT -> R.drawable.ic_file_text + SendType.FILE -> R.drawable.ic_file }, ), extraIconList = toLabelIcons(clock = clock), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt index 01e228cd2..1f3a49ff5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreen.kt @@ -161,7 +161,7 @@ private fun TrailingContent( Spacer(modifier = Modifier.width(12.dp)) } Icon( - painter = rememberVectorPainter(id = R.drawable.ic_navigate_next), + painter = rememberVectorPainter(id = R.drawable.ic_chevron_right), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, modifier = Modifier diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt index 560d6ea78..3ceadae80 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt @@ -287,7 +287,7 @@ private fun BlockAutoFillListItem( color = BitwardenTheme.colorScheme.text.primary, ) Icon( - painter = rememberVectorPainter(id = R.drawable.ic_edit_alt), + painter = rememberVectorPainter(id = R.drawable.ic_pencil_square), contentDescription = null, tint = BitwardenTheme.colorScheme.icon.primary, modifier = Modifier.size(24.dp), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendContent.kt index dec363181..69a6975da 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendContent.kt @@ -59,7 +59,7 @@ fun SendContent( BitwardenGroupItem( label = stringResource(id = R.string.type_text), supportingLabel = state.textTypeCount.toString(), - startIcon = rememberVectorPainter(id = R.drawable.ic_send_text), + startIcon = rememberVectorPainter(id = R.drawable.ic_file_text), onClick = sendHandlers.onTextTypeClick, modifier = Modifier .fillMaxWidth() @@ -72,7 +72,7 @@ fun SendContent( BitwardenGroupItem( label = stringResource(id = R.string.type_file), supportingLabel = state.fileTypeCount.toString(), - startIcon = rememberVectorPainter(id = R.drawable.ic_send_file), + startIcon = rememberVectorPainter(id = R.drawable.ic_file), onClick = sendHandlers.onFileTypeClick, modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt index f6172ce25..c5080adb2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendListItem.kt @@ -124,7 +124,7 @@ private fun SendListItem_preview() { SendListItem( label = "Sample Label", supportingLabel = "Jan 3, 2024, 10:35 AM", - startIcon = IconData.Local(R.drawable.ic_send_text), + startIcon = IconData.Local(R.drawable.ic_file_text), trailingLabelIcons = persistentListOf(), showMoreOptions = true, onClick = {}, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt index ca1e63505..1bbb8ecca 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt @@ -386,8 +386,8 @@ data class SendState( * Indicates the type of send this, a text or file. */ enum class Type(@DrawableRes val iconRes: Int) { - FILE(iconRes = R.drawable.ic_send_file), - TEXT(iconRes = R.drawable.ic_send_text), + FILE(iconRes = R.drawable.ic_file), + TEXT(iconRes = R.drawable.ic_file_text), } } } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt index 3536c14fb..f8e796136 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendContent.kt @@ -315,9 +315,9 @@ private fun AddSendOptions( Icon( painter = rememberVectorPainter( if (isExpanded) { - R.drawable.ic_expand_up + R.drawable.ic_chevron_up } else { - R.drawable.ic_expand_down + R.drawable.ic_chevron_down }, ), contentDescription = null, 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 658789c2a..3de4eccd8 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 @@ -19,7 +19,7 @@ enum class SendStatusIcon( testTag = "DisabledSendIcon", ), PASSWORD( - iconRes = R.drawable.ic_send_password, + iconRes = R.drawable.ic_key, contentDescription = R.string.password.asText(), testTag = "PasswordProtectedSendIcon", ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt index 8d1dfd84e..326e90ff8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt @@ -224,7 +224,7 @@ fun LazyListScope.vaultAddEditCardItems( .padding(horizontal = 16.dp), actions = { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = stringResource( id = R.string.master_password_re_prompt_help, ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt index 26407132b..1ccadb158 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditIdentityItems.kt @@ -325,7 +325,7 @@ fun LazyListScope.vaultAddEditIdentityItems( .padding(horizontal = 16.dp), actions = { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = stringResource( id = R.string.master_password_re_prompt_help, ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt index abfd8531d..eb8cba268 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt @@ -246,7 +246,7 @@ fun LazyListScope.vaultAddEditLoginItems( .padding(horizontal = 16.dp), actions = { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = stringResource( id = R.string.master_password_re_prompt_help, ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt index f690b21a1..7d04fd688 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditSecureNotesItems.kt @@ -104,7 +104,7 @@ fun LazyListScope.vaultAddEditSecureNotesItems( .padding(horizontal = 16.dp), actions = { BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_tooltip, + vectorIconRes = R.drawable.ic_question_circle, contentDescription = stringResource( id = R.string.master_password_re_prompt_help, ), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt index 43b0912ef..38965e384 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreen.kt @@ -241,7 +241,7 @@ fun VaultItemScreen( onClick = remember(viewModel) { { viewModel.trySendAction(VaultItemAction.Common.EditClick) } }, - painter = rememberVectorPainter(id = R.drawable.ic_edit), + painter = rememberVectorPainter(id = R.drawable.ic_pencil), contentDescription = stringResource(id = R.string.edit_item), modifier = Modifier .testTag(tag = "EditItemButton") diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt index 534811d29..f19835d54 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt @@ -128,7 +128,7 @@ fun VaultItemListingContent( items(state.displayCollectionList) { collection -> BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.ic_collection), + startIcon = rememberVectorPainter(id = R.drawable.ic_collections), label = collection.name, supportingLabel = collection.count.toString(), onClick = { collectionClick(collection.id) }, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt index ebe224af0..b003cd4b0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt @@ -397,8 +397,8 @@ private fun SendView.toDisplayItem( subtitleTestTag = "SendDateLabel", iconData = IconData.Local( iconRes = when (type) { - SendType.TEXT -> R.drawable.ic_send_text - SendType.FILE -> R.drawable.ic_send_file + SendType.TEXT -> R.drawable.ic_file_text + SendType.FILE -> R.drawable.ic_file }, ), iconTestTag = null, @@ -413,8 +413,8 @@ private fun SendView.toDisplayItem( @get:DrawableRes private val CipherType.iconRes: Int get() = when (this) { - CipherType.LOGIN -> R.drawable.ic_login_item - CipherType.SECURE_NOTE -> R.drawable.ic_secure_note_item - CipherType.CARD -> R.drawable.ic_card_item - CipherType.IDENTITY -> R.drawable.ic_identity_item + CipherType.LOGIN -> R.drawable.ic_globe + CipherType.SECURE_NOTE -> R.drawable.ic_note + CipherType.CARD -> R.drawable.ic_payment_card + CipherType.IDENTITY -> R.drawable.ic_id_card } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt index 4aa3e93ca..5a2f53570 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt @@ -49,7 +49,7 @@ fun VaultContent( item { BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.access_time), + startIcon = rememberVectorPainter(id = R.drawable.ic_clock), label = stringResource(id = R.string.verification_codes), supportingLabel = state.totpItemsCount.toString(), onClick = vaultHandlers.verificationCodesClick, @@ -135,7 +135,7 @@ fun VaultContent( item { BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.ic_login_item), + startIcon = rememberVectorPainter(id = R.drawable.ic_globe), startIconTestTag = "LoginCipherIcon", label = stringResource(id = R.string.type_login), supportingLabel = state.loginItemsCount.toString(), @@ -150,7 +150,7 @@ fun VaultContent( item { BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.ic_card_item), + startIcon = rememberVectorPainter(id = R.drawable.ic_payment_card), startIconTestTag = "CardCipherIcon", label = stringResource(id = R.string.type_card), supportingLabel = state.cardItemsCount.toString(), @@ -165,7 +165,7 @@ fun VaultContent( item { BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.ic_identity_item), + startIcon = rememberVectorPainter(id = R.drawable.ic_id_card), startIconTestTag = "IdentityCipherIcon", label = stringResource(id = R.string.type_identity), supportingLabel = state.identityItemsCount.toString(), @@ -180,7 +180,7 @@ fun VaultContent( item { BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.ic_secure_note_item), + startIcon = rememberVectorPainter(id = R.drawable.ic_note), startIconTestTag = "SecureNoteCipherIcon", label = stringResource(id = R.string.type_secure_note), supportingLabel = state.secureNoteItemsCount.toString(), @@ -299,7 +299,7 @@ fun VaultContent( items(state.collectionItems) { collection -> BitwardenGroupItem( - startIcon = rememberVectorPainter(id = R.drawable.ic_collection), + startIcon = rememberVectorPainter(id = R.drawable.ic_collections), label = collection.name, supportingLabel = collection.itemCount.toString(), onClick = { vaultHandlers.collectionClick(collection) }, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultEntryListItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultEntryListItem.kt index c666178e7..2b36e83bf 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultEntryListItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultEntryListItem.kt @@ -63,7 +63,7 @@ fun VaultEntryListItem( private fun VaultEntryListItem_preview() { BitwardenTheme { VaultEntryListItem( - startIcon = IconData.Local(R.drawable.ic_login_item), + startIcon = IconData.Local(R.drawable.ic_globe), startIconTestTag = "Test Tag", label = "Example Login", supportingLabel = "Username", diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt index 7fa69f3aa..e6ffcd553 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultFilter.kt @@ -91,7 +91,7 @@ fun VaultFilter( Spacer(modifier = Modifier.width(16.dp)) BitwardenStandardIconButton( - vectorIconRes = R.drawable.ic_more_horizontal, + vectorIconRes = R.drawable.ic_ellipsis_horizontal, contentDescription = stringResource(id = R.string.filter_by_vault), onClick = { shouldShowSelectionDialog = true }, modifier = Modifier.testTag(tag = "OpenOrgFilter"), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt index a34f948d6..4e5c3d965 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt @@ -819,7 +819,7 @@ data class VaultState( data class Login( override val id: String, override val name: Text, - override val startIcon: IconData = IconData.Local(R.drawable.ic_login_item), + override val startIcon: IconData = IconData.Local(R.drawable.ic_globe), override val startIconTestTag: String = "LoginCipherIcon", override val extraIconList: List = emptyList(), override val overflowOptions: List, @@ -839,7 +839,7 @@ data class VaultState( data class Card( override val id: String, override val name: Text, - override val startIcon: IconData = IconData.Local(R.drawable.ic_card_item), + override val startIcon: IconData = IconData.Local(R.drawable.ic_payment_card), override val startIconTestTag: String = "CardCipherIcon", override val extraIconList: List = emptyList(), override val overflowOptions: List, @@ -869,7 +869,7 @@ data class VaultState( data class Identity( override val id: String, override val name: Text, - override val startIcon: IconData = IconData.Local(R.drawable.ic_identity_item), + override val startIcon: IconData = IconData.Local(R.drawable.ic_id_card), override val startIconTestTag: String = "IdentityCipherIcon", override val extraIconList: List = emptyList(), override val overflowOptions: List, @@ -887,7 +887,7 @@ data class VaultState( data class SecureNote( override val id: String, override val name: Text, - override val startIcon: IconData = IconData.Local(R.drawable.ic_secure_note_item), + override val startIcon: IconData = IconData.Local(R.drawable.ic_note), override val startIconTestTag: String = "SecureNoteCipherIcon", override val extraIconList: List = emptyList(), override val overflowOptions: List, diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt index 4ea684c78..1cee834d3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensions.kt @@ -151,9 +151,9 @@ fun List?.toLoginIconData( usePasskeyDefaultIcon: Boolean, ): IconData { val defaultIconRes = if (usePasskeyDefaultIcon) { - R.drawable.ic_login_item_passkey + R.drawable.ic_bw_passkey } else { - R.drawable.ic_login_item + R.drawable.ic_globe } var uri = this diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt index 5eb3cfa33..780fbe843 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt @@ -127,7 +127,7 @@ fun VaultVerificationCodeItem( private fun VerificationCodeItem_preview() { BitwardenTheme { VaultVerificationCodeItem( - startIcon = IconData.Local(R.drawable.ic_login_item), + startIcon = IconData.Local(R.drawable.ic_globe), label = "Sample Label", supportingLabel = "Supporting Label", authCode = "1234567890".chunked(3).joinToString(" "), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt index 61cc10318..1b57c5746 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt @@ -417,7 +417,7 @@ data class VerificationCodeDisplayItem( val periodSeconds: Int, val authCode: String, val hideAuthCode: Boolean, - val startIcon: IconData = IconData.Local(R.drawable.ic_login_item), + val startIcon: IconData = IconData.Local(R.drawable.ic_globe), ) : Parcelable /** diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt index 7e6a43caa..649dd5e80 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/model/VaultTrailingIcon.kt @@ -14,12 +14,12 @@ enum class VaultTrailingIcon( val testTag: String, ) { COLLECTION( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), ATTACHMENT( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), diff --git a/app/src/main/res/drawable/ic_login_item_passkey.xml b/app/src/main/res/drawable/ic_bw_passkey.xml similarity index 100% rename from app/src/main/res/drawable/ic_login_item_passkey.xml rename to app/src/main/res/drawable/ic_bw_passkey.xml diff --git a/app/src/main/res/drawable/ic_expand_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml similarity index 100% rename from app/src/main/res/drawable/ic_expand_down.xml rename to app/src/main/res/drawable/ic_chevron_down.xml diff --git a/app/src/main/res/drawable/ic_navigate_next.xml b/app/src/main/res/drawable/ic_chevron_right.xml similarity index 100% rename from app/src/main/res/drawable/ic_navigate_next.xml rename to app/src/main/res/drawable/ic_chevron_right.xml diff --git a/app/src/main/res/drawable/ic_expand_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_expand_up.xml rename to app/src/main/res/drawable/ic_chevron_up.xml diff --git a/app/src/main/res/drawable/access_time.xml b/app/src/main/res/drawable/ic_clock.xml similarity index 100% rename from app/src/main/res/drawable/access_time.xml rename to app/src/main/res/drawable/ic_clock.xml diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collections.xml similarity index 100% rename from app/src/main/res/drawable/ic_collection.xml rename to app/src/main/res/drawable/ic_collections.xml diff --git a/app/src/main/res/drawable/ic_region_select_dropdown.xml b/app/src/main/res/drawable/ic_down_triangle.xml similarity index 100% rename from app/src/main/res/drawable/ic_region_select_dropdown.xml rename to app/src/main/res/drawable/ic_down_triangle.xml diff --git a/app/src/main/res/drawable/ic_more_horizontal.xml b/app/src/main/res/drawable/ic_ellipsis_horizontal.xml similarity index 100% rename from app/src/main/res/drawable/ic_more_horizontal.xml rename to app/src/main/res/drawable/ic_ellipsis_horizontal.xml diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_ellipsis_vertical.xml similarity index 100% rename from app/src/main/res/drawable/ic_more.xml rename to app/src/main/res/drawable/ic_ellipsis_vertical.xml diff --git a/app/src/main/res/drawable/ic_visibility.xml b/app/src/main/res/drawable/ic_eye.xml similarity index 100% rename from app/src/main/res/drawable/ic_visibility.xml rename to app/src/main/res/drawable/ic_eye.xml diff --git a/app/src/main/res/drawable/ic_visibility_off.xml b/app/src/main/res/drawable/ic_eye_slash.xml similarity index 100% rename from app/src/main/res/drawable/ic_visibility_off.xml rename to app/src/main/res/drawable/ic_eye_slash.xml diff --git a/app/src/main/res/drawable/ic_send_file.xml b/app/src/main/res/drawable/ic_file.xml similarity index 100% rename from app/src/main/res/drawable/ic_send_file.xml rename to app/src/main/res/drawable/ic_file.xml diff --git a/app/src/main/res/drawable/ic_send_text.xml b/app/src/main/res/drawable/ic_file_text.xml similarity index 100% rename from app/src/main/res/drawable/ic_send_text.xml rename to app/src/main/res/drawable/ic_file_text.xml diff --git a/app/src/main/res/drawable/ic_login_item.xml b/app/src/main/res/drawable/ic_globe.xml similarity index 100% rename from app/src/main/res/drawable/ic_login_item.xml rename to app/src/main/res/drawable/ic_globe.xml diff --git a/app/src/main/res/drawable/ic_identity_item.xml b/app/src/main/res/drawable/ic_id_card.xml similarity index 100% rename from app/src/main/res/drawable/ic_identity_item.xml rename to app/src/main/res/drawable/ic_id_card.xml diff --git a/app/src/main/res/drawable/ic_send_password.xml b/app/src/main/res/drawable/ic_key.xml similarity index 100% rename from app/src/main/res/drawable/ic_send_password.xml rename to app/src/main/res/drawable/ic_key.xml diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_mobile.xml similarity index 100% rename from app/src/main/res/drawable/ic_device.xml rename to app/src/main/res/drawable/ic_mobile.xml diff --git a/app/src/main/res/drawable/ic_secure_note_item.xml b/app/src/main/res/drawable/ic_note.xml similarity index 100% rename from app/src/main/res/drawable/ic_secure_note_item.xml rename to app/src/main/res/drawable/ic_note.xml diff --git a/app/src/main/res/drawable/ic_attachment.xml b/app/src/main/res/drawable/ic_paperclip.xml similarity index 100% rename from app/src/main/res/drawable/ic_attachment.xml rename to app/src/main/res/drawable/ic_paperclip.xml diff --git a/app/src/main/res/drawable/ic_card_item.xml b/app/src/main/res/drawable/ic_payment_card.xml similarity index 100% rename from app/src/main/res/drawable/ic_card_item.xml rename to app/src/main/res/drawable/ic_payment_card.xml diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_pencil.xml similarity index 100% rename from app/src/main/res/drawable/ic_edit.xml rename to app/src/main/res/drawable/ic_pencil.xml diff --git a/app/src/main/res/drawable/ic_edit_alt.xml b/app/src/main/res/drawable/ic_pencil_square.xml similarity index 100% rename from app/src/main/res/drawable/ic_edit_alt.xml rename to app/src/main/res/drawable/ic_pencil_square.xml diff --git a/app/src/main/res/drawable/ic_tooltip.xml b/app/src/main/res/drawable/ic_question_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_tooltip.xml rename to app/src/main/res/drawable/ic_question_circle.xml diff --git a/app/src/main/res/drawable/ic_tooltip_small.xml b/app/src/main/res/drawable/ic_question_circle_small.xml similarity index 100% rename from app/src/main/res/drawable/ic_tooltip_small.xml rename to app/src/main/res/drawable/ic_question_circle_small.xml diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt index 465c96b36..e420949a3 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/autofill/util/InlinePresentationSpecExtensionsTest.kt @@ -61,7 +61,7 @@ class InlinePresentationSpecExtensionsTest { val autofillCipher: AutofillCipher.Card = mockk { every { this@mockk.name } returns AUTOFILL_CIPHER_NAME every { this@mockk.subtitle } returns AUTOFILL_CIPHER_SUBTITLE - every { this@mockk.iconRes } returns R.drawable.ic_card_item + every { this@mockk.iconRes } returns R.drawable.ic_payment_card } val pendingIntent: PendingIntent = mockk() every { @@ -94,7 +94,7 @@ class InlinePresentationSpecExtensionsTest { fun `createCipherInlinePresentationOrNull should return presentation with card icon when card cipher and compatible`() { // Setup val icon: Icon = mockk() - val iconRes = R.drawable.ic_card_item + val iconRes = R.drawable.ic_payment_card val autofillCipher: AutofillCipher.Card = mockk { every { this@mockk.name } returns AUTOFILL_CIPHER_NAME every { this@mockk.subtitle } returns AUTOFILL_CIPHER_SUBTITLE @@ -154,11 +154,11 @@ class InlinePresentationSpecExtensionsTest { ContextCompat.getString(testContext, R.string.type_login) } returns LOGIN val icon: Icon = mockk() - val iconRes = R.drawable.ic_login_item + val iconRes = R.drawable.ic_globe val autofillCipher: AutofillCipher.Login = mockk { every { this@mockk.name } returns AUTOFILL_CIPHER_NAME every { this@mockk.subtitle } returns AUTOFILL_CIPHER_SUBTITLE - every { this@mockk.iconRes } returns R.drawable.ic_login_item + every { this@mockk.iconRes } returns R.drawable.ic_globe } val pendingIntent: PendingIntent = mockk() prepareForCompatibleCipherInlinePresentation( diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt index 75f19f002..43f6ca427 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/util/SearchUtil.kt @@ -26,16 +26,16 @@ fun createMockDisplayItemForCipher( subtitleTestTag = "CipherSubTitleLabel", iconData = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item, + fallbackIconRes = R.drawable.ic_globe, ), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -75,15 +75,15 @@ fun createMockDisplayItemForCipher( titleTestTag = "CipherNameLabel", subtitle = null, subtitleTestTag = "CipherSubTitleLabel", - iconData = IconData.Local(R.drawable.ic_secure_note_item), + iconData = IconData.Local(R.drawable.ic_note), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -112,15 +112,15 @@ fun createMockDisplayItemForCipher( titleTestTag = "CipherNameLabel", subtitle = "mockBrand-$number, *er-$number", subtitleTestTag = "CipherSubTitleLabel", - iconData = IconData.Local(R.drawable.ic_card_item), + iconData = IconData.Local(R.drawable.ic_payment_card), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -155,15 +155,15 @@ fun createMockDisplayItemForCipher( titleTestTag = "CipherNameLabel", subtitle = "mockFirstName-${number}mockLastName-$number", subtitleTestTag = "CipherSubTitleLabel", - iconData = IconData.Local(R.drawable.ic_identity_item), + iconData = IconData.Local(R.drawable.ic_id_card), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -199,10 +199,10 @@ fun createMockDisplayItemForSend( titleTestTag = "SendNameLabel", subtitle = "Oct 27, 2023, 12:00 PM", subtitleTestTag = "SendDateLabel", - iconData = IconData.Local(R.drawable.ic_send_file), + iconData = IconData.Local(R.drawable.ic_file), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_send_password, + iconRes = R.drawable.ic_key, contentDescription = R.string.password.asText(), testTag = "PasswordProtectedSendIcon", ), @@ -237,10 +237,10 @@ fun createMockDisplayItemForSend( titleTestTag = "SendNameLabel", subtitle = "Oct 27, 2023, 12:00 PM", subtitleTestTag = "SendDateLabel", - iconData = IconData.Local(R.drawable.ic_send_text), + iconData = IconData.Local(R.drawable.ic_file_text), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_send_password, + iconRes = R.drawable.ic_key, contentDescription = R.string.password.asText(), testTag = "PasswordProtectedSendIcon", ), diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt index d104a945a..baeb2c7c6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt @@ -2079,14 +2079,14 @@ private fun createDisplayItem(number: Int): VaultItemListingState.DisplayItem = secondSubtitleTestTag = null, subtitle = "mockSubtitle-$number", subtitleTestTag = "SendDateLabel", - iconData = IconData.Local(R.drawable.ic_card_item), + iconData = IconData.Local(R.drawable.ic_payment_card), extraIconList = listOf( IconRes( iconRes = R.drawable.ic_send_disabled, contentDescription = R.string.disabled.asText(), ), IconRes( - iconRes = R.drawable.ic_send_password, + iconRes = R.drawable.ic_key, contentDescription = R.string.password.asText(), ), IconRes( diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt index a4373cdfa..864e57f33 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt @@ -1382,7 +1382,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() { subtitleTestTag = "PasskeyName", iconData = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item_passkey, + fallbackIconRes = R.drawable.ic_bw_passkey, ), isAutofill = true, ), @@ -1462,7 +1462,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() { subtitleTestTag = "PasskeyName", iconData = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item_passkey, + fallbackIconRes = R.drawable.ic_bw_passkey, ), isFido2Creation = true, ), diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt index 9f508ee23..06c1ffd49 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt @@ -511,7 +511,7 @@ class VaultItemListingDataExtensionsTest { subtitleTestTag = "PasskeyName", iconData = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item_passkey, + fallbackIconRes = R.drawable.ic_bw_passkey, ), isAutofill = true, shouldShowMasterPasswordReprompt = true, @@ -597,7 +597,7 @@ class VaultItemListingDataExtensionsTest { subtitleTestTag = "PasskeyName", iconData = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item_passkey, + fallbackIconRes = R.drawable.ic_bw_passkey, ), isAutofill = true, shouldShowMasterPasswordReprompt = false, diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt index eb4524789..42ca010e0 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataUtil.kt @@ -30,16 +30,16 @@ fun createMockDisplayItemForCipher( subtitleTestTag = "CipherSubTitleLabel", iconData = IconData.Network( "https://vault.bitwarden.com/icons/www.mockuri.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item, + fallbackIconRes = R.drawable.ic_globe, ), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -82,15 +82,15 @@ fun createMockDisplayItemForCipher( secondSubtitleTestTag = null, subtitle = subtitle, subtitleTestTag = "CipherSubTitleLabel", - iconData = IconData.Local(R.drawable.ic_secure_note_item), + iconData = IconData.Local(R.drawable.ic_note), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -122,15 +122,15 @@ fun createMockDisplayItemForCipher( secondSubtitleTestTag = null, subtitle = subtitle, subtitleTestTag = "CipherSubTitleLabel", - iconData = IconData.Local(R.drawable.ic_card_item), + iconData = IconData.Local(R.drawable.ic_payment_card), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -168,15 +168,15 @@ fun createMockDisplayItemForCipher( secondSubtitleTestTag = null, subtitle = subtitle, subtitleTestTag = "CipherSubTitleLabel", - iconData = IconData.Local(R.drawable.ic_identity_item), + iconData = IconData.Local(R.drawable.ic_id_card), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_collection, + iconRes = R.drawable.ic_collections, contentDescription = R.string.collections.asText(), testTag = "CipherInCollectionIcon", ), IconRes( - iconRes = R.drawable.ic_attachment, + iconRes = R.drawable.ic_paperclip, contentDescription = R.string.attachments.asText(), testTag = "CipherWithAttachmentsIcon", ), @@ -215,10 +215,10 @@ fun createMockDisplayItemForSend( secondSubtitleTestTag = null, subtitle = "Oct 27, 2023, 12:00 PM", subtitleTestTag = "SendDateLabel", - iconData = IconData.Local(R.drawable.ic_send_file), + iconData = IconData.Local(R.drawable.ic_file), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_send_password, + iconRes = R.drawable.ic_key, contentDescription = R.string.password.asText(), testTag = "PasswordProtectedSendIcon", ), @@ -256,10 +256,10 @@ fun createMockDisplayItemForSend( secondSubtitleTestTag = null, subtitle = "Oct 27, 2023, 12:00 PM", subtitleTestTag = "SendDateLabel", - iconData = IconData.Local(R.drawable.ic_send_text), + iconData = IconData.Local(R.drawable.ic_file_text), extraIconList = listOf( IconRes( - iconRes = R.drawable.ic_send_password, + iconRes = R.drawable.ic_key, contentDescription = R.string.password.asText(), testTag = "PasswordProtectedSendIcon", ), diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt index 8e37ebfd6..5ea4c6e64 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/util/VaultDataExtensionsTest.kt @@ -405,7 +405,7 @@ class VaultDataExtensionsTest { usePasskeyDefaultIcon = false, ) - val expected = IconData.Local(iconRes = R.drawable.ic_login_item) + val expected = IconData.Local(iconRes = R.drawable.ic_globe) assertEquals(expected, actual) } @@ -426,7 +426,7 @@ class VaultDataExtensionsTest { usePasskeyDefaultIcon = true, ) - val expected = IconData.Local(iconRes = R.drawable.ic_login_item_passkey) + val expected = IconData.Local(iconRes = R.drawable.ic_bw_passkey) assertEquals(expected, actual) } @@ -446,7 +446,7 @@ class VaultDataExtensionsTest { usePasskeyDefaultIcon = false, ) - val expected = IconData.Local(iconRes = R.drawable.ic_login_item) + val expected = IconData.Local(iconRes = R.drawable.ic_globe) assertEquals(expected, actual) } @@ -467,7 +467,7 @@ class VaultDataExtensionsTest { usePasskeyDefaultIcon = true, ) - val expected = IconData.Local(iconRes = R.drawable.ic_login_item_passkey) + val expected = IconData.Local(iconRes = R.drawable.ic_bw_passkey) assertEquals(expected, actual) } @@ -534,7 +534,7 @@ class VaultDataExtensionsTest { val expected = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri1.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item, + fallbackIconRes = R.drawable.ic_globe, ) assertEquals(expected, actual) @@ -565,7 +565,7 @@ class VaultDataExtensionsTest { val expected = IconData.Network( uri = "https://vault.bitwarden.com/icons/www.mockuri1.com/icon.png", - fallbackIconRes = R.drawable.ic_login_item_passkey, + fallbackIconRes = R.drawable.ic_bw_passkey, ) assertEquals(expected, actual)