zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Show non-public visibility indicator in author header

Browse Source
This commit is contained in:
shannon 2025-03-10 09:49:43 -04:00
parent 804fdf89f8
commit 3fc7fc64ae
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
MastodonSDK/Sources/MastodonUI/View/Content/StatusAuthorView.swift
View File

@ -30,8 +30,16 @@ public class StatusAuthorView: UIStackView {
// author username
public let authorUsernameLabel = MetaLabel(style: .statusUsername)
public let usernameTrialingDotLabel: MetaLabel = {
public let visibilityIcon: UIImageView = {
var imageView = UIImageView()
imageView.tintColor = Asset.Colors.Label.secondary.color
var config = UIImage.SymbolConfiguration(font: UIFont.systemFont(ofSize: 15, weight: .regular))
imageView.preferredSymbolConfiguration = config
return imageView
}()
public let timestampTrialingDotLabel: MetaLabel = {
let label = MetaLabel(style: .statusUsername)
label.configure(content: PlaintextMetaContent(string: "·"))
return label
@ -305,19 +313,26 @@ extension StatusAuthorView {
menuButton.setContentHuggingPriority(.required - 1, for: .horizontal)
menuButton.setContentCompressionResistancePriority(.required - 1, for: .horizontal)
// authorSecondaryMetaContainer: H - [ authorUsername | usernameTrialingDotLabel | dateLabel | (padding) | contentSensitiveeToggleButton ]
// authorSecondaryMetaContainer: H - [ visibilityIcon | dateLabel | dot | authorUsername | spacer ]
let authorSecondaryMetaContainer = UIStackView()
authorSecondaryMetaContainer.axis = .horizontal
authorSecondaryMetaContainer.alignment = .center
authorSecondaryMetaContainer.spacing = 4
authorMetaContainer.addArrangedSubview(authorSecondaryMetaContainer)
authorSecondaryMetaContainer.addArrangedSubview(visibilityIcon)
visibilityIcon.setContentCompressionResistancePriority(.required, for: .horizontal)
authorSecondaryMetaContainer.addArrangedSubview(dateLabel)
dateLabel.setContentHuggingPriority(.required - 1, for: .horizontal)
dateLabel.setContentCompressionResistancePriority(.required - 1, for: .horizontal)
NSLayoutConstraint.activate([
visibilityIcon.firstBaselineAnchor.constraint(equalTo: dateLabel.firstBaselineAnchor)
])
authorSecondaryMetaContainer.addArrangedSubview(usernameTrialingDotLabel)
usernameTrialingDotLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
authorSecondaryMetaContainer.addArrangedSubview(timestampTrialingDotLabel)
timestampTrialingDotLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
authorSecondaryMetaContainer.addArrangedSubview(authorUsernameLabel)
authorUsernameLabel.setContentHuggingPriority(.required - 1, for: .vertical)
@ -351,7 +366,7 @@ extension StatusAuthorView {
avatarButton.isUserInteractionEnabled = false
menuButton.removeFromSuperview()
usernameTrialingDotLabel.removeFromSuperview()
dateLabel.removeFromSuperview()
timestampTrialingDotLabel.removeFromSuperview()
}
}

13
MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift
View File

@ -228,6 +228,19 @@ extension StatusView.ViewModel {
authorView.avatarButton.avatarImageView.configure(cornerConfiguration: .init(corner: .fixed(radius: 12)))
}
.store(in: &disposeBag)
// visibility
$visibility
.sink { visibility in
authorView.visibilityIcon.image = visibility.image
authorView.visibilityIcon.accessibilityLabel = visibility.title
switch visibility {
case .public, ._other:
authorView.visibilityIcon.isHidden = true
case .direct, .private, .unlisted:
authorView.visibilityIcon.isHidden = false
}
}
.store(in: &disposeBag)
// name
$authorName
.sink { metaContent in