ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make timeline reactions and reaction senders identifiable

Browse Source
This commit is contained in:
Stefan Ceriu
2024-01-03 17:41:25 +02:00
committed by Stefan Ceriu
parent 9bb177bff5
commit 2a33ee1f63
7 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift
+7 -8
View File
@@ -37,11 +37,10 @@ struct ReactionsSummaryView: View {
ScrollView(.horizontal, showsIndicators: false) {
ScrollViewReader { scrollView in
HStack(spacing: 8) {
ForEach(reactions, id: \.self) { reaction in
ForEach(reactions) { reaction in
ReactionSummaryButton(reaction: reaction, highlighted: selectedReactionKey == reaction.key) { key in
selectedReactionKey = key
}
.id(reaction.key)
}
}
.padding(.horizontal, 20)
@@ -61,11 +60,11 @@ struct ReactionsSummaryView: View {
private var sendersList: some View {
TabView(selection: $selectedReactionKey) {
ForEach(reactions, id: \.self) { reaction in
ForEach(reactions) { reaction in
ScrollView {
VStack(alignment: .leading, spacing: 8) {
ForEach(reaction.senders, id: \.self) { sender in
ReactionSummarySenderView(sender: sender, member: members[sender.senderID], imageProvider: imageProvider)
ForEach(reaction.senders) { sender in
ReactionSummarySenderView(sender: sender, member: members[sender.id], imageProvider: imageProvider)
.padding(.horizontal, 16)
}
}
@@ -114,14 +113,14 @@ private struct ReactionSummarySenderView: View {
let imageProvider: ImageProviderProtocol?
var displayName: String {
member?.displayName ?? sender.senderID
member?.displayName ?? sender.id
}
var body: some View {
HStack(spacing: 8) {
LoadableAvatarImage(url: member?.avatarURL,
name: displayName,
contentID: sender.senderID,
contentID: sender.id,
avatarSize: .user(on: .timeline),
imageProvider: imageProvider)
@@ -134,7 +133,7 @@ private struct ReactionSummarySenderView: View {
.font(.compound.bodyXS)
.foregroundColor(.compound.textSecondary)
}
Text(sender.senderID)
Text(sender.id)
.font(.compound.bodySM)
.foregroundColor(.compound.textSecondary)
}
ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
+1 -1
View File
@@ -51,7 +51,7 @@ struct TimelineReactionsView: View {
var body: some View {
layout {
ForEach(reactions, id: \.self) { reaction in
ForEach(reactions) { reaction in
TimelineReactionButton(reaction: reaction) { key in
feedbackGenerator.impactOccurred()
context.send(viewAction: .toggleReaction(key: key, itemID: itemID))