diff --git a/Model/URLBookmarkModel.swift b/Model/URLBookmarkModel.swift index 9605d5f4..2799a6a9 100644 --- a/Model/URLBookmarkModel.swift +++ b/Model/URLBookmarkModel.swift @@ -76,7 +76,7 @@ struct URLBookmarkModel { } func refreshAll() { - logger.info("refreshing all bookamrks") + logger.info("refreshing all bookmarks") allURLs.forEach { url in if loadBookmark(url) != nil { diff --git a/Shared/Player/Controls/ControlsOverlay.swift b/Shared/Player/Controls/ControlsOverlay.swift index c5189d92..4b116411 100644 --- a/Shared/Player/Controls/ControlsOverlay.swift +++ b/Shared/Player/Controls/ControlsOverlay.swift @@ -26,7 +26,7 @@ struct ControlsOverlay: View { var body: some View { ScrollView { VStack { - Section(header: controlsHeader("Rate & Captions".localized())) { + Section(header: controlsHeader(rateAndCaptionsLabel.localized())) { HStack(spacing: rateButtonsSpacing) { decreaseRateButton #if os(tvOS) @@ -39,15 +39,16 @@ struct ControlsOverlay: View { #endif } - captionsButton - #if os(tvOS) - .focused($focusedField, equals: .captions) - #endif - .disabled(player.activeBackend != .mpv) + if player.activeBackend == .mpv { + captionsButton + #if os(tvOS) + .focused($focusedField, equals: .captions) + #endif - #if os(iOS) + #if os(iOS) .foregroundColor(.white) - #endif + #endif + } } Section(header: controlsHeader("Quality Profile".localized())) { @@ -110,6 +111,10 @@ struct ControlsOverlay: View { #endif } + private var rateAndCaptionsLabel: String { + player.activeBackend == .mpv ? "Rate & Captions" : "Playback Rate" + } + private var overlayHeight: Double { #if os(tvOS) contentSize.height + 80.0 diff --git a/tvOS/TVNavigationView.swift b/tvOS/TVNavigationView.swift index 161e18ce..b2ebbcc1 100644 --- a/tvOS/TVNavigationView.swift +++ b/tvOS/TVNavigationView.swift @@ -23,19 +23,19 @@ struct TVNavigationView: View { .tabItem { Text("Subscriptions") } .tag(TabSelection.subscriptions) } - + if visibleSections.contains(.popular), accounts.app.supportsPopular { LazyView(PopularView()) .tabItem { Text("Popular") } .tag(TabSelection.popular) } - + if visibleSections.contains(.trending) { LazyView(TrendingView()) .tabItem { Text("Trending") } .tag(TabSelection.trending) } - + if visibleSections.contains(.playlists), accounts.app.supportsUserPlaylists, accounts.signedIn { LazyView(PlaylistsView()) .tabItem { Text("Playlists") }