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

Improve CW Overlay / size (IOS-278) (#1300) 

# Rationale

Improves the Content Warning's height to not use the full height of the
actual status content.

| Before | After |
|---|---|
| ![RocketSim_Recording_iPhone_15_6 1_2024-05-22_13 02
27](https://github.com/mastodon/mastodon-ios/assets/126418/f37e5a7a-95b5-475c-b1cd-062ea84d3dd7)
| ![RocketSim_Recording_iPhone_15_6 1_2024-05-22_12 59
24](https://github.com/mastodon/mastodon-ios/assets/126418/e25c8ef9-cf2a-4447-8b2a-4e1200b9ecf7)
|
This commit is contained in:
Marcus Kida 2024-05-22 16:19:31 +02:00 committed by GitHub
parent f1aebc4220 49f773e1a4
commit ca52aed93b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift
View File

@ -517,9 +517,10 @@ extension StatusView.Style {
// link preview card
statusView.contentContainer.addArrangedSubview(statusView.statusCardControl)
statusView.spoilerOverlayView.translatesAutoresizingMaskIntoConstraints = false
statusView.containerStackView.addSubview(statusView.spoilerOverlayView)
statusView.contentContainer.pinTo(to: statusView.spoilerOverlayView)
statusView.containerStackView.addArrangedSubview(statusView.spoilerOverlayView)
NSLayoutConstraint.activate([
statusView.spoilerOverlayView.heightAnchor.constraint(equalToConstant: 128).priority(.defaultHigh)
])
// media container: V - [ mediaGridContainerView ]
statusView.mediaContainerView.translatesAutoresizingMaskIntoConstraints = false
@ -616,7 +617,7 @@ extension StatusView.Style {
base(statusView: statusView)
statusView.contentAdaptiveMarginContainerView.removeFromSuperview()
statusView.spoilerOverlayView.removeFromSuperview()
statusView.spoilerOverlayView.isHidden = true
statusView.mediaContainerView.removeFromSuperview()
statusView.pollAdaptiveMarginContainerView.removeFromSuperview()
statusView.actionToolbarAdaptiveMarginContainerView.removeFromSuperview()
@ -638,7 +639,7 @@ extension StatusView {
func setSpoilerOverlayViewHidden(isHidden: Bool) {
spoilerOverlayView.isHidden = isHidden
spoilerOverlayView.setComponentHidden(isHidden)
contentAdaptiveMarginContainerView.isHidden = !isHidden
}
func setMediaDisplay(isDisplay: Bool = true) {

4
MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift
View File

@ -69,8 +69,4 @@ extension SpoilerOverlayView {
isAccessibilityElement = true
accessibilityTraits.insert(.button)
}
public func setComponentHidden(_ isHidden: Bool) {
containerStackView.arrangedSubviews.forEach { $0.isHidden = isHidden }
}
}