diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditAdditionalOptions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditAdditionalOptions.kt index 31d567ab87..72fe83c316 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditAdditionalOptions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditAdditionalOptions.kt @@ -136,6 +136,7 @@ fun LazyListScope.vaultAddEditAdditionalOptions( modifier = Modifier.fillMaxWidth(), ) } + Spacer(modifier = Modifier.height(height = 8.dp)) } item(key = "addCustomFieldButton") { @@ -145,7 +146,7 @@ fun LazyListScope.vaultAddEditAdditionalOptions( .fillMaxWidth() .standardHorizontalMargin(), ) { - Spacer(modifier = Modifier.height(height = 16.dp)) + Spacer(modifier = Modifier.height(height = 8.dp)) VaultAddEditCustomFieldsButton( onFinishNamingClick = commonTypeHandlers.onAddNewCustomFieldClick, options = persistentListOfNotNull( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCustomFieldsButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCustomFieldsButton.kt index 1db9fa373a..206719186a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCustomFieldsButton.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCustomFieldsButton.kt @@ -67,7 +67,7 @@ fun VaultAddEditCustomFieldsButton( } val focusManager = LocalFocusManager.current BitwardenOutlinedButton( - label = stringResource(id = R.string.new_custom_field), + label = stringResource(id = R.string.add_field), onClick = { // Clear any current focused item such as an unrelated text field. focusManager.clearFocus() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31ad45f6f7..ff38ccccc4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1226,5 +1226,6 @@ Do you want to switch to this account? Show more No folder Show less + Add field %s... diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt index ec735a73af..e0a42f9787 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt @@ -2285,7 +2285,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { } @Test - fun `clicking New Custom Field button should allow creation of Linked type`() { + fun `clicking Add field button should allow creation of Linked type`() { mutableStateFlow.value = DEFAULT_STATE_LOGIN // Expand the additional options UI before interacting with it @@ -2294,7 +2294,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { .performClick() composeTestRule - .onNodeWithTextAfterScroll(text = "New custom field") + .onNodeWithTextAfterScroll(text = "Add field") .performClick() composeTestRule @@ -2869,7 +2869,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { } @Test - fun `clicking New Custom Field button should allow creation of Text type`() { + fun `clicking Add field button should allow creation of Text type`() { mutableStateFlow.value = DEFAULT_STATE_SECURE_NOTES // Expand the additional options UI before interacting with it @@ -2878,7 +2878,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { .performClick() composeTestRule - .onNodeWithTextAfterScroll(text = "New custom field") + .onNodeWithTextAfterScroll(text = "Add field") .performClick() composeTestRule @@ -2910,7 +2910,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { } @Test - fun `clicking New Custom Field button should not display linked type`() { + fun `clicking Add field button should not display linked type`() { mutableStateFlow.value = DEFAULT_STATE_SECURE_NOTES // Expand the additional options UI before interacting with it @@ -2919,7 +2919,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { .performClick() composeTestRule - .onNodeWithTextAfterScroll(text = "New custom field") + .onNodeWithTextAfterScroll(text = "Add field") .performClick() composeTestRule @@ -2933,7 +2933,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { } @Test - fun `clicking New Custom Field button should allow creation of Boolean type`() { + fun `clicking Add field button should allow creation of Boolean type`() { mutableStateFlow.value = DEFAULT_STATE_SECURE_NOTES // Expand the additional options UI before interacting with it @@ -2942,7 +2942,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { .performClick() composeTestRule - .onNodeWithTextAfterScroll(text = "New custom field") + .onNodeWithTextAfterScroll(text = "Add field") .performClick() composeTestRule @@ -2974,7 +2974,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { } @Test - fun `clicking New Custom Field button should allow creation of Hidden type`() { + fun `clicking Add field button should allow creation of Hidden type`() { mutableStateFlow.value = DEFAULT_STATE_SECURE_NOTES // Expand the additional options UI before interacting with it @@ -2983,7 +2983,7 @@ class VaultAddEditScreenTest : BaseComposeTest() { .performClick() composeTestRule - .onNodeWithTextAfterScroll(text = "New custom field") + .onNodeWithTextAfterScroll(text = "Add field") .performClick() composeTestRule