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

tweaks for the RC

Browse Source
This commit is contained in:
Mauro Romito
2024-09-09 17:19:12 +02:00
committed by Mauro
parent d88440dda4
commit 1a3378f6d3
9 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenuAction.swift
+1 -1
View File
@@ -100,7 +100,7 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
var canAppearInPinnedEventsTimeline: Bool {
switch self {
case .viewInRoomTimeline, .pin, .unpin, .forward, .redact:
case .viewInRoomTimeline, .pin, .unpin, .forward:
return true
default:
return false
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenuActionProvider.swift
+4 -4
View File
@@ -58,14 +58,14 @@ struct TimelineItemMenuActionProvider {
if item.isForwardable {
actions.append(.forward(itemID: item.id))
}
if canCurrentUserPin, let eventID = item.id.eventID {
actions.append(pinnedEventIDs.contains(eventID) ? .unpin : .pin)
}
if item.isEditable {
actions.append(.edit)
}
if canCurrentUserPin, let eventID = item.id.eventID {
actions.append(pinnedEventIDs.contains(eventID) ? .unpin : .pin)
}
if item.isCopyable {
actions.append(.copy)
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
+3 -1
View File
@@ -102,7 +102,9 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
context.send(viewAction: .displayTimelineItemMenu(itemID: timelineItem.id))
}
if !timelineItem.properties.reactions.isEmpty {
// Do not display reactions in the pinned events timeline
if !context.viewState.isPinnedEventsTimeline,
!timelineItem.properties.reactions.isEmpty {
TimelineReactionsView(context: context,
itemID: timelineItem.id,
reactions: timelineItem.properties.reactions,