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
.maestro/tests/roomList/createAndDeleteRoom.yaml
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`.

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 = {},
)
}

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_0,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8e4a5f2e2891b9bd30820eb1cb48f7638d8404f3f832292370045c158ed8119
size 15591
oid sha256:e3325a866df1f3d63c695248ee172329f436d91521679ada53c15e34a072a42a
size 15479

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_1,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:146520142622fca01a41565cd541a91ec195271a6c150e0290d5866dfc4d82e1
size 30538
oid sha256:7e264effbf1d64f8a2623dd94f35d8147dc3f4866f3d69ca3adfdc63207b6bb1
size 30433

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_2,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ce3c787a381fdacb26b59143eb3cecb6ff7c16585e72b662c0b4b485ad381b4
size 12807
oid sha256:43e15edc704b5e6f278d29cf80356605045b8cb7f16b48cb38d8d9c3d1140864
size 12688

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_3,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c94844b4f96cab30b096b71d5d75ce4340669d0fc136359fe3276d8fcb3e823e
size 28071
oid sha256:5276aef1eab0cdfda2c2064b1e9786045d57ae51f3ac2aaf21887fc9a991c3f9
size 27927

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_4,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c830350a8f0314b63b2c27513b2295314222e29d418a8aa9101dd7c667326c82
size 14865
oid sha256:3464e46b61b405ad19c711a920a3464388414542d80769e7ce832be09209c3f8
size 14749

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_5,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96313c818323fa01c5372cf85918e226443b5ee65c035aeb426fd48358d178f3
size 46229
oid sha256:32a9a3c590d2ea079d0e92290ce9f55de3db56055a7f922d57aef53219f19344
size 46127

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Day-1_1_null_6,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e9b26c7b19b765cf90c7acb28a15929b7c13114200df6971b11090ec554bc64
size 40286
oid sha256:26377b40db2c1f5b1f818e299366ccf77bf49b5ef74f823101360c6fe24f7aed
size 40178

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_0,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2561d75e7b2b15599b3427b9c72909288c85074f08bedb19f637ea4d1c58fd31
size 14551
oid sha256:63ed0ac922e370dc2e87048333bfc32a4d208ea4fcccf1adfab6641fdea88ebb
size 14433

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_1,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efbb9721f9ba1afa5240800d07cec86917f164b016f14badaf1c49bb42297f3e
size 29063
oid sha256:9e1a482977bac69f8b26ad9516d7c37759b0c5713828bf489d6c189567f10abf
size 29003

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_2,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0a60375d65b3e5da47aa38f19b9dbc654bc9467928f13f2e2ac3aecf68ef6d9
size 11925
oid sha256:d25d23b1194164edde48b6a1aac9a3df9b10b4a0e6b307dd4aabb90800cdc8c2
size 11814

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_3,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d9d505eb184f3e21efe3f1ab0f4dd8b041854b96dc75075bd3f7c0ea72e1878
size 26919
oid sha256:998a3e433e20d835300fa1f1c625944262dd169b86b40ff8e49e2b6c982b71d1
size 26841

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_4,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10bc42192a3a84dd2f8d1da4379d0eb6f9f5100840c0c6af6860cf3bddfa6916
size 13939
oid sha256:0ab8ba4088ab61d4e905f32dac9fe2ead4662d8c6e9bd882b135d468320632f3
size 13831

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_5,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01d889cc838e1e33ad2798dc5273eb77c5db202bb1bbd2bcbe61858d6bc87063
size 45289
oid sha256:53deb0fc171c1d77101a36703391782ac3660d7acc6c6c6422ba0309c462b7dd
size 45231

4
tests/uitests/src/test/snapshots/images/ui_S_t[f.roomdetails.impl.invite_RoomInviteMembers_null_RoomInviteMembers-Night-1_2_null_6,NEXUS_5,1.0,en].png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea0a8550c6564c2c0ea1564c3631bc9652780e4a078aa63e42c78897a3b8aab1
size 38465
oid sha256:f98e68f370e77d00a2578a87fdecddefa12a91f851c030c1451af40ba11bbb11
size 38409