Permissions screen redesign (#4735)

* Redesigned permissions screen

# Conflicts:
#	ElementX.xcodeproj/project.pbxproj

* updated tests

* update proj

* fix pseudo language tests
This commit is contained in:
Mauro
2025-11-12 14:41:44 +01:00
committed by GitHub
parent cd411b57e0
commit cbe0cfe129
76 changed files with 545 additions and 467 deletions
@@ -119,10 +119,10 @@ class RoomRolesAndPermissionsFlowCoordinator: FlowCoordinatorProtocol {
stateMachine.addRoutes(event: .finishedChangingRoles, transitions: [.changingRoles => .rolesAndPermissionsScreen])
stateMachine.addRoutes(event: .changePermissions, transitions: [.rolesAndPermissionsScreen => .changingPermissions]) { [weak self] context in
guard let (permissions, group) = context.userInfo as? (RoomPermissions, RoomRolesAndPermissionsScreenPermissionsGroup) else {
guard let permissions = context.userInfo as? RoomPermissions else {
fatalError("Expected a group and the current permissions")
}
self?.presentChangePermissionsScreen(permissions: permissions, group: group)
self?.presentChangePermissionsScreen(permissions: permissions)
}
stateMachine.addRoutes(event: .finishedChangingPermissions, transitions: [.changingPermissions => .rolesAndPermissionsScreen])
@@ -144,8 +144,8 @@ class RoomRolesAndPermissionsFlowCoordinator: FlowCoordinatorProtocol {
switch action {
case .editRoles(let role):
stateMachine.tryEvent(.changeRoles, userInfo: role)
case .editPermissions(let permissions, let group):
stateMachine.tryEvent(.changePermissions, userInfo: (permissions, group))
case .editPermissions(let permissions):
stateMachine.tryEvent(.changePermissions, userInfo: permissions)
case .demotedOwnUser:
stateMachine.tryEvent(.demotedOwnUser)
}
@@ -179,9 +179,8 @@ class RoomRolesAndPermissionsFlowCoordinator: FlowCoordinatorProtocol {
}
}
private func presentChangePermissionsScreen(permissions: RoomPermissions, group: RoomRolesAndPermissionsScreenPermissionsGroup) {
private func presentChangePermissionsScreen(permissions: RoomPermissions) {
let parameters = RoomChangePermissionsScreenCoordinatorParameters(permissions: permissions,
permissionsGroup: group,
roomProxy: roomProxy,
userIndicatorController: userIndicatorController,
analytics: analytics)
+17 -16
View File
@@ -2292,27 +2292,31 @@ internal enum L10n {
internal static var screenRoomAttachmentSourcePoll: String { return L10n.tr("Localizable", "screen_room_attachment_source_poll") }
/// Text Formatting
internal static var screenRoomAttachmentTextFormatting: String { return L10n.tr("Localizable", "screen_room_attachment_text_formatting") }
/// Admins only
/// Admin
internal static var screenRoomChangePermissionsAdministrators: String { return L10n.tr("Localizable", "screen_room_change_permissions_administrators") }
/// Ban people
internal static var screenRoomChangePermissionsBanPeople: String { return L10n.tr("Localizable", "screen_room_change_permissions_ban_people") }
/// Change settings
internal static var screenRoomChangePermissionsChangeSettings: String { return L10n.tr("Localizable", "screen_room_change_permissions_change_settings") }
/// Remove messages
internal static var screenRoomChangePermissionsDeleteMessages: String { return L10n.tr("Localizable", "screen_room_change_permissions_delete_messages") }
/// Everyone
/// Member
internal static var screenRoomChangePermissionsEveryone: String { return L10n.tr("Localizable", "screen_room_change_permissions_everyone") }
/// Invite people and accept requests to join
/// Invite people
internal static var screenRoomChangePermissionsInvitePeople: String { return L10n.tr("Localizable", "screen_room_change_permissions_invite_people") }
/// Member moderation
/// Manage space
internal static var screenRoomChangePermissionsManageSpace: String { return L10n.tr("Localizable", "screen_room_change_permissions_manage_space") }
/// Manage members
internal static var screenRoomChangePermissionsMemberModeration: String { return L10n.tr("Localizable", "screen_room_change_permissions_member_moderation") }
/// Messages and content
internal static var screenRoomChangePermissionsMessagesAndContent: String { return L10n.tr("Localizable", "screen_room_change_permissions_messages_and_content") }
/// Admins and moderators
/// Moderator
internal static var screenRoomChangePermissionsModerators: String { return L10n.tr("Localizable", "screen_room_change_permissions_moderators") }
/// Remove people and decline requests to join
/// Remove people
internal static var screenRoomChangePermissionsRemovePeople: String { return L10n.tr("Localizable", "screen_room_change_permissions_remove_people") }
/// Change avatar
internal static var screenRoomChangePermissionsRoomAvatar: String { return L10n.tr("Localizable", "screen_room_change_permissions_room_avatar") }
/// Room details
/// Edit details
internal static var screenRoomChangePermissionsRoomDetails: String { return L10n.tr("Localizable", "screen_room_change_permissions_room_details") }
/// Change name
internal static var screenRoomChangePermissionsRoomName: String { return L10n.tr("Localizable", "screen_room_change_permissions_room_name") }
@@ -2320,6 +2324,8 @@ internal enum L10n {
internal static var screenRoomChangePermissionsRoomTopic: String { return L10n.tr("Localizable", "screen_room_change_permissions_room_topic") }
/// Send messages
internal static var screenRoomChangePermissionsSendMessages: String { return L10n.tr("Localizable", "screen_room_change_permissions_send_messages") }
/// Permissions
internal static var screenRoomChangePermissionsTitle: String { return L10n.tr("Localizable", "screen_room_change_permissions_title") }
/// Edit Admins or Owners
internal static var screenRoomChangeRoleAdministratorsOrOwnersTitle: String { return L10n.tr("Localizable", "screen_room_change_role_administrators_or_owners_title") }
/// Edit Admins
@@ -2408,7 +2414,7 @@ internal enum L10n {
internal static var screenRoomDetailsProfileRowTitle: String { return L10n.tr("Localizable", "screen_room_details_profile_row_title") }
/// Requests to join
internal static var screenRoomDetailsRequestsToJoinTitle: String { return L10n.tr("Localizable", "screen_room_details_requests_to_join_title") }
/// Roles and permissions
/// Roles & permissions
internal static var screenRoomDetailsRolesAndPermissions: String { return L10n.tr("Localizable", "screen_room_details_roles_and_permissions") }
/// Room name
internal static var screenRoomDetailsRoomNameLabel: String { return L10n.tr("Localizable", "screen_room_details_room_name_label") }
@@ -2588,7 +2594,9 @@ internal enum L10n {
internal static var screenRoomRolesAndPermissionsRolesHeader: String { return L10n.tr("Localizable", "screen_room_roles_and_permissions_roles_header") }
/// Room details
internal static var screenRoomRolesAndPermissionsRoomDetails: String { return L10n.tr("Localizable", "screen_room_roles_and_permissions_room_details") }
/// Roles and permissions
/// Space details
internal static var screenRoomRolesAndPermissionsSpaceDetails: String { return L10n.tr("Localizable", "screen_room_roles_and_permissions_space_details") }
/// Roles & permissions
internal static var screenRoomRolesAndPermissionsTitle: String { return L10n.tr("Localizable", "screen_room_roles_and_permissions_title") }
/// Accept
internal static var screenRoomSingleKnockRequestAcceptButtonTitle: String { return L10n.tr("Localizable", "screen_room_single_knock_request_accept_button_title") }
@@ -3437,13 +3445,6 @@ internal enum L10n {
return L10n.tr("Localizable", "error.account_already_logged_in", String(describing: p1))
}
}
internal enum Screen {
internal enum RoomRolesAndPermissions {
/// Space details
internal static var spaceDetails: String { return L10n.tr("Localizable", "screen.room_roles_and_permissions.space_details") }
}
}
}
// swiftlint:enable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:enable nesting type_body_length type_name vertical_whitespace_opening_braces
@@ -197,9 +197,7 @@ enum A11yIdentifiers {
struct RoomRolesAndPermissionsScreen {
let administrators = "room_roles_and_permissions-administrators"
let moderators = "room_roles_and_permissions-moderators"
let roomDetails = "room_roles_and_permissions-room_details"
let messagesAndContent = "room_roles_and_permissions-messages_and_content"
let memberModeration = "room_roles_and_permissions-member_moderation"
let permissions = "room_roles_and_permissions-permissions"
}
struct SecureBackupScreen {
@@ -11,7 +11,6 @@ import SwiftUI
struct RoomChangePermissionsScreenCoordinatorParameters {
let permissions: RoomPermissions
let permissionsGroup: RoomRolesAndPermissionsScreenPermissionsGroup
let roomProxy: JoinedRoomProxyProtocol
let userIndicatorController: UserIndicatorControllerProtocol
let analytics: AnalyticsService
@@ -35,7 +34,6 @@ final class RoomChangePermissionsScreenCoordinator: CoordinatorProtocol {
self.parameters = parameters
viewModel = RoomChangePermissionsScreenViewModel(currentPermissions: parameters.permissions,
group: parameters.permissionsGroup,
roomProxy: parameters.roomProxy,
userIndicatorController: parameters.userIndicatorController,
analytics: parameters.analytics)
@@ -14,8 +14,6 @@ enum RoomChangePermissionsScreenViewModelAction {
}
struct RoomChangePermissionsScreenViewState: BindableState {
/// The screen's title.
let title: String
/// The current permissions that are set on the room.
var currentPermissions: RoomPermissions
@@ -23,13 +21,15 @@ struct RoomChangePermissionsScreenViewState: BindableState {
/// Whether or not there are and changes to be saved.
var hasChanges: Bool {
bindings.settings.contains { currentPermissions[keyPath: $0.keyPath] != $0.value }
bindings.settings.values
.flatMap { $0 }
.contains { currentPermissions[keyPath: $0.keyPath] != $0.value }
}
}
struct RoomChangePermissionsScreenViewStateBindings: BindableState {
/// All of the settings shown for this screen.
var settings: [RoomPermissionsSetting]
var settings: [RoomChangePermissionsScreenGroup: [RoomPermissionsSetting]]
/// Information about the currently displayed alert.
var alertInfo: AlertInfo<RoomChangePermissionsScreenAlertType>?
}
@@ -48,54 +48,77 @@ enum RoomChangePermissionsScreenViewAction {
case cancel
}
enum RoomChangePermissionsScreenGroup: CaseIterable {
case memberModeration
case roomDetails
case messagesAndContent
case manageSpace
var name: String {
switch self {
case .roomDetails: return L10n.screenRoomChangePermissionsRoomDetails
case .memberModeration: return L10n.screenRoomChangePermissionsMemberModeration
case .messagesAndContent: return L10n.screenRoomChangePermissionsMessagesAndContent
case .manageSpace: return L10n.screenRoomChangePermissionsManageSpace
}
}
}
extension RoomChangePermissionsScreenViewState {
/// Creates a view state for a particular group of permissions.
/// - Parameters:
/// - currentPermissions: The current permissions for the room.
/// - group: The group of permissions that should be shown in the screen.
init(currentPermissions: RoomPermissions, group: RoomRolesAndPermissionsScreenPermissionsGroup) {
switch group {
case .roomDetails:
let settings = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRoomName,
value: currentPermissions.roomName,
keyPath: \.roomName),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRoomAvatar,
value: currentPermissions.roomAvatar,
keyPath: \.roomAvatar),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRoomTopic,
value: currentPermissions.roomTopic,
keyPath: \.roomTopic)
]
self.init(title: L10n.screenRoomChangePermissionsRoomDetails, currentPermissions: currentPermissions, bindings: .init(settings: settings))
case .messagesAndContent:
let settings = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsSendMessages,
value: currentPermissions.eventsDefault,
keyPath: \.eventsDefault),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsDeleteMessages,
value: currentPermissions.redact,
keyPath: \.redact)
]
self.init(title: L10n.screenRoomChangePermissionsMessagesAndContent, currentPermissions: currentPermissions, bindings: .init(settings: settings))
case .memberModeration:
let settings = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsInvitePeople,
value: currentPermissions.invite,
keyPath: \.invite),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRemovePeople,
value: currentPermissions.kick,
keyPath: \.kick),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsBanPeople,
value: currentPermissions.ban,
keyPath: \.ban)
]
self.init(title: L10n.screenRoomChangePermissionsMemberModeration, currentPermissions: currentPermissions, bindings: .init(settings: settings))
/// - isSpace: if the room is a space or a normal room.
init(currentPermissions: RoomPermissions, isSpace: Bool) {
var settings = [RoomChangePermissionsScreenGroup: [RoomPermissionsSetting]]()
for group in RoomChangePermissionsScreenGroup.allCases {
switch group {
case .roomDetails:
settings[group] = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRoomName,
value: currentPermissions.roomName,
keyPath: \.roomName),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRoomAvatar,
value: currentPermissions.roomAvatar,
keyPath: \.roomAvatar),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRoomTopic,
value: currentPermissions.roomTopic,
keyPath: \.roomTopic)
]
case .memberModeration:
settings[group] = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsInvitePeople,
value: currentPermissions.invite,
keyPath: \.invite),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsRemovePeople,
value: currentPermissions.kick,
keyPath: \.kick),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsBanPeople,
value: currentPermissions.ban,
keyPath: \.ban)
]
case .messagesAndContent:
if !isSpace {
settings[group] = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsSendMessages,
value: currentPermissions.eventsDefault,
keyPath: \.eventsDefault),
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsDeleteMessages,
value: currentPermissions.redact,
keyPath: \.redact)
]
}
case .manageSpace:
if isSpace {
settings[group] = [
RoomPermissionsSetting(title: L10n.screenRoomChangePermissionsChangeSettings,
value: currentPermissions.stateDefault,
keyPath: \.stateDefault)
]
}
}
}
self.init(currentPermissions: currentPermissions, bindings: .init(settings: settings))
}
}
@@ -23,14 +23,13 @@ class RoomChangePermissionsScreenViewModel: RoomChangePermissionsScreenViewModel
}
init(currentPermissions: RoomPermissions,
group: RoomRolesAndPermissionsScreenPermissionsGroup,
roomProxy: JoinedRoomProxyProtocol,
userIndicatorController: UserIndicatorControllerProtocol,
analytics: AnalyticsService) {
self.roomProxy = roomProxy
self.userIndicatorController = userIndicatorController
self.analytics = analytics
super.init(initialViewState: .init(currentPermissions: currentPermissions, group: group))
super.init(initialViewState: .init(currentPermissions: currentPermissions, isSpace: roomProxy.infoPublisher.value.isSpace))
}
// MARK: - Public
@@ -61,7 +60,9 @@ class RoomChangePermissionsScreenViewModel: RoomChangePermissionsScreenViewModel
}
var changes = RoomPowerLevelChanges()
let changedSettings = state.bindings.settings.filter { state.currentPermissions[keyPath: $0.keyPath] != $0.value }
let changedSettings = state.bindings.settings.values
.flatMap { $0 }
.filter { state.currentPermissions[keyPath: $0.keyPath] != $0.value }
for setting in changedSettings {
changes[keyPath: setting.rustKeyPath] = setting.value.powerLevelValue
}
@@ -14,24 +14,33 @@ struct RoomChangePermissionsScreen: View {
var body: some View {
Form {
ForEach($context.settings) { $setting in
Section {
ListRow(label: .plain(title: setting.title),
kind: .inlinePicker(selection: $setting.value, items: setting.allValues))
} header: {
Text(setting.title)
.compoundListSectionHeader()
}
ForEach(RoomChangePermissionsScreenGroup.allCases, id: \.self) { group in
section(for: group)
}
}
.compoundList()
.navigationTitle(context.viewState.title)
.navigationTitle(L10n.screenRoomChangePermissionsTitle)
.navigationBarTitleDisplayMode(.inline)
.navigationBarBackButtonHidden(context.viewState.hasChanges)
.toolbar { toolbar }
.alert(item: $context.alertInfo)
}
@ViewBuilder
private func section(for group: RoomChangePermissionsScreenGroup) -> some View {
if let settings = Binding($context.settings[group]) {
Section {
ForEach(settings) { $setting in
ListRow(label: .plain(title: setting.title),
kind: .picker(selection: $setting.value, items: setting.allValues))
}
} header: {
Text(group.name)
.compoundListSectionHeader()
}
}
}
@ToolbarContentBuilder
var toolbar: some ToolbarContent {
ToolbarItem(placement: .confirmationAction) {
@@ -54,31 +63,24 @@ struct RoomChangePermissionsScreen: View {
// MARK: - Previews
struct RoomChangePermissionsScreen_Previews: PreviewProvider, TestablePreview {
static let detailsViewModel = makeViewModel(group: .roomDetails)
static let messagesViewModel = makeViewModel(group: .messagesAndContent)
static let membersViewModel = makeViewModel(group: .memberModeration)
static let roomViewModel = makeViewModel(isSpace: false)
static let spaceViewModel = makeViewModel(isSpace: true)
static var previews: some View {
NavigationStack {
RoomChangePermissionsScreen(context: detailsViewModel.context)
RoomChangePermissionsScreen(context: roomViewModel.context)
}
.previewDisplayName("Room details")
.previewDisplayName("Room")
NavigationStack {
RoomChangePermissionsScreen(context: messagesViewModel.context)
RoomChangePermissionsScreen(context: spaceViewModel.context)
}
.previewDisplayName("Messages and Content")
NavigationStack {
RoomChangePermissionsScreen(context: membersViewModel.context)
}
.previewDisplayName("Member moderation")
.previewDisplayName("Space")
}
static func makeViewModel(group: RoomRolesAndPermissionsScreenPermissionsGroup) -> RoomChangePermissionsScreenViewModel {
static func makeViewModel(isSpace: Bool) -> RoomChangePermissionsScreenViewModel {
RoomChangePermissionsScreenViewModel(currentPermissions: .init(powerLevels: .mock),
group: group,
roomProxy: JoinedRoomProxyMock(.init()),
roomProxy: JoinedRoomProxyMock(.init(isSpace: isSpace)),
userIndicatorController: UserIndicatorControllerMock(),
analytics: ServiceLocator.shared.analytics)
}
@@ -17,7 +17,7 @@ struct RoomRolesAndPermissionsScreenCoordinatorParameters {
enum RoomRolesAndPermissionsScreenCoordinatorAction {
case editRoles(RoomRolesAndPermissionsScreenRole)
case editPermissions(permissions: RoomPermissions, group: RoomRolesAndPermissionsScreenPermissionsGroup)
case editPermissions(permissions: RoomPermissions)
case demotedOwnUser
}
@@ -44,8 +44,8 @@ final class RoomRolesAndPermissionsScreenCoordinator: CoordinatorProtocol {
switch action {
case .editRoles(let role):
actionsSubject.send(.editRoles(role))
case .editPermissions(let permissions, let group):
actionsSubject.send(.editPermissions(permissions: permissions, group: group))
case .editPermissions(let permissions):
actionsSubject.send(.editPermissions(permissions: permissions))
case .demotedOwnUser:
actionsSubject.send(.demotedOwnUser)
}
@@ -12,7 +12,7 @@ enum RoomRolesAndPermissionsScreenViewModelAction {
/// The user would like to edit member roles.
case editRoles(RoomRolesAndPermissionsScreenRole)
/// The user would like to edit room permissions.
case editPermissions(permissions: RoomPermissions, group: RoomRolesAndPermissionsScreenPermissionsGroup)
case editPermissions(permissions: RoomPermissions)
/// The user has demoted themself.
case demotedOwnUser
}
@@ -47,7 +47,7 @@ enum RoomRolesAndPermissionsScreenAlertType {
enum RoomRolesAndPermissionsScreenViewAction {
case editRoles(RoomRolesAndPermissionsScreenRole)
case editOwnUserRole
case editPermissions(RoomRolesAndPermissionsScreenPermissionsGroup)
case editPermissions
case reset
}
@@ -55,9 +55,3 @@ enum RoomRolesAndPermissionsScreenRole: Hashable {
case administrators
case moderators
}
enum RoomRolesAndPermissionsScreenPermissionsGroup {
case roomDetails
case messagesAndContent
case memberModeration
}
@@ -71,8 +71,8 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
Task { await self.updateOwnRole(.user) }
}
])
case .editPermissions(let permissionsGroup):
editPermissions(group: permissionsGroup)
case .editPermissions:
editPermissions()
case .reset:
state.bindings.alertInfo = AlertInfo(id: .resetConfirmation,
title: L10n.screenRoomRolesAndPermissionsResetConfirmTitle,
@@ -126,13 +126,13 @@ class RoomRolesAndPermissionsScreenViewModel: RoomRolesAndPermissionsScreenViewM
}
}
private func editPermissions(group: RoomRolesAndPermissionsScreenPermissionsGroup) {
private func editPermissions() {
guard let permissions = state.permissions else {
state.bindings.alertInfo = AlertInfo(id: .error)
MXLog.error("Missing permissions.")
return
}
actionsSubject.send(.editPermissions(permissions: permissions, group: group))
actionsSubject.send(.editPermissions(permissions: permissions))
}
private func resetPermissions() async {
@@ -92,42 +92,22 @@ struct RoomRolesAndPermissionsScreen: View {
private var permissionsSection: some View {
Section {
ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsRoomDetails,
icon: \.info),
ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsPermissionsHeader,
icon: \.settings),
details: .isWaiting(context.viewState.permissions == nil),
kind: .navigationLink {
context.send(viewAction: .editPermissions(.roomDetails))
context.send(viewAction: .editPermissions)
})
.accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.roomDetails)
.accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.permissions)
.disabled(context.viewState.permissions == nil)
ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsMessagesAndContent,
icon: \.chat),
details: .isWaiting(context.viewState.permissions == nil),
kind: .navigationLink {
context.send(viewAction: .editPermissions(.messagesAndContent))
})
.accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.messagesAndContent)
.disabled(context.viewState.permissions == nil)
ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsMemberModeration,
icon: \.user),
details: .isWaiting(context.viewState.permissions == nil),
kind: .navigationLink {
context.send(viewAction: .editPermissions(.memberModeration))
})
.accessibilityIdentifier(A11yIdentifiers.roomRolesAndPermissionsScreen.memberModeration)
.disabled(context.viewState.permissions == nil)
} header: {
Text(L10n.screenRoomRolesAndPermissionsPermissionsHeader)
.compoundListSectionHeader()
}
}
private var resetSection: some View {
Section {
ListRow(label: .plain(title: L10n.screenRoomRolesAndPermissionsReset,
role: .destructive),
ListRow(label: .default(title: L10n.screenRoomRolesAndPermissionsReset,
icon: \.delete,
role: .destructive),
kind: .button {
context.send(viewAction: .reset)
})