[tvOS] Media Player

Scripts/Translations/AlphabetizeStrings.swift

@@ -39,7 +39,8 @@ let entries = strings.reduce(into: [String: String]()) {
 
 // Sort the keys alphabetically for consistent ordering.
 let sortedKeys = entries.keys.sorted { $0.localizedCaseInsensitiveCompare($1) == .orderedAscending }
-let newContent = sortedKeys.map { "/// \(entries[$0]!)\n\"\($0)\" = \"\(entries[$0]!)\";" }.joined(separator: "\n\n")
+let newContent = sortedKeys.map { "/// \(entries[$0]!)\n\"\($0)\" = \"\(entries[$0]!)\";" }
+    .joined(separator: "\n\n")
 
 // Write the updated, sorted, and commented localizations back to the file.
 do {

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/NavigationBar/ActionButtons/ActionButtons.swift → Shared/Components/NavigationBar/ActionButtons/ActionButtons.swift

@@ -25,6 +25,14 @@ extension VideoPlayer.PlaybackControls.NavigationBar {
         @EnvironmentObject
         private var manager: MediaPlayerManager
 
+        #if os(tvOS)
+        @EnvironmentObject
+        private var focusGuide: FocusGuide
+
+        @FocusState
+        private var focusedButton: String?
+        #endif
+
         private func filteredActionButtons(_ rawButtons: [VideoPlayerActionButton]) -> [VideoPlayerActionButton] {
             var filteredButtons = rawButtons
 
@@ -71,7 +79,11 @@ extension VideoPlayer.PlaybackControls.NavigationBar {
             case .autoPlay:
                 AutoPlay()
             case .gestureLock:
+                #if os(iOS)
                 GestureLock()
+                #else
+                EmptyView()
+                #endif
             case .playbackSpeed:
                 PlaybackRateMenu()
 //            case .playbackQuality:
@@ -110,10 +122,12 @@ extension VideoPlayer.PlaybackControls.NavigationBar {
         @ViewBuilder
         private var regularView: some View {
             HStack(spacing: 0) {
-                ForEach(
-                    barActionButtons,
-                    content: view(for:)
-                )
+                ForEach(barActionButtons) { button in
+                    view(for: button)
+                    #if os(tvOS)
+                        .focused($focusedButton, equals: button.rawValue)
+                    #endif
+                }
 
                 if menuActionButtons.isNotEmpty {
                     Menu(
@@ -126,8 +140,23 @@ extension VideoPlayer.PlaybackControls.NavigationBar {
                         )
                         .environment(\.isInMenu, true)
                     }
+                    #if os(tvOS)
+                    .focused($focusedButton, equals: "menu")
+                    #endif
+                }
+            }
+            #if os(tvOS)
+            .onChange(of: focusedButton) { _, newValue in
+                if focusGuide.focusedTag != newValue {
+                    focusGuide.transition(to: newValue)
+                }
+            }
+            .onChange(of: focusGuide.focusedTag) { _, newTag in
+                if let newTag, newTag != focusedButton {
+                    focusedButton = newTag
                 }
             }
+            #endif
         }
 
         var body: some View {

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/NavigationBar/ActionButtons/AspectFillActionButton.swift → Shared/Components/NavigationBar/ActionButtons/AspectFillActionButton.swift

@@ -36,7 +36,9 @@ extension VideoPlayer.PlaybackControls.NavigationBar.ActionButtons {
                 isAspectFilled.toggle()
             }
             .videoPlayerActionButtonTransition()
-            .id(isAspectFilled)
+            #if os(iOS)
+                .id(isAspectFilled)
+            #endif
         }
     }
 }

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/NavigationBar/ActionButtons/AutoPlayActionButton.swift → Shared/Components/NavigationBar/ActionButtons/AutoPlayActionButton.swift

@@ -53,8 +53,10 @@ extension VideoPlayer.PlaybackControls.NavigationBar.ActionButtons {
                 }
             }
             .videoPlayerActionButtonTransition()
-            .id(isAutoPlayEnabled)
-            .disabled(manager.queue == nil)
+            #if os(iOS)
+                .id(isAutoPlayEnabled)
+            #endif
+                .disabled(manager.queue == nil)
         }
     }
 }

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/NavigationBar/NavigationBar.swift → Shared/Components/NavigationBar/NavigationBar.swift

