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

Knock Polishing part 4 (#3779)

Browse Source 
* added decline and block and inviter redesign

* improved testing

* improved testing

* code improvement

* code improvement

* improved the code
This commit is contained in:
Mauro
2025-02-10 18:31:12 +01:00
committed by GitHub
parent 34d8adcf09
commit 22d0fae423
43 changed files with 231 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
+40 -9
View File
@@ -18,9 +18,16 @@ struct JoinRoomScreen: View {
private enum Focus {
case knockMessage
}
private var topPadding: CGFloat {
if context.viewState.roomDetails?.inviter != nil {
return 32
}
return context.viewState.mode == .knocked ? 151 : 44
}
var body: some View {
FullscreenDialog(topPadding: context.viewState.mode == .knocked ? 151 : 35) {
FullscreenDialog(topPadding: topPadding) {
if context.viewState.mode == .loading {
EmptyView()
} else {
@@ -50,6 +57,14 @@ struct JoinRoomScreen: View {
@ViewBuilder
private var defaultView: some View {
VStack(spacing: 16) {
if let inviter = context.viewState.roomDetails?.inviter {
RoomInviterLabel(inviter: inviter, mediaProvider: context.mediaProvider)
.multilineTextAlignment(.center)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
.padding(.bottom, 44)
}
if let avatar = context.viewState.avatar {
RoomAvatarImage(avatar: avatar,
avatarSize: .room(on: .joinRoom),
@@ -80,12 +95,6 @@ struct JoinRoomScreen: View {
BadgeLabel(title: "\(memberCount)", icon: \.userProfile, isHighlighted: false)
}
if let inviter = context.viewState.roomDetails?.inviter {
RoomInviterLabel(inviter: inviter, mediaProvider: context.mediaProvider)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
}
if let topic = context.viewState.roomDetails?.topic {
Text(topic)
.font(.compound.bodyMD)
@@ -178,8 +187,17 @@ struct JoinRoomScreen: View {
bottomNoticeMessage(L10n.screenJoinRoomInviteRequiredMessage)
case .invited:
ViewThatFits {
HStack(spacing: 8) { inviteButtons }
VStack(spacing: 16) { inviteButtons }
VStack(spacing: 24) {
HStack(spacing: 16) {
inviteButtons
}
declineAndBlockButton
}
VStack(spacing: 16) {
inviteButtons
declineAndBlockButton
}
}
case .banned(let sender, let reason):
VStack(spacing: 24) {
@@ -253,6 +271,19 @@ struct JoinRoomScreen: View {
.buttonStyle(.compound(.primary))
}
@ViewBuilder
var declineAndBlockButton: some View {
if let inviter = context.viewState.roomDetails?.inviter {
Button(role: .destructive) {
context.send(viewAction: .declineInviteAndBlock(userID: inviter.id))
} label: {
Text(L10n.screenJoinRoomDeclineAndBlockButtonTitle)
.padding(.vertical, 14)
}
.buttonStyle(.compound(.plain))
}
}
var joinButton: some View {
Button(L10n.screenJoinRoomJoinAction) { context.send(viewAction: .join) }
.buttonStyle(.compound(.super))