Playqueue: Adjust constraints for smaller devices

justlt · Oct 20, 2021 · 38a078c · 38a078c
1 parent 70b78a3
commit 38a078c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/Playback/Queue/QueueViewController.swift b/Sources/Playback/Queue/QueueViewController.swift
@@ -70,7 +70,7 @@ class QueueViewController: UIViewController {
     private var topConstraint: NSLayoutConstraint?
     private var topConstraintConstant: CGFloat {
         if parent is VideoPlayerViewController || parent is VLCMovieViewController {
-            return 200
+            return UIDevice.hasNotch ? 75 : 50
         } else {
             return 0
         }
@@ -149,7 +149,7 @@ class QueueViewController: UIViewController {
                 if let parent = parent as? VideoPlayerViewController {
                     topConstraint = nil
                     heightConstraint = view.heightAnchor.constraint(equalTo: parent.view.heightAnchor,
-                                                                    constant: -(topConstraintConstant + parent.videoPlayerControls.frame.height))
+                                                                    constant: -(topConstraintConstant + parent.videoPlayerControls.frame.height + parent.scrubProgressBar.frame.height))
                     bottomConstraint = view.bottomAnchor.constraint(equalTo: parent.view.bottomAnchor,
                                                                     constant: self.view.frame.height)
                 } else {

diff --git a/Sources/Playback/VideoPlayer/VideoPlayerViewController.swift b/Sources/Playback/VideoPlayer/VideoPlayerViewController.swift
@@ -152,7 +152,7 @@ class VideoPlayerViewController: UIViewController {
         return optionsNavigationBar
     }()
 
-    lazy var videoPlayerControls: VideoPlayerControls = {
+    private(set) lazy var videoPlayerControls: VideoPlayerControls = {
         let videoPlayerControls = Bundle.main.loadNibNamed("VideoPlayerControls",
                                                            owner: nil,
                                                            options: nil)?.first as! VideoPlayerControls
@@ -176,7 +176,7 @@ class VideoPlayerViewController: UIViewController {
         return videoPlayerControls
     }()
 
-    private lazy var scrubProgressBar: MediaScrubProgressBar = {
+    private(set) lazy var scrubProgressBar: MediaScrubProgressBar = {
         var scrubProgressBar = MediaScrubProgressBar()
         scrubProgressBar.delegate = self
         return scrubProgressBar