ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Last Owner should edit admins, and not leave when is last (#4372)

Browse Source
This commit is contained in:
Mauro
2025-08-07 10:40:14 +02:00
committed by GitHub
parent be525e6a60
commit 5ab6f90863
67 changed files with 691 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift
+38 -14
View File
@@ -45,15 +45,18 @@ struct RoomChangeRolesScreen: View {
}
}
RoomChangeRolesScreenSection(members: context.viewState.visibleOwners,
role: .owner,
context: context)
RoomChangeRolesScreenSection(members: context.viewState.visibleAdministrators,
title: L10n.screenRoomChangeRoleSectionAdministrators,
isAdministratorsSection: true,
role: .administrator,
context: context)
RoomChangeRolesScreenSection(members: context.viewState.visibleModerators,
title: L10n.screenRoomChangeRoleSectionModerators,
role: .moderator,
context: context)
RoomChangeRolesScreenSection(members: context.viewState.visibleUsers,
title: L10n.screenRoomChangeRoleSectionUsers,
role: .user,
context: context)
}
}
@@ -65,10 +68,12 @@ struct RoomChangeRolesScreen: View {
ScrollViewReader { scrollView in
HStack(spacing: 16) {
ForEach(context.viewState.membersWithRole, id: \.id) { member in
RoomChangeRolesScreenSelectedItem(member: member, mediaProvider: context.mediaProvider) {
let dismissAction = context.viewState.isMemberDisabled(member) ? nil : {
context.send(viewAction: .demoteMember(member))
}
.frame(width: cellWidth)
RoomChangeRolesScreenSelectedItem(member: member, mediaProvider: context.mediaProvider,
dismissAction: dismissAction)
.frame(width: cellWidth)
}
}
.onChange(of: context.viewState.lastPromotedMember) { _, newValue in
@@ -104,10 +109,22 @@ struct RoomChangeRolesScreen: View {
// MARK: - Previews
struct RoomChangeRolesScreen_Previews: PreviewProvider, TestablePreview {
static let administratorViewModel = makeViewModel(mode: .administrator)
static let moderatorViewModel = makeViewModel(mode: .moderator)
static let ownerViewModel = makeViewModel(mode: .owner, ownRole: .creator)
static let administratorOrOwnerViewModel = makeViewModel(mode: .administrator, ownRole: .creator)
static let administratorViewModel = makeViewModel(mode: .administrator, ownRole: .administrator)
static let moderatorViewModel = makeViewModel(mode: .moderator, ownRole: .administrator)
static var previews: some View {
NavigationStack {
RoomChangeRolesScreen(context: ownerViewModel.context)
}
.previewDisplayName("Owners")
NavigationStack {
RoomChangeRolesScreen(context: administratorOrOwnerViewModel.context)
}
.previewDisplayName("Administrator or Owners")
NavigationStack {
RoomChangeRolesScreen(context: administratorViewModel.context)
}
@@ -119,11 +136,18 @@ struct RoomChangeRolesScreen_Previews: PreviewProvider, TestablePreview {
.previewDisplayName("Moderators")
}
static func makeViewModel(mode: RoomMemberDetails.Role) -> RoomChangeRolesScreenViewModel {
RoomChangeRolesScreenViewModel(mode: mode,
roomProxy: JoinedRoomProxyMock(.init(members: .allMembersAsAdmin)),
mediaProvider: MediaProviderMock(configuration: .init()),
userIndicatorController: UserIndicatorControllerMock(),
analytics: ServiceLocator.shared.analytics)
static func makeViewModel(mode: RoomRole, ownRole: RoomRole) -> RoomChangeRolesScreenViewModel {
let members: [RoomMemberProxyMock] = switch ownRole {
case .creator:
.allMembersAsCreator
default:
.allMembersAsAdminV2
}
return RoomChangeRolesScreenViewModel(mode: mode,
roomProxy: JoinedRoomProxyMock(.init(members: members)),
mediaProvider: MediaProviderMock(configuration: .init()),
userIndicatorController: UserIndicatorControllerMock(),
analytics: ServiceLocator.shared.analytics)
}
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSection.swift
+20 -10
View File
@@ -10,36 +10,46 @@ import SwiftUI
struct RoomChangeRolesScreenSection: View {
let members: [RoomMemberDetails]
let title: String
var isAdministratorsSection = false
let role: RoomRole
let context: RoomChangeRolesScreenViewModel.Context
var title: String {
switch role {
case .creator, .owner:
L10n.screenRoomRolesAndPermissionsOwners
case .administrator:
L10n.screenRoomChangeRoleSectionAdministrators
case .moderator:
L10n.screenRoomChangeRoleSectionModerators
case .user:
L10n.screenRoomChangeRoleSectionUsers
}
}
var body: some View {
if !members.isEmpty {
Section {
ForEach(members, id: \.id) { member in
RoomChangeRolesScreenRow(member: member,
mediaProvider: context.mediaProvider,
isSelected: isMemberSelected(member)) {
isSelected: context.viewState.isMemberSelected(member)) {
context.send(viewAction: .toggleMember(member))
}
.disabled(member.role.isAdminOrHigher)
.disabled(context.viewState.isMemberDisabled(member))
}
} header: {
Text(title)
.compoundListSectionHeader()
} footer: {
if isAdministratorsSection, context.viewState.mode == .moderator {
if role == .administrator, context.viewState.mode == .moderator {
Text(L10n.screenRoomChangeRoleModeratorsAdminSectionFooter)
.compoundListSectionFooter()
} else if role.isOwner, context.viewState.mode != .owner {
Text(L10n.screenRoomChangeRoleModeratorsOwnerSectionFooter)
.compoundListSectionFooter()
}
}
}
}
private func isMemberSelected(_ member: RoomMemberDetails) -> Bool {
// We always show administrators as selected, even on the moderators screen.
member.role.isAdminOrHigher || context.viewState.isMemberSelected(member)
}
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift
+15 -7
View File
@@ -10,9 +10,22 @@ import SwiftUI
struct RoomChangeRolesScreenSelectedItem: View {
let member: RoomMemberDetails
let mediaProvider: MediaProviderProtocol?
let dismissAction: () -> Void
let dismissAction: (() -> Void)?
var body: some View {
mainContent
.accessibilityActions {
if let dismissAction {
Button(L10n.actionDismiss) {
dismissAction()
}
}
}
}
// MARK: - Private
private var mainContent: some View {
VStack(spacing: 4) {
avatar
@@ -22,13 +35,8 @@ struct RoomChangeRolesScreenSelectedItem: View {
.lineLimit(1)
}
.accessibilityElement(children: .combine)
.accessibilityAction(named: L10n.actionDismiss) {
dismissAction()
}
}
// MARK: - Private
var avatar: some View {
LoadableAvatarImage(url: member.avatarURL,
name: member.name,
@@ -37,7 +45,7 @@ struct RoomChangeRolesScreenSelectedItem: View {
mediaProvider: mediaProvider)
.accessibilityHidden(true)
.overlay(alignment: .topTrailing) {
if member.role != .administrator {
if let dismissAction {
Button(action: dismissAction) {
Image(systemName: "xmark.circle.fill")
.resizable()