github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-21 22:00:42 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

PM-17848 update copy on generator modal (#4691)

Browse Source
This commit is contained in:
Dave Severns
2025-02-05 09:32:33 -05:00
committed by GitHub
parent c672bff18c
commit a1a3d55656
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
View File

@@ -234,8 +234,8 @@ fun GeneratorScreen(
onCloseClick = remember(viewModel) {
{ viewModel.trySendAction(GeneratorAction.CloseClick) }
},
onSelectClick = remember(viewModel) {
{ viewModel.trySendAction(GeneratorAction.SelectClick) }
onSaveClick = remember(viewModel) {
{ viewModel.trySendAction(GeneratorAction.SaveClick) }
},
)
}
@@ -333,7 +333,7 @@ private fun ModalAppBar(
generatorMode: GeneratorMode.Modal,
scrollBehavior: TopAppBarScrollBehavior,
onCloseClick: () -> Unit,
onSelectClick: () -> Unit,
onSaveClick: () -> Unit,
modifier: Modifier = Modifier,
) {
BitwardenTopAppBar(
@@ -348,9 +348,9 @@ private fun ModalAppBar(
},
actions = {
BitwardenTextButton(
label = stringResource(id = R.string.select),
onClick = onSelectClick,
modifier = Modifier.testTag("SelectButton"),
label = stringResource(id = R.string.save),
onClick = onSaveClick,
modifier = Modifier.testTag("SaveButton"),
)
},
modifier = modifier,

6
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt
View File

@@ -141,7 +141,7 @@ class GeneratorViewModel @Inject constructor(
when (action) {
is GeneratorAction.PasswordHistoryClick -> handlePasswordHistoryClick()
is GeneratorAction.CloseClick -> handleCloseClick()
is GeneratorAction.SelectClick -> handleSelectClick()
is GeneratorAction.SaveClick -> handleSaveClick()
is GeneratorAction.RegenerateClick -> handleRegenerationClick()
is GeneratorAction.CopyClick -> handleCopyClick()
is GeneratorAction.MainTypeOptionSelect -> handleMainTypeOptionSelect(action)
@@ -283,7 +283,7 @@ class GeneratorViewModel @Inject constructor(
sendEvent(GeneratorEvent.NavigateBack)
}
private fun handleSelectClick() {
private fun handleSaveClick() {
when (state.selectedType) {
is GeneratorState.MainType.Passphrase,
is GeneratorState.MainType.Password,
@@ -2202,7 +2202,7 @@ sealed class GeneratorAction {
/**
* Indicates the user has selected a generated string from the modal generator
*/
data object SelectClick : GeneratorAction()
data object SaveClick : GeneratorAction()
/**
* Indicates the user has clicked the close button.

10
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreenTest.kt
View File

@@ -88,7 +88,7 @@ class GeneratorScreenTest : BaseComposeTest() {
.assertIsDisplayed()
composeTestRule
.onNodeWithText(text = "Select")
.onNodeWithText(text = "Save")
.assertIsDisplayed()
}
@@ -105,7 +105,7 @@ class GeneratorScreenTest : BaseComposeTest() {
.assertIsDisplayed()
composeTestRule
.onNodeWithText(text = "Select")
.onNodeWithText(text = "Save")
.assertIsDisplayed()
}
@@ -127,7 +127,7 @@ class GeneratorScreenTest : BaseComposeTest() {
}
@Test
fun `on select click should send SelectClick`() {
fun `on save click should send SaveClick`() {
updateState(
DEFAULT_STATE.copy(
generatorMode = GeneratorMode.Modal.Username(website = null),
@@ -135,11 +135,11 @@ class GeneratorScreenTest : BaseComposeTest() {
)
composeTestRule
.onNodeWithText(text = "Select")
.onNodeWithText(text = "Save")
.performClick()
verify {
viewModel.trySendAction(GeneratorAction.SelectClick)
viewModel.trySendAction(GeneratorAction.SaveClick)
}
}

4
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModelTest.kt
View File

@@ -303,7 +303,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
}
@Test
fun `SelectClick should emit the NavigateBack event with GeneratorResult`() = runTest {
fun `SaveClick should emit the NavigateBack event with GeneratorResult`() = runTest {
turbineScope {
val viewModel = createViewModel(state = initialUsernameModeState)
val eventTurbine = viewModel
@@ -313,7 +313,7 @@ class GeneratorViewModelTest : BaseViewModelTest() {
.generatorResultFlow
.testIn(backgroundScope)
viewModel.trySendAction(GeneratorAction.SelectClick)
viewModel.trySendAction(GeneratorAction.SaveClick)
assertEquals(GeneratorEvent.NavigateBack, eventTurbine.awaitItem())
assertEquals(