mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Fix a couple of missing UserStatus values. (#5944)
* Fix the missing UserStatus in RoomMemberProxy. * Use the hero's status for a room's AvatarHeaderView.
This commit is contained in:
@@ -41,14 +41,16 @@ struct AvatarHeaderView<Footer: View>: View {
|
|||||||
@ViewBuilder footer: @escaping () -> Footer) {
|
@ViewBuilder footer: @escaping () -> Footer) {
|
||||||
avatarInfo = .room(room.avatar)
|
avatarInfo = .room(room.avatar)
|
||||||
title = room.name ?? room.id
|
title = room.name ?? room.id
|
||||||
status = nil
|
|
||||||
|
|
||||||
if let roomAlias = room.canonicalAlias {
|
if let roomAlias = room.canonicalAlias {
|
||||||
subtitle = roomAlias
|
subtitle = roomAlias
|
||||||
|
status = nil
|
||||||
} else if room.isDirect, case let .heroes(heroes) = room.avatar, heroes.count == 1 {
|
} else if room.isDirect, case let .heroes(heroes) = room.avatar, heroes.count == 1 {
|
||||||
subtitle = heroes[0].id
|
subtitle = heroes[0].id
|
||||||
|
status = heroes[0].status
|
||||||
} else {
|
} else {
|
||||||
subtitle = nil
|
subtitle = nil
|
||||||
|
status = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
self.avatarSize = avatarSize
|
self.avatarSize = avatarSize
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ final nonisolated class RoomMemberProxy: RoomMemberProxyProtocol {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var status: UserStatus {
|
var status: UserStatus {
|
||||||
UserStatus()
|
UserStatus(rustStatus: member.status, rustCall: member.call)
|
||||||
}
|
}
|
||||||
|
|
||||||
var membership: MembershipState {
|
var membership: MembershipState {
|
||||||
|
|||||||
Reference in New Issue
Block a user