From d18940317b18ed321c3af786fa892120b32f22f8 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Sat, 20 Jun 2020 10:21:44 +1000 Subject: [PATCH] Fix constraint issues --- Signal/src/ViewControllers/MediaPageViewController.swift | 4 ++-- Signal/src/ViewControllers/MediaTileViewController.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 7fa304f00..6dab1a13d 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -181,8 +181,8 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou self.view.addSubview(bottomContainer) bottomContainer.autoPinWidthToSuperview() - bottomContainer.autoPinEdge(toSuperviewSafeArea: .bottom) - footerBar.autoPinEdge(toSuperviewSafeArea: .bottom) + bottomContainer.autoPinEdge(.bottom, to: .bottom, of: view) + footerBar.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor).isActive = true footerBar.autoSetDimension(.height, toSize: 44) updateTitle() diff --git a/Signal/src/ViewControllers/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaTileViewController.swift index 57d4398d1..f30cff72a 100644 --- a/Signal/src/ViewControllers/MediaTileViewController.swift +++ b/Signal/src/ViewControllers/MediaTileViewController.swift @@ -533,7 +533,7 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDa // show toolbar UIView.animate(withDuration: 0.1, delay: 0, options: .curveEaseInOut, animations: { NSLayoutConstraint.deactivate([self.footerBarBottomConstraint]) - self.footerBarBottomConstraint = self.footerBar.autoPinEdge(.bottom, to: .bottom, of: self.view) + self.footerBarBottomConstraint = self.footerBar.autoPinEdge(toSuperviewSafeArea: .bottom) self.footerBar.superview?.layoutIfNeeded()