@@ -23,6 +23,9 @@ extension VideoPlayer.PlaybackControls {
         @Router
         private var router
 
+        private var fontSize: CGFloat = !UIDevice.isTV ? 24 : 36
+        private var fontWeight: Font.Weight = !UIDevice.isTV ? .semibold : .regular
+
         private func onPressed(isPressed: Bool) {
             if isPressed {
                 containerState.timer.stop()
@@ -31,37 +34,52 @@ extension VideoPlayer.PlaybackControls {
             }
         }
 
+        private var closeButton: some View {
+            Button {
+                if containerState.isPresentingSupplement {
+                    containerState.select(supplement: nil)
+                } else {
+                    manager.stop()
+                    router.dismiss()
+                }
+            } label: {
+                AlternateLayoutView {
+                    Image(systemName: "xmark")
+                } content: {
+                    Label(
+                        L10n.close,
+                        systemImage: containerState.isPresentingSupplement ? "chevron.down" : "xmark"
+                    )
+                }
+                .contentShape(Rectangle())
+            }
+        }
+
         var body: some View {
-            HStack(alignment: .center) {
-                Button {
-                    if containerState.isPresentingSupplement {
-                        containerState.select(supplement: nil)
-                    } else {
-                        manager.stop()
-                        router.dismiss()
-                    }
-                } label: {
-                    AlternateLayoutView {
-                        Image(systemName: "xmark")
-                    } content: {
-                        Label(
-                            L10n.close,
-                            systemImage: containerState.isPresentingSupplement ? "chevron.down" : "xmark"
-                        )
-                    }
-                    .contentShape(Rectangle())
+            HStack(alignment: UIDevice.isTV ? .bottom : .center) {
+
+                if !UIDevice.isTV {
+                    closeButton
                 }
 
                 TitleView(item: manager.item)
                     .frame(maxWidth: .infinity, alignment: .leading)
 
-                ActionButtons()
-            }
-            .background {
-                EmptyHitTestView()
+                AlternateLayoutView(alignment: .trailing) {
+                    Color.clear
+                        .frame(maxWidth: .infinity, alignment: .trailing)
+                } content: {
+                    ActionButtons()
+                        .focusSection()
+                }
             }
-            .font(.system(size: 24, weight: .semibold))
+            .font(.system(size: fontSize, weight: fontWeight))
             .buttonStyle(OverlayButtonStyle(onPressed: onPressed))
+            #if os(iOS)
+                .background {
+                    EmptyHitTestView()
+                }
+            #endif
         }
     }
 }
@@ -97,7 +115,9 @@ extension VideoPlayer.PlaybackControls.NavigationBar {
         var body: some View {
             let titleSubtitle = self._titleSubtitle
 
+            #if os(iOS)
             Text(titleSubtitle.title)
+                .font(.headline)
                 .fontWeight(.semibold)
                 .lineLimit(1)
                 .frame(minWidth: max(50, subtitleContentSize.width))
@@ -108,6 +128,20 @@ extension VideoPlayer.PlaybackControls.NavigationBar {
                             .offset(y: subtitleContentSize.height)
                     }
                 }
+            #else
+            VStack(alignment: .leading) {
+                Text(titleSubtitle.title)
+                    .font(.headline)
+                    .fontWeight(.semibold)
+                    .lineLimit(1)
+
+                if let subtitle = titleSubtitle.subtitle {
+                    _subtitle(subtitle)
+                        .lineLimit(1)
+                }
+            }
+            .frame(minWidth: max(50, subtitleContentSize.width))
+            #endif
         }
     }
 }

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/PlaybackProgress/ChapterTrackMask.swift → Shared/Components/PlaybackProgress/ChapterTrackMask.swift

