ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

nbOfBlockedUsers -> numberOfBlockedUsers

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/account/PreferencesAccountPresenter.kt
+2 -2
View File
@@ -73,7 +73,7 @@ class PreferencesAccountPresenter(
canDeactivateAccount = matrixClient.canDeactivateAccount() canDeactivateAccount = matrixClient.canDeactivateAccount()
} }
val nbOfBlockedUsers by produceState(initialValue = 0) { val numberOfBlockedUsers by produceState(initialValue = 0) {
matrixClient.ignoredUsersFlow matrixClient.ignoredUsersFlow
.onEach { value = it.size } .onEach { value = it.size }
.launchIn(this) .launchIn(this)
@@ -93,7 +93,7 @@ class PreferencesAccountPresenter(
canReportBug = canReportBug, canReportBug = canReportBug,
showLinkNewDevice = showLinkNewDevice, showLinkNewDevice = showLinkNewDevice,
canDeactivateAccount = canDeactivateAccount, canDeactivateAccount = canDeactivateAccount,
nbOfBlockedUsers = nbOfBlockedUsers, numberOfBlockedUsers = numberOfBlockedUsers,
directLogoutState = directLogoutState, directLogoutState = directLogoutState,
snackbarMessage = snackbarMessage, snackbarMessage = snackbarMessage,
) )
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/account/PreferencesAccountState.kt
+2 -2
View File
@@ -19,9 +19,9 @@ data class PreferencesAccountState(
val canReportBug: Boolean, val canReportBug: Boolean,
val showLinkNewDevice: Boolean, val showLinkNewDevice: Boolean,
val canDeactivateAccount: Boolean, val canDeactivateAccount: Boolean,
val nbOfBlockedUsers: Int, val numberOfBlockedUsers: Int,
val directLogoutState: DirectLogoutState, val directLogoutState: DirectLogoutState,
val snackbarMessage: SnackbarMessage?, val snackbarMessage: SnackbarMessage?,
) { ) {
val showBlockedUsersItem = nbOfBlockedUsers > 0 val showBlockedUsersItem = numberOfBlockedUsers > 0
} }
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/account/PreferencesAccountStatePreviewParam.kt
+4 -4
View File
@@ -26,7 +26,7 @@ open class PreferencesAccountStatePreviewParam : PreviewParameterProvider<Prefer
canReportBug = true, canReportBug = true,
showLinkNewDevice = true, showLinkNewDevice = true,
canDeactivateAccount = false, canDeactivateAccount = false,
nbOfBlockedUsers = 3, numberOfBlockedUsers = 3,
), ),
aPreferencesAccountState( aPreferencesAccountState(
myUser = aMatrixUser(displayName = null), myUser = aMatrixUser(displayName = null),
@@ -40,7 +40,7 @@ open class PreferencesAccountStatePreviewParam : PreviewParameterProvider<Prefer
), ),
aPreferencesAccountState( aPreferencesAccountState(
canReportBug = true, canReportBug = true,
nbOfBlockedUsers = 3, numberOfBlockedUsers = 3,
snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete), snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete),
), ),
aPreferencesAccountState( aPreferencesAccountState(
@@ -58,7 +58,7 @@ fun aPreferencesAccountState(
canReportBug: Boolean = false, canReportBug: Boolean = false,
showLinkNewDevice: Boolean = false, showLinkNewDevice: Boolean = false,
canDeactivateAccount: Boolean = false, canDeactivateAccount: Boolean = false,
nbOfBlockedUsers: Int = 0, numberOfBlockedUsers: Int = 0,
directLogoutState: DirectLogoutState = aDirectLogoutState(), directLogoutState: DirectLogoutState = aDirectLogoutState(),
snackbarMessage: SnackbarMessage? = null, snackbarMessage: SnackbarMessage? = null,
) = PreferencesAccountState( ) = PreferencesAccountState(
@@ -69,7 +69,7 @@ fun aPreferencesAccountState(
canReportBug = canReportBug, canReportBug = canReportBug,
showLinkNewDevice = showLinkNewDevice, showLinkNewDevice = showLinkNewDevice,
canDeactivateAccount = canDeactivateAccount, canDeactivateAccount = canDeactivateAccount,
nbOfBlockedUsers = nbOfBlockedUsers, numberOfBlockedUsers = numberOfBlockedUsers,
directLogoutState = directLogoutState, directLogoutState = directLogoutState,
snackbarMessage = snackbarMessage, snackbarMessage = snackbarMessage,
) )
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/account/PreferencesAccountView.kt
+1 -1
View File
@@ -123,7 +123,7 @@ private fun ManageAccountSection(
content = { Text(stringResource(id = CommonStrings.common_blocked_users)) }, content = { Text(stringResource(id = CommonStrings.common_blocked_users)) },
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())), leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())),
onClick = onOpenBlockedUsers, onClick = onOpenBlockedUsers,
trailingContent = ListItemContent.Text(state.nbOfBlockedUsers.toString()), trailingContent = ListItemContent.Text(state.numberOfBlockedUsers.toString()),
) )
} }
} }
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/account/PreferencesAccountPresenterTest.kt
+2 -2
View File
@@ -69,7 +69,7 @@ class PreferencesAccountPresenterTest {
assertThat(initialState.showSecureBackupBadge).isFalse() assertThat(initialState.showSecureBackupBadge).isFalse()
assertThat(initialState.accountManagementUrl).isNull() assertThat(initialState.accountManagementUrl).isNull()
assertThat(initialState.showLinkNewDevice).isFalse() assertThat(initialState.showLinkNewDevice).isFalse()
assertThat(initialState.nbOfBlockedUsers).isEqualTo(0) assertThat(initialState.numberOfBlockedUsers).isEqualTo(0)
assertThat(initialState.showBlockedUsersItem).isFalse() assertThat(initialState.showBlockedUsersItem).isFalse()
assertThat(initialState.directLogoutState).isEqualTo(aDirectLogoutState()) assertThat(initialState.directLogoutState).isEqualTo(aDirectLogoutState())
assertThat(initialState.snackbarMessage).isNull() assertThat(initialState.snackbarMessage).isNull()
@@ -107,7 +107,7 @@ class PreferencesAccountPresenterTest {
ignoredUsersFlow = MutableStateFlow(persistentListOf(A_USER_ID, A_USER_ID_2)), ignoredUsersFlow = MutableStateFlow(persistentListOf(A_USER_ID, A_USER_ID_2)),
), ),
).test { ).test {
val state = consumeItemsUntilPredicate { it.nbOfBlockedUsers == 2 }.last() val state = consumeItemsUntilPredicate { it.numberOfBlockedUsers == 2 }.last()
assertThat(state.showBlockedUsersItem).isTrue() assertThat(state.showBlockedUsersItem).isTrue()
cancelAndIgnoreRemainingEvents() cancelAndIgnoreRemainingEvents()
} }
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/account/PreferencesAccountViewTest.kt
+3 -3
View File
@@ -107,7 +107,7 @@ class PreferencesAccountViewTest : RobolectricTest() {
fun `click on Blocked users invokes the expected callback`() = runAndroidComposeUiTest { fun `click on Blocked users invokes the expected callback`() = runAndroidComposeUiTest {
ensureCalledOnce { callback -> ensureCalledOnce { callback ->
setView( setView(
aPreferencesAccountState(nbOfBlockedUsers = 1), aPreferencesAccountState(numberOfBlockedUsers = 1),
onOpenBlockedUsers = callback, onOpenBlockedUsers = callback,
) )
clickOn(CommonStrings.common_blocked_users) clickOn(CommonStrings.common_blocked_users)
@@ -115,8 +115,8 @@ class PreferencesAccountViewTest : RobolectricTest() {
} }
@Test @Test
fun `when nbOfBlockedUsers is 0, item is not shown`() = runAndroidComposeUiTest { fun `when numberOfBlockedUsers is 0, item is not shown`() = runAndroidComposeUiTest {
setView(aPreferencesAccountState(nbOfBlockedUsers = 0)) setView(aPreferencesAccountState(numberOfBlockedUsers = 0))
onNodeWithText(activity!!.getString(CommonStrings.common_blocked_users)).assertDoesNotExist() onNodeWithText(activity!!.getString(CommonStrings.common_blocked_users)).assertDoesNotExist()
} }