Compare commits
2 Commits
dd6813c058
...
6328627a97
Author | SHA1 | Date |
---|---|---|
Shadowfacts | 6328627a97 | |
Shadowfacts | c6043d60ee |
|
@ -719,7 +719,11 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
|
||||||
// there is no existing gap
|
// there is no existing gap
|
||||||
applySnapshotBeforeScrolling = true
|
applySnapshotBeforeScrolling = true
|
||||||
}
|
}
|
||||||
snapshot.insertItems([.gap], beforeItem: currentItems.first!)
|
if let first = currentItems.first {
|
||||||
|
snapshot.insertItems([.gap], beforeItem: first)
|
||||||
|
} else {
|
||||||
|
snapshot.appendItems([.gap], toSection: .statuses)
|
||||||
|
}
|
||||||
snapshot.insertItems(presentItems.map { .status(id: $0, collapseState: .unknown, filterState: .unknown) }, beforeItem: .gap)
|
snapshot.insertItems(presentItems.map { .status(id: $0, collapseState: .unknown, filterState: .unknown) }, beforeItem: .gap)
|
||||||
|
|
||||||
if applySnapshotBeforeScrolling {
|
if applySnapshotBeforeScrolling {
|
||||||
|
|
|
@ -218,9 +218,9 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
private let accountDetailToContentSpacer = UIView().configure {
|
private let accountDetailToContentWarningSpacer = UIView().configure {
|
||||||
$0.backgroundColor = .clear
|
$0.backgroundColor = .clear
|
||||||
$0.heightAnchor.constraint(equalToConstant: 8).isActive = true
|
$0.heightAnchor.constraint(equalToConstant: 4).isActive = true
|
||||||
}
|
}
|
||||||
private let contentWarningToCollapseButtonSpacer = UIView().configure {
|
private let contentWarningToCollapseButtonSpacer = UIView().configure {
|
||||||
$0.backgroundColor = .clear
|
$0.backgroundColor = .clear
|
||||||
|
@ -237,7 +237,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
|
||||||
|
|
||||||
private lazy var mainVStack = UIStackView(arrangedSubviews: [
|
private lazy var mainVStack = UIStackView(arrangedSubviews: [
|
||||||
accountDetailContainerView,
|
accountDetailContainerView,
|
||||||
accountDetailToContentSpacer,
|
accountDetailToContentWarningSpacer,
|
||||||
contentWarningLabel,
|
contentWarningLabel,
|
||||||
contentWarningToCollapseButtonSpacer,
|
contentWarningToCollapseButtonSpacer,
|
||||||
collapseButton,
|
collapseButton,
|
||||||
|
@ -330,6 +330,8 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
|
||||||
self.statusState = state
|
self.statusState = state
|
||||||
|
|
||||||
doUpdateUI(status: status)
|
doUpdateUI(status: status)
|
||||||
|
accountDetailToContentWarningSpacer.isHidden = collapseButton.isHidden
|
||||||
|
contentWarningToCollapseButtonSpacer.isHidden = collapseButton.isHidden
|
||||||
|
|
||||||
accountDetailAccessibilityElement.navigationDelegate = delegate
|
accountDetailAccessibilityElement.navigationDelegate = delegate
|
||||||
accountDetailAccessibilityElement.accountID = accountID
|
accountDetailAccessibilityElement.accountID = accountID
|
||||||
|
|
Loading…
Reference in New Issue