Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use new action_delete and action_delete_account

Browse source
This commit is contained in:
Benoit Marty 2026-04-21 14:32:11 +02:00 • committed by Benoit Marty
parent f51c961883
commit 9d054e08b1
6 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
View file

@ -135,7 +135,7 @@ private fun ColumnScope.Buttons(
) {
val logoutAction = state.accountDeactivationAction
Button(
text = stringResource(CommonStrings.action_deactivate),
text = stringResource(CommonStrings.action_delete),
showProgress = logoutAction is AsyncAction.Loading,
destructive = true,
enabled = state.submitEnabled,

2
features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
View file

@ -22,7 +22,7 @@ fun AccountDeactivationConfirmationDialog(
ConfirmationDialog(
title = stringResource(id = R.string.screen_deactivate_account_title),
content = stringResource(R.string.screen_deactivate_account_confirmation_dialog_content),
submitText = stringResource(id = CommonStrings.action_deactivate),
submitText = stringResource(id = CommonStrings.action_delete),
onSubmitClick = onSubmitClick,
onDismiss = onDismiss,
destructiveSubmit = true,

2
features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
View file

@ -60,7 +60,7 @@ class AccountDeactivationViewTest {
eventSink = eventsRecorder,
),
)
rule.clickOn(CommonStrings.action_deactivate)
rule.clickOn(CommonStrings.action_delete)
eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(false))
}

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
View file

@ -278,7 +278,7 @@ private fun ColumnScope.GeneralSection(
)
if (state.canDeactivateAccount) {
ListItem(
headlineContent = { Text(stringResource(id = CommonStrings.action_deactivate_account)) },
headlineContent = { Text(stringResource(id = CommonStrings.action_delete_account)) },
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
style = ListItemStyle.Destructive,
onClick = onDeactivateClick,

4
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt
View file

@ -407,7 +407,7 @@ class PreferencesRootViewTest {
),
onDeactivateClick = callback,
)
rule.clickOn(CommonStrings.action_deactivate_account)
rule.clickOn(CommonStrings.action_delete_account)
}
}
@ -420,7 +420,7 @@ class PreferencesRootViewTest {
eventSink = eventsRecorder,
),
)
rule.onNodeWithText(rule.activity.getString(CommonStrings.action_deactivate_account)).assertDoesNotExist()
rule.onNodeWithText(rule.activity.getString(CommonStrings.action_delete_account)).assertDoesNotExist()
}
@Test