From 49f773e1a450735ad36087af575843b3f87ff54c Mon Sep 17 00:00:00 2001 From: Marcus Kida Date: Wed, 22 May 2024 13:00:41 +0200 Subject: [PATCH] Improve CW Overlay / size (IOS-278) --- .../Sources/MastodonUI/View/Content/StatusView.swift | 11 ++++++----- .../MastodonUI/View/Control/SpoilerOverlayView.swift | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift index 79c4921b8..648f348e4 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView.swift @@ -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) { diff --git a/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift b/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift index c9074f9b5..a0a20ce03 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Control/SpoilerOverlayView.swift @@ -69,8 +69,4 @@ extension SpoilerOverlayView { isAccessibilityElement = true accessibilityTraits.insert(.button) } - - public func setComponentHidden(_ isHidden: Bool) { - containerStackView.arrangedSubviews.forEach { $0.isHidden = isHidden } - } }