From 4e652b6b87033986830790d537a3b689ff02849a Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Thu, 12 Nov 2026 13:33:00 +0000 Subject: [PATCH] ios: show verified shield in channel members list at once (#8110) * ios: show verified shield in channel members list at once * ios: channel member row at file scope, named as on Kotlin * ios: remove a blank line in the channel members view --------- Co-authored-by: spaced4ndy-agents <342056592+spaced4ndy-agents@users.noreply.github.com> --- .../Views/Chat/Group/ChannelMembersView.swift | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/apps/ios/Shared/Views/Chat/Group/ChannelMembersView.swift b/apps/ios/Shared/Views/Chat/Group/ChannelMembersView.swift index f7cadc6d6f..1814167fa0 100644 --- a/apps/ios/Shared/Views/Chat/Group/ChannelMembersView.swift +++ b/apps/ios/Shared/Views/Chat/Group/ChannelMembersView.swift @@ -31,10 +31,10 @@ struct ChannelMembersView: View { Section(header: Text(subscriberCountStr(subscriberCount)).foregroundColor(theme.colors.secondary)) { searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary) .padding(.leading, 8) - memberRow(GMember(groupInfo.membership), user: true, showRole: true) + ChannelMemberRow(chat: chat, groupInfo: groupInfo, gMember: GMember(groupInfo.membership), user: true, showRole: true) let filteredMembers = s == "" ? members : members.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) } ForEach(filteredMembers) { member in - memberRow(member, user: false, showRole: member.wrapped.memberRole >= .member) + ChannelMemberRow(chat: chat, groupInfo: groupInfo, gMember: member, user: false, showRole: member.wrapped.memberRole >= .member) } } } @@ -48,18 +48,27 @@ struct ChannelMembersView: View { searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary) .padding(.leading, 8) if groupInfo.membership.memberRole >= .member { - memberRow(GMember(groupInfo.membership), user: true, showRole: true) + ChannelMemberRow(chat: chat, groupInfo: groupInfo, gMember: GMember(groupInfo.membership), user: true, showRole: true) } let filteredContributors = s == "" ? contributors : contributors.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) } ForEach(filteredContributors) { member in - memberRow(member, user: false, showRole: member.wrapped.memberRole >= .moderator) + ChannelMemberRow(chat: chat, groupInfo: groupInfo, gMember: member, user: false, showRole: member.wrapped.memberRole >= .moderator) } } } } } +} - @ViewBuilder private func memberRow(_ gMember: GMember, user: Bool, showRole: Bool) -> some View { +private struct ChannelMemberRow: View { + var chat: Chat + var groupInfo: GroupInfo + @ObservedObject var gMember: GMember + @EnvironmentObject var theme: AppTheme + var user: Bool + var showRole: Bool + + var body: some View { let member = gMember.wrapped let nameText = Text(member.chatViewName) .foregroundColor(member.memberIncognito ? .indigo : theme.colors.onBackground)