generated from element-hq/.github
-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the inviter to
JoinRoomScreen when it's an invite. (#3093)
* Add inviter property to RoomProxyProtocol. * Extract the room cell inviter label into it's own view. * Use the new RoomInviterLabel in the JoinRoomScreen. * Fix bug with invite to a public room.
- Loading branch information
Showing
16 changed files
with
156 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
ElementX/Sources/Other/SwiftUI/Views/RoomInviterLabel.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // | ||
| // Copyright 2024 New Vector Ltd | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct RoomInviterDetails: Equatable { | ||
| let id: String | ||
| let displayName: String? | ||
| let avatarURL: URL? | ||
|
|
||
| let attributedInviteText: AttributedString | ||
|
|
||
| init(member: RoomMemberProxyProtocol) { | ||
| id = member.userID | ||
| displayName = member.displayName | ||
| avatarURL = member.avatarURL | ||
|
|
||
| let nameOrLocalPart = if let displayName = member.displayName { | ||
| displayName | ||
| } else { | ||
| String(member.userID.dropFirst().prefix { $0 != ":" }) | ||
| } | ||
|
|
||
| // Pre-compute the attributed string. | ||
| let placeholder = "{displayname}" | ||
| var string = AttributedString(L10n.screenInvitesInvitedYou(placeholder, id)) | ||
| var displayNameString = AttributedString(nameOrLocalPart) | ||
| displayNameString.bold() | ||
| displayNameString.foregroundColor = .compound.textPrimary | ||
| string.replace(placeholder, with: displayNameString) | ||
| attributedInviteText = string | ||
| } | ||
| } | ||
|
|
||
| struct RoomInviterLabel: View { | ||
| let inviter: RoomInviterDetails | ||
|
|
||
| let imageProvider: ImageProviderProtocol? | ||
|
|
||
| var body: some View { | ||
| HStack(alignment: .firstTextBaseline, spacing: 8) { | ||
| LoadableAvatarImage(url: inviter.avatarURL, | ||
| name: inviter.displayName, | ||
| contentID: inviter.id, | ||
| avatarSize: .custom(16), | ||
| imageProvider: imageProvider) | ||
| .alignmentGuide(.firstTextBaseline) { $0[.bottom] * 0.8 } | ||
|
|
||
| Text(inviter.attributedInviteText) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Previews | ||
|
|
||
| struct RoomInviterLabel_Previews: PreviewProvider, TestablePreview { | ||
| static var previews: some View { | ||
| VStack(spacing: 10) { | ||
| RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockAlice), | ||
| imageProvider: MockMediaProvider()) | ||
| RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockDan), | ||
| imageProvider: MockMediaProvider()) | ||
| RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockNoName), | ||
| imageProvider: MockMediaProvider()) | ||
| RoomInviterLabel(inviter: .init(member: RoomMemberProxyMock.mockCharlie), | ||
| imageProvider: MockMediaProvider()) | ||
| .foregroundStyle(.compound.textPrimary) | ||
| } | ||
| .font(.compound.bodyMD) | ||
| .foregroundStyle(.compound.textSecondary) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
PreviewTests/__Snapshots__/PreviewTests/test_roomInviterLabel-iPad-en-GB.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
PreviewTests/__Snapshots__/PreviewTests/test_roomInviterLabel-iPad-pseudo.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...iewTests/__Snapshots__/PreviewTests/test_roomInviterLabel-iPhone-15-en-GB.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...ewTests/__Snapshots__/PreviewTests/test_roomInviterLabel-iPhone-15-pseudo.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.