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

Rename UserProfileProxy to UserProfile. It's a pure struct and proxies nothing.

Browse Source 
Also remove the redundant `userID` property given `id` already exists (for Identifiable conformance).
This commit is contained in:
Doug
2026-07-01 15:18:03 +01:00
committed by Doug
parent bdf53b64a8
commit 3ef66cdd05
55 changed files with 203 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationRequestDetailsView.swift
+7 -7
View File
@@ -30,18 +30,18 @@ struct SessionVerificationRequestDetailsView: View {
HStack(spacing: 12) {
LoadableAvatarImage(url: details.senderProfile.avatarURL,
name: details.senderProfile.displayName,
contentID: details.senderProfile.userID,
contentID: details.senderProfile.id,
avatarSize: .user(on: .sessionVerification),
mediaProvider: mediaProvider)
.accessibilityHidden(true)
VStack(alignment: .leading, spacing: 0) {
Text(details.senderProfile.displayName ?? details.senderProfile.userID)
Text(details.senderProfile.displayName ?? details.senderProfile.id)
.font(.compound.bodySM)
.foregroundColor(.compound.textSecondary)
if details.senderProfile.displayName != nil {
Text(details.senderProfile.userID)
Text(details.senderProfile.id)
.font(.compound.bodyMD)
.foregroundColor(.compound.textPrimary)
}
@@ -66,7 +66,7 @@ struct SessionVerificationRequestDetailsView: View {
.clipShape(RoundedRectangle(cornerRadius: 8))
let displayName = isUserVerification ? details.senderProfile.displayName : details.deviceDisplayName
Text(displayName ?? details.senderProfile.userID)
Text(displayName ?? details.senderProfile.id)
.font(.compound.bodyMDSemibold)
.foregroundColor(.compound.textPrimary)
.frame(maxWidth: .infinity, alignment: .leading)
@@ -110,9 +110,9 @@ struct SessionVerificationRequestDetailsView: View {
}
struct SessionVerificationRequestDetailsView_Previews: PreviewProvider, TestablePreview {
static let details = SessionVerificationRequestDetails(senderProfile: UserProfileProxy(userID: "@bob:matrix.org",
displayName: "Billy bob",
avatarURL: .mockMXCUserAvatar),
static let details = SessionVerificationRequestDetails(senderProfile: UserProfile(userID: "@bob:matrix.org",
displayName: "Billy bob",
avatarURL: .mockMXCUserAvatar),
flowID: "123",
deviceID: "CODEMISTAKE",
deviceDisplayName: "Bob's Element X iOS",
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift
+3 -3
View File
@@ -232,9 +232,9 @@ struct SessionVerification_Previews: PreviewProvider, TestablePreview {
sessionVerificationScreen(state: .initial, flow: .userInitiator(userID: "@bob:matrix.org"))
.previewDisplayName("Initial - User Initiator")
let details = SessionVerificationRequestDetails(senderProfile: UserProfileProxy(userID: "@bob:matrix.org",
displayName: "Billy Bob",
avatarURL: .mockMXCUserAvatar),
let details = SessionVerificationRequestDetails(senderProfile: UserProfile(userID: "@bob:matrix.org",
displayName: "Billy Bob",
avatarURL: .mockMXCUserAvatar),
flowID: "123",
deviceID: "CODEMISTAKE",
deviceDisplayName: "Bob's Element X iOS",