mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-04 01:19:33 +00:00
Merge pull request #2039 from element-hq/feature/bma/fixInviteWording
Fix invite wording
This commit is contained in:
+1
-1
@@ -67,7 +67,7 @@ class RoomInviteMembersNode @AssistedInject constructor(
|
||||
state = state,
|
||||
modifier = modifier,
|
||||
onBackPressed = { navigateUp() },
|
||||
onSendPressed = { users ->
|
||||
onSubmitPressed = { users ->
|
||||
navigateUp()
|
||||
|
||||
coroutineScope.launch {
|
||||
|
||||
+6
-8
@@ -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 = {},
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user