tweaks for the RC

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
@@ -63,10 +63,13 @@ struct PinnedItemsBannerView: View {
private var content: some View { private var content: some View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text(state.bannerIndicatorDescription) // Only the display the indicator description for more than 1 pinned item
.font(.compound.bodySM) if state.count > 1 {
.foregroundColor(.compound.textActionAccent) Text(state.bannerIndicatorDescription)
.lineLimit(1) .font(.compound.bodySM)
.foregroundColor(.compound.textActionAccent)
.lineLimit(1)
}
Text(state.displayedMessage) Text(state.displayedMessage)
.font(.compound.bodyMD) .font(.compound.bodyMD)
.foregroundColor(.compound.textPrimary) .foregroundColor(.compound.textPrimary)
@@ -308,8 +308,12 @@ class TimelineTableViewController: UIViewController {
guard let dataSource else { return } guard let dataSource else { return }
var snapshot = NSDiffableDataSourceSnapshot<TimelineSection, String>() var snapshot = NSDiffableDataSourceSnapshot<TimelineSection, String>()
snapshot.appendSections([.typingIndicator])
snapshot.appendItems([TimelineTypingIndicatorCell.reuseIdentifier]) // We don't want to display the typing notification in this timeline
if !coordinator.context.viewState.isPinnedEventsTimeline {
snapshot.appendSections([.typingIndicator])
snapshot.appendItems([TimelineTypingIndicatorCell.reuseIdentifier])
}
snapshot.appendSections([.main]) snapshot.appendSections([.main])
snapshot.appendItems(timelineItemsIDs) snapshot.appendItems(timelineItemsIDs)
@@ -100,7 +100,7 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
var canAppearInPinnedEventsTimeline: Bool { var canAppearInPinnedEventsTimeline: Bool {
switch self { switch self {
case .viewInRoomTimeline, .pin, .unpin, .forward, .redact: case .viewInRoomTimeline, .pin, .unpin, .forward:
return true return true
default: default:
return false return false
@@ -58,14 +58,14 @@ struct TimelineItemMenuActionProvider {
if item.isForwardable { if item.isForwardable {
actions.append(.forward(itemID: item.id)) actions.append(.forward(itemID: item.id))
} }
if canCurrentUserPin, let eventID = item.id.eventID {
actions.append(pinnedEventIDs.contains(eventID) ? .unpin : .pin)
}
if item.isEditable { if item.isEditable {
actions.append(.edit) actions.append(.edit)
} }
if canCurrentUserPin, let eventID = item.id.eventID {
actions.append(pinnedEventIDs.contains(eventID) ? .unpin : .pin)
}
if item.isCopyable { if item.isCopyable {
actions.append(.copy) actions.append(.copy)
@@ -102,7 +102,9 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
context.send(viewAction: .displayTimelineItemMenu(itemID: timelineItem.id)) 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, TimelineReactionsView(context: context,
itemID: timelineItem.id, itemID: timelineItem.id,
reactions: timelineItem.properties.reactions, reactions: timelineItem.properties.reactions,
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:52a543349c38a46a7abf42d9f5b83aed47b40621e358fe63b98487acff03b461 oid sha256:f1c0f5c4908a4846f72c3842054a072b28a403c4e0a58094ce2ec2197da3c3c5
size 147075 size 140801
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:131dadbb128453abb744bd49c2cd592bbd9f0f5bdee5ba6ea71f541a10ee70ee oid sha256:faa4dade1cd81194b56c82bb90c95b7cd933db10735baf6718037593f90c21ab
size 182373 size 168534
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ade81f08af5344aab81fdebbffe27a4b04976ce8e3cc8f397d5328c51998ad09 oid sha256:675bac92ca94414ae552689d0dfe2d4eacbb756ab065a859a954c0e392917933
size 91413 size 85919
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:6ada9407d2f6c9da3cedb750353ffcf6e4cc6493177b3e2796d66b8245982042 oid sha256:515384fc8cabd0e83238b2205d2df61be08d32a42027dedf6099c36e60c6bbdb
size 107677 size 100273