From 911bd602ab5ec359211ab4461eb3fc48c3106e28 Mon Sep 17 00:00:00 2001
From: Stephen Byatt <47413006+stephenb10@users.noreply.github.com>
Date: Wed, 23 Jun 2021 13:36:38 +1000
Subject: [PATCH] Fix info panel hiding with transport bar after 5 seconds Fix
 flashing loading spinner on initial loading of video

---
 .../VideoPlayer/InfoTabBarViewController.swift     |  2 +-
 .../VideoPlayer/VideoPlayerStoryboard.storyboard   | 14 +++++++-------
 .../VideoPlayer/VideoPlayerViewController.swift    |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift b/JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift
index 689ed895..2bf5d387 100644
--- a/JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift	
+++ b/JellyfinPlayer tvOS/VideoPlayer/InfoTabBarViewController.swift	
@@ -59,7 +59,7 @@ class InfoTabBarViewController: UITabBarController, UIGestureRecognizerDelegate
         subtitleViewController?.prepareSubtitleView(subtitleTracks: subtitleTracks, selectedTrack: selectedSubtitleTrack, delegate: delegate)
         
         if let videoPlayer = videoPlayer {
-            infoContainerPos = CGRect(x: 88, y: 57, width: videoPlayer.infoViewContainer.frame.width, height: videoPlayer.infoViewContainer.frame.height)
+            infoContainerPos = CGRect(x: 88, y: 87, width: videoPlayer.infoViewContainer.frame.width, height: videoPlayer.infoViewContainer.frame.height)
             
         }
         
diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerStoryboard.storyboard b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerStoryboard.storyboard
index 915fb742..eee0e161 100644
--- a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerStoryboard.storyboard	
+++ b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerStoryboard.storyboard	
@@ -80,16 +80,16 @@
                                         </subviews>
                                         <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </view>
-                                    <containerView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lie-K8-LNT">
-                                        <rect key="frame" x="88" y="57" width="1744" height="635"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                        <connections>
-                                            <segue destination="odZ-Ww-zvF" kind="embed" identifier="infoView" id="i7y-hI-hVh"/>
-                                        </connections>
-                                    </containerView>
                                 </subviews>
                                 <viewLayoutGuide key="safeArea" id="IS7-IU-teh"/>
                             </view>
+                            <containerView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lie-K8-LNT">
+                                <rect key="frame" x="88" y="87" width="1744" height="635"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                <connections>
+                                    <segue destination="odZ-Ww-zvF" kind="embed" identifier="infoView" id="i7y-hI-hVh"/>
+                                </connections>
+                            </containerView>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="WHW-kl-wkr">
                                 <rect key="frame" x="928" y="508" width="64" height="64"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift
index 3e6bcab2..f6a370c9 100644
--- a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift	
+++ b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift	
@@ -269,9 +269,6 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
                     
                     setupInfoPanel()
                     
-                    activityIndicator.isHidden = true
-                    loading = false
-                    
                 })
                 .store(in: &cancellables)
             
@@ -449,7 +446,10 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
             scrubLabel.isHidden = true
             UIView.animate(withDuration: 0.4, delay: 0, options: .curveEaseOut, animations: {
                 self.scrubberView.frame = CGRect(x: self.initialSeekPos, y: self.scrubberView.frame.minY, width: 2, height: self.scrubberView.frame.height)
-            })
+            }) { _ in
+                self.scrubLabel.frame = CGRect(x: (self.initialSeekPos - self.scrubLabel.frame.width/2), y: self.scrubLabel.frame.minY, width: self.scrubLabel.frame.width, height: self.scrubLabel.frame.height)
+                self.scrubLabel.text = self.currentTimeLabel.text
+            }
             seeking = false
             
         }