Don't show thread indicator in threads
This commit is contained in:
parent
4a516cb4ea
commit
837218de5a
|
@ -40,7 +40,8 @@ extension TimelineItemsInfo {
|
|||
CollectionItem.status(
|
||||
.init(info: $0),
|
||||
.init(showContentToggled: $0.showContentToggled,
|
||||
showAttachmentsToggled: $0.showAttachmentsToggled),
|
||||
showAttachmentsToggled: $0.showAttachmentsToggled,
|
||||
isReplyOutOfContext: ($0.reblogRecord ?? $0.record).inReplyToId != nil),
|
||||
$0.reblogRelationship ?? $0.relationship)
|
||||
}
|
||||
|
||||
|
@ -67,7 +68,8 @@ extension TimelineItemsInfo {
|
|||
.init(info: $0),
|
||||
.init(showContentToggled: $0.showContentToggled,
|
||||
showAttachmentsToggled: $0.showAttachmentsToggled,
|
||||
isPinned: true),
|
||||
isPinned: true,
|
||||
isReplyOutOfContext: ($0.reblogRecord ?? $0.record).inReplyToId != nil),
|
||||
$0.reblogRelationship ?? $0.relationship)
|
||||
}),
|
||||
.init(items: timelineItems)]
|
||||
|
|
|
@ -21,6 +21,7 @@ public extension CollectionItem {
|
|||
public let isContextParent: Bool
|
||||
public let isPinned: Bool
|
||||
public let isReplyInContext: Bool
|
||||
public let isReplyOutOfContext: Bool
|
||||
public let hasReplyFollowing: Bool
|
||||
|
||||
init(showContentToggled: Bool,
|
||||
|
@ -28,12 +29,14 @@ public extension CollectionItem {
|
|||
isContextParent: Bool = false,
|
||||
isPinned: Bool = false,
|
||||
isReplyInContext: Bool = false,
|
||||
isReplyOutOfContext: Bool = false,
|
||||
hasReplyFollowing: Bool = false) {
|
||||
self.showContentToggled = showContentToggled
|
||||
self.showAttachmentsToggled = showAttachmentsToggled
|
||||
self.isContextParent = isContextParent
|
||||
self.isPinned = isPinned
|
||||
self.isReplyInContext = isReplyInContext
|
||||
self.isReplyOutOfContext = isReplyOutOfContext
|
||||
self.hasReplyFollowing = hasReplyFollowing
|
||||
}
|
||||
}
|
||||
|
|
|
@ -77,10 +77,6 @@ public extension StatusViewModel {
|
|||
sensitive || identityContext.identity.preferences.readingExpandMedia == .hideAll
|
||||
}
|
||||
|
||||
var isReplyOutOfContext: Bool {
|
||||
!configuration.isContextParent && statusService.status.displayStatus.inReplyToId != nil
|
||||
}
|
||||
|
||||
var id: Status.Id { statusService.status.displayStatus.id }
|
||||
|
||||
var accountName: String { "@".appending(statusService.status.displayStatus.account.acct) }
|
||||
|
|
|
@ -110,7 +110,7 @@ extension StatusView {
|
|||
configuration: configuration)
|
||||
+ .compactSpacing
|
||||
|
||||
if !configuration.isContextParent && status.inReplyToId != nil {
|
||||
if configuration.isReplyOutOfContext {
|
||||
height += UIFont.preferredFont(forTextStyle: .callout).lineHeight + .compactSpacing
|
||||
}
|
||||
|
||||
|
@ -573,7 +573,7 @@ private extension StatusView {
|
|||
|
||||
bodyView.viewModel = viewModel
|
||||
|
||||
showThreadIndicator.isHidden = !viewModel.isReplyOutOfContext
|
||||
showThreadIndicator.isHidden = !viewModel.configuration.isReplyOutOfContext
|
||||
|
||||
contextParentTimeLabel.text = viewModel.contextParentTime
|
||||
contextParentTimeLabel.accessibilityLabel = viewModel.accessibilityContextParentTime
|
||||
|
|
Loading…
Reference in New Issue