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

change: rename and reorder RoomPermissionsSection to match design

Browse source
This commit is contained in:
ganfra 2025-12-16 21:54:14 +01:00
parent f8824e1ce1
commit a1b84bdcc4
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
View file

@ -45,7 +45,7 @@ class ChangeRoomPermissionsPresenter(
RoomPermissionType.SEND_EVENTS, RoomPermissionType.SEND_EVENTS,
RoomPermissionType.REDACT_EVENTS, RoomPermissionType.REDACT_EVENTS,
) )
RoomPermissionsSection.MembershipModeration -> persistentListOf( RoomPermissionsSection.ManageMembers -> persistentListOf(
RoomPermissionType.INVITE, RoomPermissionType.INVITE,
RoomPermissionType.KICK, RoomPermissionType.KICK,
RoomPermissionType.BAN, RoomPermissionType.BAN,
@ -59,7 +59,7 @@ class ChangeRoomPermissionsPresenter(
private fun RoomPermissionsSection.shouldShow(isSpace: Boolean): Boolean { private fun RoomPermissionsSection.shouldShow(isSpace: Boolean): Boolean {
return when (this) { return when (this) {
RoomPermissionsSection.EditDetails -> true RoomPermissionsSection.EditDetails -> true
RoomPermissionsSection.MembershipModeration -> true RoomPermissionsSection.ManageMembers -> true
RoomPermissionsSection.MessagesAndContent -> !isSpace RoomPermissionsSection.MessagesAndContent -> !isSpace
RoomPermissionsSection.ManageSpace -> isSpace RoomPermissionsSection.ManageSpace -> isSpace
} }

2
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt
View file

@ -50,9 +50,9 @@ data class ChangeRoomPermissionsState(
} }
enum class RoomPermissionsSection { enum class RoomPermissionsSection {
ManageMembers,
EditDetails, EditDetails,
MessagesAndContent, MessagesAndContent,
MembershipModeration,
ManageSpace ManageSpace
} }

1
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
View file

@ -26,6 +26,7 @@ class ChangeRoomPermissionsStateProvider : PreviewParameterProvider<ChangeRoomPe
saveAction = AsyncAction.Failure(IllegalStateException("Failed to save changes")) saveAction = AsyncAction.Failure(IllegalStateException("Failed to save changes"))
), ),
aChangeRoomPermissionsState(hasChanges = true, saveAction = AsyncAction.ConfirmingCancellation), aChangeRoomPermissionsState(hasChanges = true, saveAction = AsyncAction.ConfirmingCancellation),
aChangeRoomPermissionsState(itemsBySection = ChangeRoomPermissionsPresenter.buildItems(isSpace = true)),
) )
} }

2
features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt
View file

@ -112,7 +112,7 @@ fun ChangeRoomPermissionsView(
private fun titleForSection(section: RoomPermissionsSection): String = when (section) { private fun titleForSection(section: RoomPermissionsSection): String = when (section) {
RoomPermissionsSection.EditDetails -> stringResource(R.string.screen_room_change_permissions_room_details) RoomPermissionsSection.EditDetails -> stringResource(R.string.screen_room_change_permissions_room_details)
RoomPermissionsSection.MessagesAndContent -> stringResource(R.string.screen_room_change_permissions_messages_and_content) RoomPermissionsSection.MessagesAndContent -> stringResource(R.string.screen_room_change_permissions_messages_and_content)
RoomPermissionsSection.MembershipModeration -> stringResource(R.string.screen_room_change_permissions_member_moderation) RoomPermissionsSection.ManageMembers -> stringResource(R.string.screen_room_change_permissions_member_moderation)
RoomPermissionsSection.ManageSpace -> stringResource(R.string.screen_room_change_permissions_manage_space) RoomPermissionsSection.ManageSpace -> stringResource(R.string.screen_room_change_permissions_manage_space)
} }

2
features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
View file

@ -62,7 +62,7 @@ class ChangeRoomPermissionsPresenterTest {
RoomPermissionType.SEND_EVENTS, RoomPermissionType.SEND_EVENTS,
RoomPermissionType.REDACT_EVENTS, RoomPermissionType.REDACT_EVENTS,
) )
assertThat(itemsBySection[RoomPermissionsSection.MembershipModeration]).containsExactly( assertThat(itemsBySection[RoomPermissionsSection.ManageMembers]).containsExactly(
RoomPermissionType.INVITE, RoomPermissionType.INVITE,
RoomPermissionType.KICK, RoomPermissionType.KICK,
RoomPermissionType.BAN, RoomPermissionType.BAN,