mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-17 11:48:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Convert AddSendEvent for ShowToast to use Text (#578)

Browse source
This commit is contained in:
David Perez 2024-01-11 16:20:05 -06:00 • committed by Álison Fernandes
parent fc5529e2ad
commit d16e0c6573
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendScreen.kt
View file

@ -48,6 +48,7 @@ fun AddSendScreen(
val state by viewModel.stateFlow.collectAsStateWithLifecycle()
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
val context = LocalContext.current
val resources = context.resources
EventsEffect(viewModel = viewModel) { event ->
when (event) {
@ -57,7 +58,7 @@ fun AddSendScreen(
}
is AddSendEvent.ShowToast -> {
Toast.makeText(context, event.message, Toast.LENGTH_SHORT).show()
Toast.makeText(context, event.message(resources), Toast.LENGTH_SHORT).show()
}
}
}

12
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModel.kt
View file

@ -279,22 +279,22 @@ class AddSendViewModel @Inject constructor(
private fun handleCopyLinkClick() {
// TODO Add copy link support (BIT-1435)
sendEvent(AddSendEvent.ShowToast("Not yet implemented"))
sendEvent(AddSendEvent.ShowToast("Not yet implemented".asText()))
}
private fun handleDeleteClick() {
// TODO Add deletion support (BIT-1435)
sendEvent(AddSendEvent.ShowToast("Not yet implemented"))
sendEvent(AddSendEvent.ShowToast("Not yet implemented".asText()))
}
private fun handleRemovePasswordClick() {
// TODO Add remove password support (BIT-1435)
sendEvent(AddSendEvent.ShowToast("Not yet implemented"))
sendEvent(AddSendEvent.ShowToast("Not yet implemented".asText()))
}
private fun handleShareLinkClick() {
// TODO Add share link support (BIT-1435)
sendEvent(AddSendEvent.ShowToast("Not yet implemented"))
sendEvent(AddSendEvent.ShowToast("Not yet implemented".asText()))
}
private fun handlePasswordChange(action: AddSendAction.PasswordChange) {
@ -432,7 +432,7 @@ class AddSendViewModel @Inject constructor(
private fun handleChooseFileClick() {
// TODO: allow for file upload: BIT-1085
sendEvent(AddSendEvent.ShowToast("Not Implemented: File Upload"))
sendEvent(AddSendEvent.ShowToast("Not Implemented: File Upload".asText()))
}
private fun handleMaxAccessCountChange(action: AddSendAction.MaxAccessCountChange) {
@ -635,7 +635,7 @@ sealed class AddSendEvent {
/**
* Show Toast.
*/
data class ShowToast(val message: String) : AddSendEvent()
data class ShowToast(val message: Text) : AddSendEvent()
}
/**

13
app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendViewModelTest.kt
View file

@ -274,7 +274,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.CopyLinkClick)
assertEquals(AddSendEvent.ShowToast("Not yet implemented"), awaitItem())
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
}
}
@ -287,7 +287,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.DeleteClick)
assertEquals(AddSendEvent.ShowToast("Not yet implemented"), awaitItem())
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
}
}
@ -300,7 +300,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.RemovePasswordClick)
assertEquals(AddSendEvent.ShowToast("Not yet implemented"), awaitItem())
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
}
}
@ -313,7 +313,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.ShareLinkClick)
assertEquals(AddSendEvent.ShowToast("Not yet implemented"), awaitItem())
assertEquals(AddSendEvent.ShowToast("Not yet implemented".asText()), awaitItem())
}
}
@ -398,7 +398,10 @@ class AddSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(AddSendAction.ChooseFileClick)
assertEquals(AddSendEvent.ShowToast("Not Implemented: File Upload"), awaitItem())
assertEquals(
AddSendEvent.ShowToast("Not Implemented: File Upload".asText()),
awaitItem(),
)
}
}