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

Fix some layout constraint warnings and allow images to keep their own aspect ratio in compact status card layout, even if that leaves some blank space.

Browse Source
This commit is contained in:
shannon 2024-12-10 10:18:00 -05:00
parent 3e2c63700a
commit 9e24af509e
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MastodonSDK/Sources/MastodonUI/View/Content/StatusCardAuthorControl.swift
View File

@ -43,7 +43,7 @@ class StatusCardAuthorControl: UIControl {
bottomAnchor.constraint(equalTo: contentStackView.bottomAnchor, constant: 6),
avatarImage.widthAnchor.constraint(equalToConstant: 16),
avatarImage.widthAnchor.constraint(equalTo: avatarImage.heightAnchor),
avatarImage.widthAnchor.constraint(equalTo: avatarImage.heightAnchor).priority(.defaultHigh),
]
NSLayoutConstraint.activate(constraints)

19
MastodonSDK/Sources/MastodonUI/View/Content/StatusCardControl.swift
View File

@ -281,7 +281,6 @@ public final class StatusCardControl: UIControl {
titleLabel.text = title
descriptionLabel.text = card.description
imageView.contentMode = .scaleAspectFill
imageView.sd_setImage(
with: {
@ -290,9 +289,7 @@ public final class StatusCardControl: UIControl {
}(),
placeholderImage: icon(for: card.layout)
) { [weak self] image, _, _, _ in
if image != nil {
self?.imageView.contentMode = .scaleAspectFill
} else {
if image == nil {
self?.imageView.isHidden = true
self?.imageDividerView.isHidden = true
}
@ -336,6 +333,7 @@ public final class StatusCardControl: UIControl {
switch layout {
case .large(let aspectRatio):
imageView.contentMode = .scaleAspectFill
imageView.isHidden = false
imageDividerView.isHidden = false
containerStackView.alignment = .fill
@ -353,11 +351,12 @@ public final class StatusCardControl: UIControl {
// set a reasonable max height for very tall images
imageView.heightAnchor
.constraint(lessThanOrEqualToConstant: 400),
authorDivider.widthAnchor.constraint(equalTo: containerStackView.widthAnchor),
imageDividerView.widthAnchor.constraint(equalTo: mainContentStackView.widthAnchor)
authorDivider.widthAnchor.constraint(equalTo: containerStackView.widthAnchor).priority(.defaultHigh),
imageDividerView.widthAnchor.constraint(equalTo: mainContentStackView.widthAnchor).priority(.defaultHigh)
]
imageDividerConstraint = imageDividerView.heightAnchor.constraint(equalToConstant: pixelSize).priority(.defaultLow - 1).activate()
case .compact, .noPreviewImage:
imageView.contentMode = .scaleAspectFit
mainContentStackView.axis = .horizontal
mainContentStackView.alignment = .center
imageView.isHidden = false
@ -365,12 +364,12 @@ public final class StatusCardControl: UIControl {
containerStackView.alignment = .fill //.center
containerStackView.axis = .vertical
layoutConstraints = [
imageView.heightAnchor.constraint(equalTo: mainContentStackView.heightAnchor),
imageView.widthAnchor.constraint(equalToConstant: 85),
imageView.heightAnchor.constraint(equalTo: mainContentStackView.heightAnchor).priority(.defaultHigh),
imageView.widthAnchor.constraint(greaterThanOrEqualToConstant: 85),
// heightAnchor.constraint(equalToConstant: 85).priority(.defaultLow - 1),
// heightAnchor.constraint(greaterThanOrEqualToConstant: 85),
imageDividerView.heightAnchor.constraint(equalTo: mainContentStackView.heightAnchor),
authorDivider.widthAnchor.constraint(equalTo: containerStackView.widthAnchor)
imageDividerView.heightAnchor.constraint(equalTo: mainContentStackView.heightAnchor).priority(.defaultHigh),
authorDivider.widthAnchor.constraint(equalTo: containerStackView.widthAnchor).priority(.defaultHigh)
]
imageDividerConstraint = imageDividerView.widthAnchor.constraint(equalToConstant: pixelSize).priority(.defaultLow - 1).activate()
imageView.isHidden = layout == .noPreviewImage