From df610568f8d28891dd141ca4f1efddb9232b0f84 Mon Sep 17 00:00:00 2001
From: Stephen Byatt <47413006+stephenb10@users.noreply.github.com>
Date: Sat, 26 Jun 2021 21:25:11 +1000
Subject: [PATCH] Fix episode name truncating

---
 JellyfinPlayer/VideoPlayer.swift     |  6 +++--
 JellyfinPlayer/VideoUpNextView.swift | 35 +++++++++++-----------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/JellyfinPlayer/VideoPlayer.swift b/JellyfinPlayer/VideoPlayer.swift
index 2505f048..e69ca62f 100644
--- a/JellyfinPlayer/VideoPlayer.swift
+++ b/JellyfinPlayer/VideoPlayer.swift
@@ -716,7 +716,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
         
         // Frame sizes depend on if controls are hidden or shown
         smallView = upNextView.frame
-        largeView = CGRect(x: 500, y: 90, width: 400, height: 270)
+        largeView = CGRect(x: 460, y: 90, width: 400, height: 270)
     }
     
     func getNextEpisode() {
@@ -968,10 +968,12 @@ extension PlayerViewController: VLCMediaPlayerDelegate {
             delegate?.hideLoadingView(self)
             
             if manifest.type == "Episode" && upNextViewModel.item != nil{
-                if time > 0.98 {
+                if time > 0.96 {
                     upNextView.isHidden = false
+                    self.jumpForwardButton.isHidden = true
                 } else {
                     upNextView.isHidden = true
+                    self.jumpForwardButton.isHidden = false
                 }
             }
             
diff --git a/JellyfinPlayer/VideoUpNextView.swift b/JellyfinPlayer/VideoUpNextView.swift
index e04207d0..63e92e2a 100644
--- a/JellyfinPlayer/VideoUpNextView.swift
+++ b/JellyfinPlayer/VideoUpNextView.swift
@@ -42,28 +42,22 @@ struct VideoUpNextView: View {
     @ObservedObject var viewModel: UpNextViewModel
     
     var body: some View {
-        
-        Button(action: viewModel.nextUp, label: {
-            VStack(alignment: viewModel.largeView ? .leading : .center) {
-                Text("Up Next")
+        VStack(alignment: viewModel.largeView ? .leading : .center) {
+            Text("Up Next")
+                .foregroundColor(.white)
+                .font(viewModel.largeView ? .title : .body)
+                
+            Button(action: viewModel.nextUp, label: {image})
+
+            if viewModel.largeView {
+                Text(viewModel.episodeName())
+                    .padding(.trailing, 50)
                     .foregroundColor(.white)
-                    .font(viewModel.largeView ? .title : .body)
-                    .shadow(radius: 10)
-                
-                image
-                
-                if viewModel.largeView {
-                    Text(viewModel.episodeName())
-                        .padding(.trailing, 50)
-                        .foregroundColor(.white)
-                        .font(.title)
-                        .lineLimit(1)
-                        .shadow(radius: 10)
-                }
+                    .minimumScaleFactor(0.1)
             }
-            .shadow(radius: 6)
-            
-        })
+        }
+        .shadow(color: .black, radius: 20)
+
     }
     
     var image : some View {
@@ -74,7 +68,6 @@ struct VideoUpNextView: View {
                     .aspectRatio(CGSize(width: 16, height: 9), contentMode: .fit)
                     .overlay(overlayIndicator, alignment: .topTrailing)
                     .cornerRadius(5)
-                    .shadow(radius: 10)
             )
         }
         else {