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

Update the section order in RoomDetailsScreen to match the latest Figma. (#5653)

Browse Source 
Also make sure we snapshot the entire thing.
This commit is contained in:
Doug
2026-05-28 10:55:39 +01:00
committed by GitHub
parent 5d8d96e3dc
commit 594d041128
25 changed files with 113 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
+65 -45
View File
@@ -25,18 +25,20 @@ struct RoomDetailsScreen: View {
// The invitation flow is different for DMs
if context.viewState.dmRecipientInfo != nil {
inviteToNewRoomSection
profileSection
} else {
peopleSection
}
configurationSection
if context.viewState.dmRecipientInfo == nil {
peopleSection
}
securitySection
if let recipient = context.viewState.dmRecipientInfo?.member {
ignoreUserSection(user: recipient)
} else if context.viewState.reportRoomEnabled {
reportRoomSection
}
leaveRoomSection
@@ -171,10 +173,33 @@ struct RoomDetailsScreen: View {
}
private var inviteToNewRoomSection: some View {
ListRow(label: .default(title: L10n.actionInvite, icon: \.userAdd),
kind: .navigationLink {
context.send(viewAction: .processTapInvite)
})
Section {
ListRow(label: .default(title: L10n.actionInvite, icon: \.userAdd),
kind: .navigationLink {
context.send(viewAction: .processTapInvite)
})
}
}
private var profileSection: some View {
Section {
if context.viewState.dmRecipientInfo != nil {
let details: ListRowDetails? = switch context.viewState.dmRecipientInfo?.verificationState {
case .verified:
.icon(CompoundIcon(\.verified).foregroundStyle(.compound.iconSuccessPrimary))
case .verificationViolation:
.icon(CompoundIcon(\.infoSolid).foregroundStyle(.compound.iconCriticalPrimary))
case .notVerified, .none:
nil
}
ListRow(label: .default(title: L10n.screenRoomDetailsProfileRowTitle, icon: \.userProfile),
details: details,
kind: .navigationLink {
context.send(viewAction: .processTapRecipientProfile)
})
}
}
}
private var configurationSection: some View {
@@ -202,28 +227,6 @@ struct RoomDetailsScreen: View {
context.send(viewAction: .processTapSecurityAndPrivacy)
})
}
if context.viewState.dmRecipientInfo != nil {
switch context.viewState.dmRecipientInfo?.verificationState {
case .verified:
ListRow(label: .default(title: L10n.screenRoomDetailsProfileRowTitle, icon: \.userProfile),
details: .icon(CompoundIcon(\.verified).foregroundStyle(.compound.iconSuccessPrimary)),
kind: .navigationLink {
context.send(viewAction: .processTapRecipientProfile)
})
case .verificationViolation:
ListRow(label: .default(title: L10n.screenRoomDetailsProfileRowTitle, icon: \.userProfile),
details: .icon(CompoundIcon(\.infoSolid).foregroundStyle(.compound.iconCriticalPrimary)),
kind: .navigationLink {
context.send(viewAction: .processTapRecipientProfile)
})
default:
ListRow(label: .default(title: L10n.screenRoomDetailsProfileRowTitle, icon: \.userProfile),
kind: .navigationLink {
context.send(viewAction: .processTapRecipientProfile)
})
}
}
}
}
@@ -293,21 +296,6 @@ struct RoomDetailsScreen: View {
}
}
private var leaveRoomSection: some View {
Section {
if context.viewState.reportRoomEnabled {
ListRow(label: .action(title: L10n.actionReportRoom,
icon: \.chatProblem,
role: .destructive),
kind: .button { context.send(viewAction: .processTapReport) })
}
ListRow(label: .action(title: L10n.screenRoomDetailsLeaveRoomTitle,
icon: \.leave,
role: .destructive),
kind: .button { context.send(viewAction: .processTapLeave) })
}
}
private func ignoreUserSection(user: RoomMemberDetails) -> some View {
Section {
ListRow(label: .default(title: user.isIgnored ? L10n.screenDmDetailsUnblockUser : L10n.screenDmDetailsBlockUser,
@@ -321,6 +309,26 @@ struct RoomDetailsScreen: View {
}
}
private var reportRoomSection: some View {
Section {
if context.viewState.reportRoomEnabled {
ListRow(label: .action(title: L10n.actionReportRoom,
icon: \.chatProblem,
role: .destructive),
kind: .button { context.send(viewAction: .processTapReport) })
}
}
}
private var leaveRoomSection: some View {
Section {
ListRow(label: .action(title: L10n.screenRoomDetailsLeaveRoomTitle,
icon: \.leave,
role: .destructive),
kind: .button { context.send(viewAction: .processTapLeave) })
}
}
@ViewBuilder
private func leaveRoomAlertActions(_ item: LeaveRoomAlertItem) -> some View {
Button(item.cancelTitle, role: .cancel) { }
@@ -363,26 +371,38 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
RoomDetailsScreen(context: genericJoinedRoomViewModel.context)
.snapshotPreferences(expect: genericJoinedRoomViewModel.context.observe(\.viewState.permalink).map { $0 != nil })
.previewDisplayName("Generic Room - Joined History Visibility")
.previewLayout(.sizeThatFits)
.frame(height: 1400)
RoomDetailsScreen(context: genericWorldReadableRoomViewModel.context)
.snapshotPreferences(expect: genericWorldReadableRoomViewModel.context.observe(\.viewState.permalink).map { $0 != nil })
.previewDisplayName("Generic Room - World Readable History Visibility")
.previewLayout(.sizeThatFits)
.frame(height: 1400)
RoomDetailsScreen(context: simpleRoomViewModel.context)
.snapshotPreferences(expect: simpleRoomViewModel.context.observe(\.viewState.permalink).map { $0 != nil })
.previewDisplayName("Simple Room")
.previewLayout(.sizeThatFits)
.frame(height: 1200)
RoomDetailsScreen(context: dmRoomViewModel.context)
.snapshotPreferences(expect: dmRoomViewModel.context.observe(\.viewState.accountOwner).map { $0 != nil })
.previewDisplayName("DM Room")
.previewLayout(.sizeThatFits)
.frame(height: 1350)
RoomDetailsScreen(context: dmRoomVerifiedViewModel.context)
.snapshotPreferences(expect: dmRoomVerifiedViewModel.context.observe(\.viewState.dmRecipientInfo?.verificationState).map { $0 == .verified })
.previewDisplayName("DM Room Verified")
.previewLayout(.sizeThatFits)
.frame(height: 1350)
RoomDetailsScreen(context: dmRoomVerificationViolationViewModel.context)
.snapshotPreferences(expect: dmRoomVerificationViolationViewModel.context.observe(\.viewState.accountOwner).map { $0 != nil })
.previewDisplayName("DM Room Verification Violation")
.previewLayout(.sizeThatFits)
.frame(height: 1350)
}
private static func makeGenericRoomViewModel(historyVisibility: RoomHistoryVisibility) -> RoomDetailsScreenViewModel {