android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-28 12:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ios: fix swipe in members list for iOS 15 (#5914)

Browse source 
* ios: fix swipe in members list for iOS 15

* refactor
This commit is contained in:
Evgeny 2025-05-15 14:58:40 +01:00 • committed by GitHub
parent 5dd89fe127
commit 26e5742354
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift
View file

@ -144,17 +144,9 @@ struct GroupChatInfoView: View {
let filteredMembers = s == "" let filteredMembers = s == ""
? members ? members
: members.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) } : members.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) }
MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert) MemberRowView(chat: chat, groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
ForEach(filteredMembers) { member in ForEach(filteredMembers) { member in
ZStack { MemberRowView(chat: chat, groupInfo: groupInfo, groupMember: member, alert: $alert)
NavigationLink {
memberInfoView(member)
} label: {
EmptyView()
}
.opacity(0)
MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
}
} }
} }
@ -358,6 +350,7 @@ struct GroupChatInfoView: View {
} }
private struct MemberRowView: View { private struct MemberRowView: View {
var chat: Chat
var groupInfo: GroupInfo var groupInfo: GroupInfo
@ObservedObject var groupMember: GMember @ObservedObject var groupMember: GMember
@EnvironmentObject var theme: AppTheme @EnvironmentObject var theme: AppTheme
@ -366,7 +359,7 @@ struct GroupChatInfoView: View {
var body: some View { var body: some View {
let member = groupMember.wrapped let member = groupMember.wrapped
let v = HStack{ let v1 = HStack{
MemberProfileImage(member, size: 38) MemberProfileImage(member, size: 38)
.padding(.trailing, 2) .padding(.trailing, 2)
// TODO server connection status // TODO server connection status
@ -383,6 +376,20 @@ struct GroupChatInfoView: View {
memberInfo(member) memberInfo(member)
} }
let v = ZStack {
if user {
v1
} else {
NavigationLink {
memberInfoView()
} label: {
EmptyView()
}
.opacity(0)
v1
}
}
if user { if user {
v v
} else if groupInfo.membership.memberRole >= .admin { } else if groupInfo.membership.memberRole >= .admin {
@ -407,6 +414,11 @@ struct GroupChatInfoView: View {
} }
} }
private func memberInfoView() -> some View {
GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember)
.navigationBarHidden(false)
}
private func memberConnStatus(_ member: GroupMember) -> LocalizedStringKey { private func memberConnStatus(_ member: GroupMember) -> LocalizedStringKey {
if member.activeConn?.connDisabled ?? false { if member.activeConn?.connDisabled ?? false {
return "disabled" return "disabled"
@ -485,11 +497,6 @@ struct GroupChatInfoView: View {
.foregroundColor(theme.colors.secondary) .foregroundColor(theme.colors.secondary)
} }
} }
private func memberInfoView(_ groupMember: GMember) -> some View {
GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember)
.navigationBarHidden(false)
}
private func groupLinkButton() -> some View { private func groupLinkButton() -> some View {
NavigationLink { NavigationLink {