Merge pull request #2039 from element-hq/feature/bma/fixInviteWording

Fix invite wording
This commit is contained in:
Benoit Marty
2023-12-18 12:05:22 +01:00
committed by GitHub
18 changed files with 37 additions and 38 deletions

View File

@@ -23,7 +23,7 @@ appId: ${APP_ID}
- tapOn:
text: ${INVITEE2_MXID}
index: 1
- tapOn: "Send"
- tapOn: "Invite"
- tapOn: "Back"
- tapOn: "aRoomName"
- tapOn: "People"

1
changelog.d/2037.bugfix Normal file
View File

@@ -0,0 +1 @@
Fix wording in room invite members view: `Send` -> `Invite`.

View File

@@ -67,7 +67,7 @@ class RoomInviteMembersNode @AssistedInject constructor(
state = state,
modifier = modifier,
onBackPressed = { navigateUp() },
onSendPressed = { users ->
onSubmitPressed = { users ->
navigateUp()
coroutineScope.launch {

View File

@@ -18,7 +18,6 @@ package io.element.android.features.roomdetails.impl.invite
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
@@ -54,12 +53,11 @@ import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList
@OptIn(ExperimentalLayoutApi::class)
@Composable
fun RoomInviteMembersView(
state: RoomInviteMembersState,
onBackPressed: () -> Unit,
onSendPressed: (List<MatrixUser>) -> Unit,
onSubmitPressed: (List<MatrixUser>) -> Unit,
modifier: Modifier = Modifier,
) {
Scaffold(
@@ -73,7 +71,7 @@ fun RoomInviteMembersView(
onBackPressed()
}
},
onSendPressed = { onSendPressed(state.selectedUsers) },
onSubmitPressed = { onSubmitPressed(state.selectedUsers) },
canSend = state.canInvite,
)
}
@@ -114,7 +112,7 @@ fun RoomInviteMembersView(
private fun RoomInviteMembersTopBar(
canSend: Boolean,
onBackPressed: () -> Unit,
onSendPressed: () -> Unit,
onSubmitPressed: () -> Unit,
modifier: Modifier = Modifier,
) {
TopAppBar(
@@ -128,8 +126,8 @@ private fun RoomInviteMembersTopBar(
navigationIcon = { BackButton(onClick = onBackPressed) },
actions = {
TextButton(
text = stringResource(CommonStrings.action_send),
onClick = onSendPressed,
text = stringResource(CommonStrings.action_invite),
onClick = onSubmitPressed,
enabled = canSend,
)
}
@@ -222,6 +220,6 @@ internal fun RoomInviteMembersPreview(@PreviewParameter(RoomInviteMembersStatePr
RoomInviteMembersView(
state = state,
onBackPressed = {},
onSendPressed = {},
onSubmitPressed = {},
)
}