From 93c9289b1f8e25e998658e833dd3bf8db8ba9b9e Mon Sep 17 00:00:00 2001 From: CMK Date: Thu, 13 May 2021 16:02:00 +0800 Subject: [PATCH] fix: player content overlay layout issue. resolve #132 --- .../View/Container/PlayerContainerView.swift | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift b/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift index d018dfbe..32ee48df 100644 --- a/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift +++ b/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift @@ -75,16 +75,6 @@ extension PlayerContainerView { mediaTypeIndicotorView.widthAnchor.constraint(equalToConstant: MediaTypeIndicotorView.indicatorViewSize.width).priority(.required - 1), ]) - contentWarningOverlayView.translatesAutoresizingMaskIntoConstraints = false - addSubview(contentWarningOverlayView) - NSLayoutConstraint.activate([ - contentWarningOverlayView.topAnchor.constraint(equalTo: topAnchor), - contentWarningOverlayView.leadingAnchor.constraint(equalTo: leadingAnchor), - contentWarningOverlayView.trailingAnchor.constraint(equalTo: trailingAnchor), - contentWarningOverlayView.bottomAnchor.constraint(equalTo: bottomAnchor) - ]) - contentWarningOverlayView.delegate = self - mediaTypeIndicotorViewInContentWarningOverlay.translatesAutoresizingMaskIntoConstraints = false contentWarningOverlayView.addSubview(mediaTypeIndicotorViewInContentWarningOverlay) NSLayoutConstraint.activate([ @@ -93,6 +83,8 @@ extension PlayerContainerView { mediaTypeIndicotorViewInContentWarningOverlay.heightAnchor.constraint(equalToConstant: MediaTypeIndicotorView.indicatorViewSize.height).priority(.required - 1), mediaTypeIndicotorViewInContentWarningOverlay.widthAnchor.constraint(equalToConstant: MediaTypeIndicotorView.indicatorViewSize.width).priority(.required - 1), ]) + + contentWarningOverlayView.delegate = self } } @@ -147,6 +139,16 @@ extension PlayerContainerView { containerHeightLayoutConstraint.constant = floor(rect.height) containerHeightLayoutConstraint.isActive = true + contentWarningOverlayView.removeFromSuperview() + contentWarningOverlayView.translatesAutoresizingMaskIntoConstraints = false + addSubview(contentWarningOverlayView) + NSLayoutConstraint.activate([ + contentWarningOverlayView.topAnchor.constraint(equalTo: touchBlockingView.topAnchor), + contentWarningOverlayView.leadingAnchor.constraint(equalTo: touchBlockingView.leadingAnchor), + contentWarningOverlayView.trailingAnchor.constraint(equalTo: touchBlockingView.trailingAnchor), + contentWarningOverlayView.bottomAnchor.constraint(equalTo: touchBlockingView.bottomAnchor) + ]) + bringSubviewToFront(mediaTypeIndicotorView) return playerViewController