zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

fix: AutoLayout warning for poll UI

This commit is contained in:
CMK 2021-03-03 12:46:38 +08:00
parent 376cb3d58a
commit 1e691a2a76
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Diffiable/Section/PollSection.swift
View File

@ -39,5 +39,7 @@ extension PollSection {
itemAttribute: PollItem.Attribute
) {
cell.optionLabel.text = pollOption.title
cell.configureCheckmark(state: itemAttribute.voted ? .on : .off)
}
}

4
Mastodon/Scene/Share/View/Content/StatusView.swift
View File

@ -276,6 +276,7 @@ extension StatusView {
activeTextLabel.trailingAnchor.constraint(equalTo: statusTextContainerView.trailingAnchor),
statusTextContainerView.bottomAnchor.constraint(greaterThanOrEqualTo: activeTextLabel.bottomAnchor),
])
activeTextLabel.setContentCompressionResistancePriority(.required - 1, for: .vertical)
contentWarningBlurContentImageView.translatesAutoresizingMaskIntoConstraints = false
statusTextContainerView.addSubview(contentWarningBlurContentImageView)
NSLayoutConstraint.activate([
@ -320,6 +321,9 @@ extension StatusView {
pollStatusStackView.addArrangedSubview(pollVoteCountLabel)
pollStatusStackView.addArrangedSubview(pollStatusDotLabel)
pollStatusStackView.addArrangedSubview(pollCountdownLabel)
pollVoteCountLabel.setContentHuggingPriority(.defaultHigh + 2, for: .horizontal)
pollStatusDotLabel.setContentHuggingPriority(.defaultHigh + 1, for: .horizontal)
pollCountdownLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
// action toolbar container
containerStackView.addArrangedSubview(actionToolbarContainer)

2
Mastodon/Scene/Share/View/TableviewCell/PollOptionTableViewCell.swift
View File

@ -128,7 +128,7 @@ extension PollOptionTableViewCell {
roundedBackgroundView.layer.cornerCurve = .circular
checkmarkBackgroundView.layer.masksToBounds = true
checkmarkBackgroundView.layer.cornerRadius = checkmarkBackgroundView.bounds.height * 0.5
checkmarkBackgroundView.layer.cornerRadius = PollOptionTableViewCell.checkmarkImageSize.width * 0.5
checkmarkBackgroundView.layer.cornerCurve = .circular
}