ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for caption not appearing in the media preview controller

Browse Source
This commit is contained in:
Mauro Romito
2025-09-29 17:45:11 +02:00
committed by Mauro
parent e04a937eed
commit 107e6f6b08
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/FilePreviewScreen/View/TimelineMediaPreviewController.swift
+24 -6
View File
@@ -24,7 +24,14 @@ class TimelineMediaPreviewController: QLPreviewController {
private var cancellables: Set<AnyCancellable> = [] private var cancellables: Set<AnyCancellable> = []
private var navigationBar: UINavigationBar? { view.subviews.first?.subviews.first { $0 is UINavigationBar } as? UINavigationBar } private var navigationBar: UINavigationBar? { view.subviews.first?.subviews.first { $0 is UINavigationBar } as? UINavigationBar }
private var toolbar: UIToolbar? { view.subviews.first?.subviews.last { $0 is UIToolbar } as? UIToolbar } private var bottomBarItemsContainer: UIView? {
if #available(iOS 26, *) {
view.subviews.first?.subviews.last?.subviews.first
} else {
view.subviews.first?.subviews.last { $0 is UIToolbar }
}
}
private var pageScrollView: UIScrollView? { view.firstScrollView() } private var pageScrollView: UIScrollView? { view.firstScrollView() }
private var captionView: UIView { captionHostingController.view } private var captionView: UIView { captionHostingController.view }
@@ -105,16 +112,27 @@ class TimelineMediaPreviewController: QLPreviewController {
override func viewWillLayoutSubviews() { override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews() super.viewWillLayoutSubviews()
if let toolbar { if let bottomBarItemsContainer {
// Using the toolbar's visibility doesn't work so check its frame. // Using the toolbar's visibility doesn't work so check its frame.
captionView.isHidden = toolbar.frame.minY >= view.frame.maxY captionView.isHidden = if #available(iOS 26, *) {
navigationBar?.topItem?.leftBarButtonItem?.frame(in: view) == nil
} else {
bottomBarItemsContainer.frame.minY >= view.frame.maxY
}
if captionView.constraints.isEmpty { if captionView.constraints.isEmpty {
captionHostingController.view.translatesAutoresizingMaskIntoConstraints = false captionHostingController.view.translatesAutoresizingMaskIntoConstraints = false
let bottomConstraint = if #available(iOS 26, *) {
captionView.bottomAnchor.constraint(equalTo: bottomBarItemsContainer.safeAreaLayoutGuide.bottomAnchor, constant: -50)
} else {
captionView.bottomAnchor.constraint(equalTo: bottomBarItemsContainer.topAnchor)
}
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
captionView.bottomAnchor.constraint(equalTo: toolbar.topAnchor), bottomConstraint,
captionView.leadingAnchor.constraint(equalTo: toolbar.leadingAnchor), captionView.leadingAnchor.constraint(equalTo: bottomBarItemsContainer.leadingAnchor),
captionView.trailingAnchor.constraint(equalTo: toolbar.trailingAnchor) captionView.trailingAnchor.constraint(equalTo: bottomBarItemsContainer.trailingAnchor)
]) ])
} }
} }