improvements to captions on tvOS

Shared/Player/Controls/ControlsOverlay.swift

@@ -333,9 +333,19 @@ struct ControlsOverlay: View {
         } label: {
             HStack(spacing: 4) {
                 Image(systemName: "text.bubble")
-                    if let captions = captionsBinding.wrappedValue {
+                if let captions = captionsBinding.wrappedValue,
-                        Text(captions.code)
+                   let language = LanguageCodes(rawValue: captions.code)
-                            .foregroundColor(.primary)
+
+                {
+                    Text("\(language.description.capitalized) (\(language.rawValue))")
+                        .foregroundColor(.accentColor)
+                } else {
+                    if captionsBinding.wrappedValue == nil {
+                        Text("Not available")
+                    } else {
+                        Text("Disabled")
+                            .foregroundColor(.accentColor)
+                    }
                 }
             }
             .frame(width: 240)
@@ -351,8 +361,18 @@ struct ControlsOverlay: View {
         ControlsOverlayButton(focusedField: $focusedField, field: .captions) {
             HStack(spacing: 8) {
                 Image(systemName: "text.bubble")
-                    if let captions = captionsBinding.wrappedValue {
+                if let captions = captionsBinding.wrappedValue,
-                        Text(captions.code)
+                   let language = LanguageCodes(rawValue: captions.code)
+                {
+                    Text("\(language.description.capitalized) (\(language.rawValue))")
+                        .foregroundColor(.accentColor)
+                } else {
+                    if captionsBinding.wrappedValue == nil {
+                        Text("Not available")
+                    } else {
+                        Text("Disabled")
+                            .foregroundColor(.accentColor)
+                    }
                 }
             }
             .frame(maxWidth: 320)

Shared/Player/PlaybackSettings.swift

@@ -384,13 +384,16 @@ struct PlaybackSettings: View {
     }
 
     @ViewBuilder private var captionsButton: some View {
+        let videoCaptions = player.currentVideo?.captions
         #if os(macOS)
             captionsPicker
                 .labelsHidden()
                 .frame(maxWidth: 300)
         #elseif os(iOS)
             Menu {
+                if videoCaptions?.isEmpty == false {
                     captionsPicker
+                }
             } label: {
                 HStack(spacing: 4) {
                     Image(systemName: "text.bubble")
@@ -399,10 +402,17 @@ struct PlaybackSettings: View {
                     {
                         Text("\(language.description.capitalized) (\(language.rawValue))")
                             .foregroundColor(.accentColor)
+                    } else {
+                        if videoCaptions?.isEmpty == true {
+                            Text("Not available")
+                        } else {
+                            Text("Disabled")
+                        }
                     }
                 }
                 .frame(alignment: .trailing)
                 .frame(height: 40)
+                .disabled(videoCaptions?.isEmpty == true)
             }
             .transaction { t in t.animation = .none }
             .buttonStyle(.plain)

Shared/Settings/PlayerSettings.swift

@@ -49,6 +49,10 @@ struct PlayerSettings: View {
         }
     #endif
 
+    #if os(tvOS)
+        @State private var isShowingLanguagePicker = false
+    #endif
+
     var body: some View {
         Group {
             #if os(macOS)
@@ -101,7 +105,23 @@ struct PlayerSettings: View {
 
             Section(header: SettingsHeader(text: "Captions".localized())) {
                 showCaptionsAutoShowToggle
+                #if !os(tvOS)
                     captionDefaultLanguagePicker
+                #else
+                    Button(action: { isShowingLanguagePicker = true }) {
+                        HStack {
+                            Text("Default language")
+                            Spacer()
+                            Text("\(LanguageCodes(rawValue: captionsDefaultLanguageCode)!.description.capitalized) (\(captionsDefaultLanguageCode))").foregroundColor(.secondary)
+                        }
+                    }
+                    .frame(maxWidth: .infinity).sheet(isPresented: $isShowingLanguagePicker) {
+                        LanguagePickerTVOS(
+                            selectedLanguage: $captionsDefaultLanguageCode,
+                            isShowing: $isShowingLanguagePicker
+                        )
+                    }
+                #endif
             }
 
             #if !os(tvOS)
@@ -290,21 +310,11 @@ struct PlayerSettings: View {
         }
     #endif
 
-    #if !os(tvOS)
-        private var inspectorVisibilityPicker: some View {
-            Picker("Inspector", selection: $showInspector) {
-                Text("Always").tag(ShowInspectorSetting.always)
-                Text("Only for local files and URLs").tag(ShowInspectorSetting.onlyLocal)
-            }
-            #if os(macOS)
-            .labelsHidden()
-            #endif
-        }
-
     private var showCaptionsAutoShowToggle: some View {
         Toggle("Always show captions", isOn: $captionsAutoShow)
     }
 
+    #if !os(tvOS)
         private var captionDefaultLanguagePicker: some View {
             Picker("Default language", selection: $captionsDefaultLanguageCode) {
                 ForEach(LanguageCodes.allCases, id: \.self) { language in
@@ -315,6 +325,37 @@ struct PlayerSettings: View {
             .labelsHidden()
             #endif
         }
+    #else
+        struct LanguagePickerTVOS: View {
+            @Binding var selectedLanguage: String
+            @Binding var isShowing: Bool
+
+            var body: some View {
+                NavigationView {
+                    List(LanguageCodes.allCases, id: \.self) { language in
+                        Button(action: {
+                            selectedLanguage = language.rawValue
+                            isShowing = false
+                        }) {
+                            Text("\(language.description.capitalized) (\(language.rawValue))")
+                        }
+                    }
+                    .navigationTitle("Select Default Language")
+                }
+            }
+        }
+    #endif
+
+    #if !os(tvOS)
+        private var inspectorVisibilityPicker: some View {
+            Picker("Inspector", selection: $showInspector) {
+                Text("Always").tag(ShowInspectorSetting.always)
+                Text("Only for local files and URLs").tag(ShowInspectorSetting.onlyLocal)
+            }
+            #if os(macOS)
+            .labelsHidden()
+            #endif
+        }
 
         private var showChaptersToggle: some View {
             Toggle("Show chapters", isOn: $showChapters)