Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: update horizontal compact mode notification timeline margin looks like

This commit is contained in:
CMK 2022-02-18 19:09:12 +08:00
parent cc3826dd1f
commit 91e2882154
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mastodon/Scene/Notification/Cell/NotificationTableViewCell.swift
View File

@ -50,13 +50,13 @@ extension NotificationTableViewCell {
notificationView.translatesAutoresizingMaskIntoConstraints = false
contentView.addSubview(notificationView)
setupContainerViewMarginConstraints()
updateContainerViewMarginConstraints()
NSLayoutConstraint.activate([
notificationView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 16),
containerViewLeadingLayoutConstraint,
containerViewTrailingLayoutConstraint,
contentView.bottomAnchor.constraint(equalTo: notificationView.bottomAnchor),
])
updateContainerViewMarginConstraints()
separatorLine.translatesAutoresizingMaskIntoConstraints = false
contentView.addSubview(separatorLine)
@ -78,6 +78,12 @@ extension NotificationTableViewCell {
notificationView.delegate = self
}
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection)
updateContainerViewMarginConstraints()
}
}
// MARK: - AdaptiveContainerMarginTableViewCell

15
MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift
View File

@ -57,6 +57,7 @@ public final class NotificationView: UIView {
}()
// author
let authorAdaptiveMarginContainerView = AdaptiveMarginContainerView()
let authorContainerView: UIStackView = {
let stackView = UIStackView()
stackView.axis = .horizontal
@ -148,9 +149,10 @@ extension NotificationView {
])
// author container: H - [ avatarButton | author meta container ]
authorContainerView.preservesSuperviewLayoutMargins = true
authorContainerView.isLayoutMarginsRelativeArrangement = true
containerStackView.addArrangedSubview(authorContainerView)
authorAdaptiveMarginContainerView.contentView = authorContainerView
authorAdaptiveMarginContainerView.margin = StatusView.containerLayoutMargin
containerStackView.addArrangedSubview(authorAdaptiveMarginContainerView)
UIContentSizeCategory.publisher
.sink { [weak self] category in
guard let self = self else { return }
@ -226,7 +228,7 @@ extension NotificationView {
// quoteStatusView
containerStackView.addArrangedSubview(quoteStatusViewContainerView)
quoteStatusViewContainerView.layoutMargins.bottom = 16
quoteStatusViewContainerView.layoutMargins = UIEdgeInsets(top: 0, left: 0, bottom: 16, right: 0)
quoteBackgroundView.layoutMargins = UIEdgeInsets(top: 16, left: 0, bottom: 0, right: 0)
quoteBackgroundView.translatesAutoresizingMaskIntoConstraints = false
@ -294,6 +296,11 @@ extension NotificationView {
// MARK: - AdaptiveContainerView
extension NotificationView: AdaptiveContainerView {
public func updateContainerViewComponentsLayoutMarginsRelativeArrangementBehavior(isEnabled: Bool) {
let margin = isEnabled ? StatusView.containerLayoutMargin : .zero
authorAdaptiveMarginContainerView.margin = margin
quoteStatusViewContainerView.layoutMargins.left = margin
quoteStatusViewContainerView.layoutMargins.right = margin
statusView.updateContainerViewComponentsLayoutMarginsRelativeArrangementBehavior(isEnabled: isEnabled)
quoteStatusView.updateContainerViewComponentsLayoutMarginsRelativeArrangementBehavior(isEnabled: true) // always set margins
}