mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
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
GitHub
-2
@@ -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)
|
||||
|
||||
+71
-48
@@ -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))
|
||||
}
|
||||
}
|
||||
|
||||
+4
-3
@@ -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
|
||||
}
|
||||
|
||||
+26
-24
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user