signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix tall images overlapping safe area.

Browse Source
This commit is contained in:
Igor Solomennikov 2023-08-08 09:35:13 -07:00 committed by GitHub
parent 2ecf4676d3
commit 37eca71e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Signal/src/ViewControllers/MediaGallery/MediaItemViewController.swift
View File

@ -4,6 +4,7 @@
//
import CoreMedia
import SignalMessaging
import SignalServiceKit
import SignalUI
import YYImage
@ -40,7 +41,7 @@ class MediaItemViewController: OWSViewController, VideoPlaybackStatusProvider {
// MARK: - Layout
private var lastKnownScrollViewWidth: CGFloat = 0
private var lastKnownScrollViewSafeAreaSize: CGSize = .zero
private lazy var scrollView: UIScrollView = {
let scrollView = UIScrollView(frame: view.bounds)
scrollView.delegate = self
@ -89,7 +90,7 @@ class MediaItemViewController: OWSViewController, VideoPlaybackStatusProvider {
mediaSize = .zero
}
let scrollViewSize = scrollView.bounds.size
let scrollViewSize = scrollView.safeAreaLayoutGuide.layoutFrame.size
guard mediaSize.isNonEmpty && scrollViewSize.isNonEmpty else {
// Invalid content or view state.
@ -108,8 +109,8 @@ class MediaItemViewController: OWSViewController, VideoPlaybackStatusProvider {
// Center the media view in the scroll view.
let mediaViewSize = mediaView.frame.size
let yOffset = max(0, (scrollViewSize.height - mediaViewSize.height) / 2)
let xOffset = max(0, (scrollViewSize.width - mediaViewSize.width) / 2)
let yOffset = max(0, (scrollView.bounds.height - mediaViewSize.height) / 2)
let xOffset = max(0, (scrollView.bounds.width - mediaViewSize.width) / 2)
mediaViewTopConstraint?.constant = yOffset
mediaViewBottomConstraint?.constant = yOffset
mediaViewLeadingConstraint?.constant = xOffset
@ -131,6 +132,17 @@ class MediaItemViewController: OWSViewController, VideoPlaybackStatusProvider {
}
}
private func resetScrollViewZoomIfNecessary() {
// In iOS multi-tasking, the size of root view (and hence the scroll view)
// is set later, after viewWillAppear, etc. Therefore we need to reset the
// zoomScale to the default whenever the scrollView width changes.
let currentScrollViewSize = scrollView.safeAreaLayoutGuide.layoutFrame.size
if !(currentScrollViewSize - lastKnownScrollViewSafeAreaSize).asPoint.fuzzyEquals(.zero, tolerance: 0.001) {
scrollView.zoomScale = scrollView.minimumZoomScale
}
lastKnownScrollViewSafeAreaSize = currentScrollViewSize
}
func zoomOut(animated: Bool) {
guard scrollView.zoomScale != scrollView.minimumZoomScale else { return }
scrollView.setZoomScale(scrollView.minimumZoomScale, animated: animated)
@ -311,17 +323,8 @@ class MediaItemViewController: OWSViewController, VideoPlaybackStatusProvider {
super.viewDidLayoutSubviews()
updateZoomScaleAndConstraints()
// In iOS multi-tasking, the size of root view (and hence the scroll view)
// is set later, after viewWillAppear, etc. Therefore we need to reset the
// zoomScale to the default whenever the scrollView width changes.
let tolerance: CGFloat = 0.001
let currentScrollViewWidth = scrollView.frame.width
if abs(lastKnownScrollViewWidth - currentScrollViewWidth) > tolerance {
scrollView.zoomScale = scrollView.minimumZoomScale
}
lastKnownScrollViewWidth = currentScrollViewWidth
}
resetScrollViewZoomIfNecessary()
}
// MARK: - Helpers