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

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

Browse source 
Fix invite wording
This commit is contained in:
Benoit Marty 2023-12-18 12:05:22 +01:00 • committed by GitHub
commit 040fc3f9a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
View file

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

14
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
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 = {},
)
}