ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove bagged focus - also don't add subrips to VLC playback.

This commit is contained in:
Aiden Vigue 2021-08-06 15:58:08 -06:00
parent 93a25eb9c4
commit c61ca3ce4a
No known key found for this signature in database
GPG Key ID: B9A09843AB079D5B
6 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
JellyfinPlayer tvOS/MainTabView.swift
View File

@ -42,17 +42,18 @@ struct MainTabView: View {
HomeView() HomeView()
.offset(y: -1) // don't remove this. it breaks tabview on 4K displays. .offset(y: -1) // don't remove this. it breaks tabview on 4K displays.
.tabItem { .tabItem {
Text("All Media") Text("Home")
Image(systemName: "house") Image(systemName: "house")
} }
.tag(Tab.home) .tag(Tab.allMedia)
Text("Library") Text("Library")
.tabItem { .tabItem {
Text("Home") Text("All Media")
Image(systemName: "folder") Image(systemName: "folder")
} }
.tag(Tab.allMedia) .tag(Tab.home)
SettingsView(viewModel: SettingsViewModel()) SettingsView(viewModel: SettingsViewModel())
.offset(y: -1) // don't remove this. it breaks tabview on 4K displays. .offset(y: -1) // don't remove this. it breaks tabview on 4K displays.

5
JellyfinPlayer tvOS/MovieItemView.swift
View File

@ -9,7 +9,6 @@
import SwiftUI import SwiftUI
import JellyfinAPI import JellyfinAPI
import SwiftUIFocusGuide
struct MovieItemView: View { struct MovieItemView: View {
@ObservedObject var viewModel: MovieItemViewModel @ObservedObject var viewModel: MovieItemViewModel
@ -20,8 +19,6 @@ struct MovieItemView: View {
@State var wrappedScrollView: UIScrollView? @State var wrappedScrollView: UIScrollView?
@StateObject var focusBag = SwiftUIFocusBag()
@Namespace private var namespace @Namespace private var namespace
func onAppear() { func onAppear() {
@ -158,7 +155,6 @@ struct MovieItemView: View {
Spacer() Spacer()
} }
.padding(.top, 15) .padding(.top, 15)
.addFocusGuide(using: focusBag, name: "actionButtons", destinations: [.bottom: "moreLikeThis"], debug: false)
} }
}.padding(.top, 50) }.padding(.top, 50)
@ -177,7 +173,6 @@ struct MovieItemView: View {
Spacer().frame(width: 45) Spacer().frame(width: 45)
} }
}.padding(EdgeInsets(top: -30, leading: -90, bottom: 0, trailing: -90)) }.padding(EdgeInsets(top: -30, leading: -90, bottom: 0, trailing: -90))
.addFocusGuide(using: focusBag, name: "moreLikeThis", destinations: [.top: "actionButtons"], debug: false)
.frame(height: 360) .frame(height: 360)
} }
}.padding(EdgeInsets(top: 90, leading: 90, bottom: 0, trailing: 90)) }.padding(EdgeInsets(top: 90, leading: 90, bottom: 0, trailing: 90))

3
JellyfinPlayer tvOS/SeasonItemView.swift
View File

@ -9,14 +9,11 @@
import SwiftUI import SwiftUI
import JellyfinAPI import JellyfinAPI
import SwiftUIFocusGuide
struct SeasonItemView: View { struct SeasonItemView: View {
@ObservedObject var viewModel: SeasonItemViewModel @ObservedObject var viewModel: SeasonItemViewModel
@State var wrappedScrollView: UIScrollView? @State var wrappedScrollView: UIScrollView?
@StateObject var focusBag = SwiftUIFocusBag()
@Environment(\.resetFocus) var resetFocus @Environment(\.resetFocus) var resetFocus
@Namespace private var namespace @Namespace private var namespace

3
JellyfinPlayer tvOS/SeriesItemView.swift
View File

@ -9,7 +9,6 @@
import SwiftUI import SwiftUI
import JellyfinAPI import JellyfinAPI
import SwiftUIFocusGuide
struct SeriesItemView: View { struct SeriesItemView: View {
@ObservedObject var viewModel: SeriesItemViewModel @ObservedObject var viewModel: SeriesItemViewModel
@ -20,8 +19,6 @@ struct SeriesItemView: View {
@State var wrappedScrollView: UIScrollView? @State var wrappedScrollView: UIScrollView?
@StateObject var focusBag = SwiftUIFocusBag()
@Environment(\.resetFocus) var resetFocus @Environment(\.resetFocus) var resetFocus
@Namespace private var namespace @Namespace private var namespace

6
JellyfinPlayer tvOS/SettingsView.swift
View File

@ -31,15 +31,13 @@ struct SettingsView: View {
Picker("Default local quality", selection: $inNetworkStreamBitrate) { Picker("Default local quality", selection: $inNetworkStreamBitrate) {
ForEach(self.viewModel.bitrates, id: \.self) { bitrate in ForEach(self.viewModel.bitrates, id: \.self) { bitrate in
Text(bitrate.name).tag(bitrate.value) Text(bitrate.name).tag(bitrate.value)
}.padding(.leading, 90) }
.padding(.trailing, 90)
} }
Picker("Default remote quality", selection: $outOfNetworkStreamBitrate) { Picker("Default remote quality", selection: $outOfNetworkStreamBitrate) {
ForEach(self.viewModel.bitrates, id: \.self) { bitrate in ForEach(self.viewModel.bitrates, id: \.self) { bitrate in
Text(bitrate.name).tag(bitrate.value) Text(bitrate.name).tag(bitrate.value)
}.padding(.leading, 90) }
.padding(.trailing, 90)
} }
} }

2
JellyfinPlayer tvOS/VideoPlayer/VideoPlayerViewController.swift
View File

@ -229,7 +229,7 @@ class VideoPlayerViewController: UIViewController, VideoPlayerSettingsDelegate,
} }
subtitleTrackArray.forEach { sub in 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) mediaPlayer.addPlaybackSlave(sub.url!, type: .subtitle, enforce: false)
} }
} }