nbOfBlockedUsers -> numberOfBlockedUsers

This commit is contained in:
Benoit Marty
2026-09-23 11:51:54 +02:00
parent e0defcea66
commit c8748f4d77
6 changed files with 14 additions and 14 deletions
@@ -73,7 +73,7 @@ class PreferencesAccountPresenter(
canDeactivateAccount = matrixClient.canDeactivateAccount()
}
val nbOfBlockedUsers by produceState(initialValue = 0) {
val numberOfBlockedUsers by produceState(initialValue = 0) {
matrixClient.ignoredUsersFlow
.onEach { value = it.size }
.launchIn(this)
@@ -93,7 +93,7 @@ class PreferencesAccountPresenter(
canReportBug = canReportBug,
showLinkNewDevice = showLinkNewDevice,
canDeactivateAccount = canDeactivateAccount,
nbOfBlockedUsers = nbOfBlockedUsers,
numberOfBlockedUsers = numberOfBlockedUsers,
directLogoutState = directLogoutState,
snackbarMessage = snackbarMessage,
)
@@ -19,9 +19,9 @@ data class PreferencesAccountState(
val canReportBug: Boolean,
val showLinkNewDevice: Boolean,
val canDeactivateAccount: Boolean,
val nbOfBlockedUsers: Int,
val numberOfBlockedUsers: Int,
val directLogoutState: DirectLogoutState,
val snackbarMessage: SnackbarMessage?,
) {
val showBlockedUsersItem = nbOfBlockedUsers > 0
val showBlockedUsersItem = numberOfBlockedUsers > 0
}
@@ -26,7 +26,7 @@ open class PreferencesAccountStatePreviewParam : PreviewParameterProvider<Prefer
canReportBug = true,
showLinkNewDevice = true,
canDeactivateAccount = false,
nbOfBlockedUsers = 3,
numberOfBlockedUsers = 3,
),
aPreferencesAccountState(
myUser = aMatrixUser(displayName = null),
@@ -40,7 +40,7 @@ open class PreferencesAccountStatePreviewParam : PreviewParameterProvider<Prefer
),
aPreferencesAccountState(
canReportBug = true,
nbOfBlockedUsers = 3,
numberOfBlockedUsers = 3,
snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete),
),
aPreferencesAccountState(
@@ -58,7 +58,7 @@ fun aPreferencesAccountState(
canReportBug: Boolean = false,
showLinkNewDevice: Boolean = false,
canDeactivateAccount: Boolean = false,
nbOfBlockedUsers: Int = 0,
numberOfBlockedUsers: Int = 0,
directLogoutState: DirectLogoutState = aDirectLogoutState(),
snackbarMessage: SnackbarMessage? = null,
) = PreferencesAccountState(
@@ -69,7 +69,7 @@ fun aPreferencesAccountState(
canReportBug = canReportBug,
showLinkNewDevice = showLinkNewDevice,
canDeactivateAccount = canDeactivateAccount,
nbOfBlockedUsers = nbOfBlockedUsers,
numberOfBlockedUsers = numberOfBlockedUsers,
directLogoutState = directLogoutState,
snackbarMessage = snackbarMessage,
)
@@ -123,7 +123,7 @@ private fun ManageAccountSection(
content = { Text(stringResource(id = CommonStrings.common_blocked_users)) },
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())),
onClick = onOpenBlockedUsers,
trailingContent = ListItemContent.Text(state.nbOfBlockedUsers.toString()),
trailingContent = ListItemContent.Text(state.numberOfBlockedUsers.toString()),
)
}
}
@@ -69,7 +69,7 @@ class PreferencesAccountPresenterTest {
assertThat(initialState.showSecureBackupBadge).isFalse()
assertThat(initialState.accountManagementUrl).isNull()
assertThat(initialState.showLinkNewDevice).isFalse()
assertThat(initialState.nbOfBlockedUsers).isEqualTo(0)
assertThat(initialState.numberOfBlockedUsers).isEqualTo(0)
assertThat(initialState.showBlockedUsersItem).isFalse()
assertThat(initialState.directLogoutState).isEqualTo(aDirectLogoutState())
assertThat(initialState.snackbarMessage).isNull()
@@ -107,7 +107,7 @@ class PreferencesAccountPresenterTest {
ignoredUsersFlow = MutableStateFlow(persistentListOf(A_USER_ID, A_USER_ID_2)),
),
).test {
val state = consumeItemsUntilPredicate { it.nbOfBlockedUsers == 2 }.last()
val state = consumeItemsUntilPredicate { it.numberOfBlockedUsers == 2 }.last()
assertThat(state.showBlockedUsersItem).isTrue()
cancelAndIgnoreRemainingEvents()
}
@@ -107,7 +107,7 @@ class PreferencesAccountViewTest : RobolectricTest() {
fun `click on Blocked users invokes the expected callback`() = runAndroidComposeUiTest {
ensureCalledOnce { callback ->
setView(
aPreferencesAccountState(nbOfBlockedUsers = 1),
aPreferencesAccountState(numberOfBlockedUsers = 1),
onOpenBlockedUsers = callback,
)
clickOn(CommonStrings.common_blocked_users)
@@ -115,8 +115,8 @@ class PreferencesAccountViewTest : RobolectricTest() {
}
@Test
fun `when nbOfBlockedUsers is 0, item is not shown`() = runAndroidComposeUiTest {
setView(aPreferencesAccountState(nbOfBlockedUsers = 0))
fun `when numberOfBlockedUsers is 0, item is not shown`() = runAndroidComposeUiTest {
setView(aPreferencesAccountState(numberOfBlockedUsers = 0))
onNodeWithText(activity!!.getString(CommonStrings.common_blocked_users)).assertDoesNotExist()
}