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

Add call icon next to members in call (#5941)

Browse Source 
* feat: add call icon next to members in call

* feat: use matrix rtc room status for in-call

* chore: revert xcodeproj change

* chore: update preview tests

* chore: Update ElementX.xcscheme

* chore: undo room member status proxy

---------

Co-authored-by: Kai <nankeen@users.noreply.github.com>
This commit is contained in:
Kai
2026-08-03 12:37:31 +01:00
committed by Doug
parent 1407a1d5b4
commit 3ab0aacabf
14 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Mocks/JoinedRoomProxyMock.swift
+2 -1
View File
@@ -24,6 +24,7 @@ struct JoinedRoomProxyMockConfiguration {
var isSpace = false
var isEncrypted = true
var hasOngoingCall = true
var activeRoomCallParticipants: [String] = []
var canonicalAlias: String?
var alternativeAliases: [String] = []
var pinnedEventIDs: Set<String> = []
@@ -163,7 +164,7 @@ extension RoomInfoProxyMock {
joinedMembersCount = configuration.members.filter { $0.membership == .join }.count
isDM = isDirect && activeMembersCount <= 2
hasRoomCall = configuration.hasOngoingCall
activeRoomCallParticipants = []
activeRoomCallParticipants = configuration.activeRoomCallParticipants
pinnedEventIDs = configuration.pinnedEventIDs
joinRule = configuration.joinRule
historyVisibility = configuration.historyVisibility
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenModels.swift
+2
View File
@@ -33,6 +33,8 @@ enum RoomMembersListScreenMode {
nonisolated struct RoomMemberListScreenEntry: Equatable {
let member: RoomMemberDetails
let verificationState: UserIdentityVerificationState
/// Whether the member is currently joined to the room's active MatrixRTC call (e.g. Element Call).
var isInCall = false
}
struct RoomMembersListScreenViewState: BindableState {
ElementX/Sources/Screens/RoomMemberListScreen/RoomMembersListScreenViewModel.swift
+10 -4
View File
@@ -125,8 +125,9 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
private func buildMembersDetails(members: [RoomMemberProxyProtocol]) async -> RoomMembersDetails {
// We don't care about identity statuses on non-encrypted rooms
let isEncrypted = roomProxy.infoPublisher.value.isEncrypted
let activeRoomCallParticipants = Set(roomProxy.infoPublisher.value.activeRoomCallParticipants)
return await Task.detached { [weak self] in
let membersDetails: RoomMembersDetails = await Task.detached { [weak self] in
// accessing RoomMember's properties is very slow. We need to do it in a background thread.
var invitedMembers: [RoomMemberListScreenEntry] = .init()
var joinedMembers: [RoomMemberListScreenEntry] = .init()
@@ -137,14 +138,15 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
if isEncrypted, let fetchedState = await self?.userIdentityVerificationState(for: member.userID) {
verificationState = fetchedState
}
let isInCall = activeRoomCallParticipants.contains(member.userID)
switch member.membership {
case .invite:
invitedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
invitedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState, isInCall: isInCall))
case .join:
joinedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
joinedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState, isInCall: isInCall))
case .ban:
bannedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState))
bannedMembers.append(.init(member: .init(withProxy: member), verificationState: verificationState, isInCall: isInCall))
default:
continue
}
@@ -155,6 +157,10 @@ class RoomMembersListScreenViewModel: RoomMembersListScreenViewModelType, RoomMe
bannedMembers: bannedMembers.sorted { $0.member.id.localizedStandardCompare($1.member.id) == .orderedAscending }) // Re-sort ignoring display name.
}
.value
return .init(invitedMembers: membersDetails.invitedMembers,
joinedMembers: membersDetails.joinedMembers.filter(\.isInCall) + membersDetails.joinedMembers.filter { !$0.isInCall },
bannedMembers: membersDetails.bannedMembers)
}
/// The client proxy isn't Sendable, fetch identities through this helper so
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift
+17 -1
View File
@@ -171,6 +171,7 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
static let adminViewModel = makeViewModel(isAdmin: true, initialMode: .members)
static let bannedViewModel = makeViewModel(isAdmin: true, initialMode: .banned)
static let emptyBannedViewModel = makeViewModel(withBanned: false, isAdmin: false, initialMode: .members)
static let adminInCallViewModel = makeViewModel(withInCall: true, isAdmin: true)
static var previews: some View {
ElementNavigationStack {
@@ -205,6 +206,14 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
})
.previewDisplayName("Admin: Banned")
ElementNavigationStack {
RoomMembersListScreen(context: adminInCallViewModel.context)
}
.snapshotPreferences(expect: adminInCallViewModel.context.$viewState.map { state in
state.canBanUsers == true
})
.previewDisplayName("Admin: In-Call")
ElementNavigationStack {
RoomMembersListScreen(context: emptyBannedViewModel.context)
.onAppear { emptyBannedViewModel.context.searchQuery = "Dan" }
@@ -215,6 +224,7 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
static func makeViewModel(withInvites: Bool = false,
withBanned: Bool = true,
withInCall: Bool = false,
isAdmin: Bool = false,
initialMode: RoomMembersListScreenMode = .members) -> RoomMembersListScreenViewModel {
let mockAdmin = RoomMemberProxyMock.mockAdmin
@@ -228,7 +238,8 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
mockAdmin,
.mockCreator,
.mockOwner,
.mockModerator
.mockModerator,
.mockFrank
]
if withBanned {
@@ -239,6 +250,10 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
members.append(.mockInvited)
}
let activeRoomCallParticipants = withInCall ? [RoomMemberProxyMock.mockAlice.userID,
RoomMemberProxyMock.mockOwner.userID,
mockAdmin.userID] : []
let clientProxyMock = ClientProxyMock(.init())
clientProxyMock.userIdentityForFallBackToServerClosure = { userID, _ in
let identity = switch userID {
@@ -256,6 +271,7 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
return RoomMembersListScreenViewModel(initialMode: initialMode,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
roomProxy: JoinedRoomProxyMock(.init(name: "Some room",
activeRoomCallParticipants: activeRoomCallParticipants,
members: members,
ownUserID: ownUserID,
powerLevelsConfiguration: .init(canUserInvite: false))),
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
+9
View File
@@ -55,6 +55,12 @@ struct RoomMembersListScreenMemberCell: View {
.font(.compound.bodyLG)
.foregroundStyle(.compound.textSecondary)
}
if listEntry.isInCall {
CompoundIcon(\.videoCallSolid, size: .small, relativeTo: .compound.bodyLG)
.foregroundStyle(.compound.iconAccentPrimary)
.accessibilityLabel(L10n.commonOnACall)
}
}
.overlay(alignment: .bottom) {
if !isLast {
@@ -117,6 +123,9 @@ struct RoomMembersListMemberCell_Previews: PreviewProvider, TestablePreview {
verificationState: .verified),
.init(member: .init(withProxy: RoomMemberProxyMock.mockModerator),
verificationState: .verificationViolation),
.init(member: .init(withProxy: RoomMemberProxyMock.mockFrank),
verificationState: .notVerified,
isInCall: true),
.init(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@nodisplayname:matrix.org",
membership: .join))),
verificationState: .notVerified),