@@ -34,7 +34,7 @@ extension VideoPlayer.PlaybackControls.PlaybackProgress {
                     ForEach(unitPoints, id: \.self) { unitPoint in
                         if unitPoint > 0 {
                             Color.black
-                                .frame(width: 1.5)
+                                .frame(width: UIDevice.isTV ? 3 : 1.5)
                                 .offset(x: proxy.size.width * unitPoint - 0.75)
                         }
                     }

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/CurrentSecondTick.swift → Shared/Components/PlaybackProgress/CurrentSecondTick.swift

@@ -23,7 +23,7 @@ extension VideoPlayer.PlaybackControls {
             if let runtime = manager.item.runtime, runtime > .zero {
                 GeometryReader { proxy in
                     Color.white
-                        .frame(width: 1.5)
+                        .frame(width: UIDevice.isTV ? 3 : 1.5)
                         .offset(x: proxy.size.width * (activeSeconds / runtime) - 0.75)
                         .frame(maxWidth: .infinity, alignment: .leading)
                 }

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/PlaybackProgress/SplitTimestamp.swift → Shared/Components/PlaybackProgress/SplitTimestamp.swift

@@ -11,29 +11,27 @@ import SwiftUI
 
 extension VideoPlayer.PlaybackControls {
 
-    struct SplitTimeStamp: View {
-
-        @Default(.VideoPlayer.Overlay.trailingTimestampType)
-        private var trailingTimestampType
+    struct SplitTimeStamp: PlatformView {
 
         @EnvironmentObject
         private var containerState: VideoPlayerContainerState
         @EnvironmentObject
-        private var scrubbedSecondsBox: PublishedBox<Duration>
-        @EnvironmentObject
         private var manager: MediaPlayerManager
-
-        @State
-        private var activeSeconds: Duration = .zero
-
-        private var isScrubbing: Bool {
-            containerState.isScrubbing
-        }
+        @EnvironmentObject
+        private var scrubbedSecondsBox: PublishedBox<Duration>
 
         private var scrubbedSeconds: Duration {
             scrubbedSecondsBox.value
         }
 
+        // MARK: - iOS
+
+        @Default(.VideoPlayer.Overlay.trailingTimestampType)
+        private var trailingTimestampType
+
+        @State
+        private var activeSeconds: Duration = .zero
+
         @ViewBuilder
         private var leadingTimestamp: some View {
             HStack(spacing: 2) {
@@ -46,7 +44,7 @@ extension VideoPlayer.PlaybackControls {
                     Text(activeSeconds, format: .runtime)
                 }
                 .foregroundStyle(.secondary)
-                .isVisible(isScrubbing)
+                .isVisible(containerState.isScrubbing)
             }
         }
 
@@ -63,7 +61,7 @@ extension VideoPlayer.PlaybackControls {
                     Text("/")
                 }
                 .foregroundStyle(.secondary)
-                .isVisible(isScrubbing)
+                .isVisible(containerState.isScrubbing)
 
                 if let runtime = manager.item.runtime {
                     switch trailingTimestampType {
@@ -78,7 +76,8 @@ extension VideoPlayer.PlaybackControls {
             }
         }
 
-        var body: some View {
+        @ViewBuilder
+        var iOSView: some View {
             HStack {
                 Button {
                     switch trailingTimestampType {
@@ -109,8 +108,48 @@ extension VideoPlayer.PlaybackControls {
             .monospacedDigit()
             .font(.caption2)
             .lineLimit(1)
-            .foregroundStyle(isScrubbing ? .primary : .secondary, .secondary)
+            .foregroundStyle(containerState.isScrubbing ? .primary : .secondary, .secondary)
             .assign(manager.secondsBox.$value, to: $activeSeconds)
         }
+
+        // MARK: - tvOS
+
+        @State
+        private var contentSize: CGSize = .zero
+        @State
+        private var leadingTimestampSize: CGSize = .zero
+        @State
+        private var trailingTimestampSize: CGSize = .zero
+
+        private var scrubbedProgress: Double {
+            guard let runtime = manager.item.runtime, runtime > .zero else { return 0 }
+            return scrubbedSeconds / runtime
+        }
+
+        private var previewXOffset: CGFloat {
+            let p = contentSize.width * scrubbedProgress - (leadingTimestampSize.width / 2)
+            return clamp(p, min: 0, max: contentSize.width - (trailingTimestampSize.width + leadingTimestampSize.width))
+        }
+
+        @ViewBuilder
+        var tvOSView: some View {
+            ZStack {
+                if let runtime = manager.item.runtime {
+                    Text(.zero - (runtime - scrubbedSeconds), format: .runtime)
+                } else {
+                    Text(verbatim: .emptyRuntime)
+                }
+            }
+            .trackingSize($trailingTimestampSize)
+            .frame(maxWidth: .infinity, alignment: .trailing)
+            .overlay(alignment: .leading) {
+                Text(scrubbedSeconds, format: .runtime)
+                    .trackingSize($leadingTimestampSize)
+                    .offset(x: previewXOffset)
+            }
+            .font(.callout)
+            .monospacedDigit()
+            .trackingSize($contentSize)
+        }
     }
 }

Swiftfin/Views/VideoPlayerContainerView/PlaybackControls/Components/OverlayButtonStyle.swift → Shared/Extensions/ButtonStyle/OverlayButtonStyle.swift

@@ -14,23 +14,27 @@ extension VideoPlayer.PlaybackControls {
 
         @Environment(\.isEnabled)
         private var isEnabled
+        @Environment(\.isFocused)
+        private var isFocused
 
         let onPressed: (Bool) -> Void
 
         func makeBody(configuration: Configuration) -> some View {
             configuration.label
-                .foregroundStyle(isEnabled ? AnyShapeStyle(HierarchicalShapeStyle.primary) : AnyShapeStyle(Color.gray))
+                .foregroundStyle(isEnabled ? isFocused ? AnyShapeStyle(Color.black) : AnyShapeStyle(HierarchicalShapeStyle.primary) :
+                    AnyShapeStyle(Color.gray)
+                )
                 .labelStyle(.iconOnly)
                 .contentShape(Rectangle())
                 .scaleEffect(
                     configuration.isPressed ? 0.8 : 1
                 )
                 .animation(.bouncy(duration: 0.25, extraBounce: 0.25), value: configuration.isPressed)
-                .padding(4)
+                .padding(UIDevice.isTV ? 12 : 4)
                 .animation(nil, value: configuration.isPressed)
                 .background {
                     Circle()
-                        .foregroundStyle(Color.white.opacity(configuration.isPressed ? 0.25 : 0))
+                        .foregroundStyle(Color.white.opacity(configuration.isPressed ? 0.25 : isFocused ? 1 : 0))
                         .scaleEffect(configuration.isPressed ? 1 : 0.9)
                 }
                 .animation(.linear(duration: 0.1).delay(configuration.isPressed ? 0.2 : 0), value: configuration.isPressed)

Shared/Objects/JumpProgressObserver.swift

@@ -33,6 +33,10 @@ class JumpProgressObserver: ObservableObject {
             }
     }
 
+    func reset() {
+        jumps = 0
+    }
+
     func jumpForward(interval: TimeInterval? = nil) {
         if isForward {
             jumps += 1