From c61ca3ce4a3150fcfc74c1cb4075cbd1ad2458d4 Mon Sep 17 00:00:00 2001 From: Aiden Vigue Date: Fri, 6 Aug 2021 15:58:08 -0600 Subject: [PATCH] remove bagged focus - also don't add subrips to VLC playback. --- JellyfinPlayer tvOS/MainTabView.swift | 9 +++++---- JellyfinPlayer tvOS/MovieItemView.swift | 5 ----- JellyfinPlayer tvOS/SeasonItemView.swift | 3 --- JellyfinPlayer tvOS/SeriesItemView.swift | 3 --- JellyfinPlayer tvOS/SettingsView.swift | 6 ++---- .../VideoPlayer/VideoPlayerViewController.swift | 2 +- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/JellyfinPlayer tvOS/MainTabView.swift b/JellyfinPlayer tvOS/MainTabView.swift index e4eb8c95..4dbbdc3d 100644 --- a/JellyfinPlayer tvOS/MainTabView.swift +++ b/JellyfinPlayer tvOS/MainTabView.swift @@ -42,17 +42,18 @@ struct MainTabView: View { HomeView() .offset(y: -1) // don't remove this. it breaks tabview on 4K displays. .tabItem { - Text("All Media") + Text("Home") Image(systemName: "house") + } - .tag(Tab.home) + .tag(Tab.allMedia) Text("Library") .tabItem { - Text("Home") + Text("All Media") Image(systemName: "folder") } - .tag(Tab.allMedia) + .tag(Tab.home) SettingsView(viewModel: SettingsViewModel()) .offset(y: -1) // don't remove this. it breaks tabview on 4K displays. diff --git a/JellyfinPlayer tvOS/MovieItemView.swift b/JellyfinPlayer tvOS/MovieItemView.swift index f163cac8..907836a3 100644 --- a/JellyfinPlayer tvOS/MovieItemView.swift +++ b/JellyfinPlayer tvOS/MovieItemView.swift @@ -9,7 +9,6 @@ import SwiftUI import JellyfinAPI -import SwiftUIFocusGuide struct MovieItemView: View { @ObservedObject var viewModel: MovieItemViewModel @@ -20,8 +19,6 @@ struct MovieItemView: View { @State var wrappedScrollView: UIScrollView? - @StateObject var focusBag = SwiftUIFocusBag() - @Namespace private var namespace func onAppear() { @@ -158,7 +155,6 @@ struct MovieItemView: View { Spacer() } .padding(.top, 15) - .addFocusGuide(using: focusBag, name: "actionButtons", destinations: [.bottom: "moreLikeThis"], debug: false) } }.padding(.top, 50) @@ -177,7 +173,6 @@ struct MovieItemView: View { Spacer().frame(width: 45) } }.padding(EdgeInsets(top: -30, leading: -90, bottom: 0, trailing: -90)) - .addFocusGuide(using: focusBag, name: "moreLikeThis", destinations: [.top: "actionButtons"], debug: false) .frame(height: 360) } }.padding(EdgeInsets(top: 90, leading: 90, bottom: 0, trailing: 90)) diff --git a/JellyfinPlayer tvOS/SeasonItemView.swift b/JellyfinPlayer tvOS/SeasonItemView.swift index 795e2ac4..53e754ce 100644 --- a/JellyfinPlayer tvOS/SeasonItemView.swift +++ b/JellyfinPlayer tvOS/SeasonItemView.swift @@ -9,14 +9,11 @@ import SwiftUI import JellyfinAPI -import SwiftUIFocusGuide struct SeasonItemView: View { @ObservedObject var viewModel: SeasonItemViewModel @State var wrappedScrollView: UIScrollView? - @StateObject var focusBag = SwiftUIFocusBag() - @Environment(\.resetFocus) var resetFocus @Namespace private var namespace diff --git a/JellyfinPlayer tvOS/SeriesItemView.swift b/JellyfinPlayer tvOS/SeriesItemView.swift index cab03c10..eeb07f8c 100644 --- a/JellyfinPlayer tvOS/SeriesItemView.swift +++ b/JellyfinPlayer tvOS/SeriesItemView.swift @@ -9,7 +9,6 @@ import SwiftUI import JellyfinAPI -import SwiftUIFocusGuide struct SeriesItemView: View { @ObservedObject var viewModel: SeriesItemViewModel @@ -20,8 +19,6 @@ struct SeriesItemView: View { @State var wrappedScrollView: UIScrollView? - @StateObject var focusBag = SwiftUIFocusBag() - @Environment(\.resetFocus) var resetFocus @Namespace private var namespace diff --git a/JellyfinPlayer tvOS/SettingsView.swift b/JellyfinPlayer tvOS/SettingsView.swift index 9db18f91..0fe1c54f 100644 --- a/JellyfinPlayer tvOS/SettingsView.swift +++ b/JellyfinPlayer tvOS/SettingsView.swift @@ -31,15 +31,13 @@ struct SettingsView: View { Picker("Default local quality", selection: $inNetworkStreamBitrate) { ForEach(self.viewModel.bitrates, id: \.self) { bitrate in Text(bitrate.name).tag(bitrate.value) - }.padding(.leading, 90) - .padding(.trailing, 90) + } } Picker("Default remote quality", selection: $outOfNetworkStreamBitrate) { ForEach(self.viewModel.bitrates, id: \.self) { bitrate in Text(bitrate.name).tag(bitrate.value) - }.padding(.leading, 90) - .padding(.trailing, 90) + } } } diff --git a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift index 1050f03a..2ee948f1 100644 --- a/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift +++ b/JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift @@ -229,7 +229,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate, } subtitleTrackArray.forEach { sub in - if sub.id != -1 && sub.delivery == .external { + if sub.id != -1 && sub.delivery == .external && sub.codec != "subrip" { mediaPlayer.addPlaybackSlave(sub.url!, type: .subtitle, enforce: false) } }