Video Player Manager Refactor

PreferencesView/Sources/PreferencesView/PreferenceKeys.swift

@@ -22,15 +22,17 @@ struct PreferredScreenEdgesDeferringSystemGesturesPreferenceKey: PreferenceKey {
 
     static var defaultValue: UIRectEdge = [.left, .right]
 
-    static func reduce(value: inout UIRectEdge, nextValue: () -> UIRectEdge) {}
+    static func reduce(value: inout UIRectEdge, nextValue: () -> UIRectEdge) {
+        value = nextValue()
+    }
 }
 
 struct PrefersHomeIndicatorAutoHiddenPreferenceKey: PreferenceKey {
 
     static var defaultValue: Bool = false
 
     static func reduce(value: inout Bool, nextValue: () -> Bool) {
-        value = nextValue() || value
+        value = nextValue()
     }
 }
 

Shared/Components/AlternateLayoutView.swift

@@ -8,6 +8,8 @@
 
 import SwiftUI
 
+// TODO: remove frame
+
 /// A view that takes a view to affect layout while overlaying the content.
 struct AlternateLayoutView<Content: View, Layout: View>: View {
 
@@ -27,6 +29,7 @@ struct AlternateLayoutView<Content: View, Layout: View>: View {
 
     var body: some View {
         layout()
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
             .hidden()
             .overlay(alignment: alignment) {
                 content()

Shared/Components/ImageView.swift

@@ -11,7 +11,7 @@ import Nuke
 import NukeUI
 import SwiftUI
 
-// TODO: currently SVGs are only supported for logos, which are only used in a few places.
+// TODO: currently SVGs are only "officially" supported for logos, which are only used in a few places.
 //       make it so when displaying an SVG there is a unified `image` caller modifier
 // TODO: `LazyImage` uses a transaction for view swapping, which will fade out old views
 //       and fade in new views, causing a black "flash" between the placeholder and final image.

Shared/Components/OpacityLinearGradient.swift

@@ -0,0 +1,36 @@
+//
+// Swiftfin is subject to the terms of the Mozilla Public
+// License, v2.0. If a copy of the MPL was not distributed with this
+// file, you can obtain one at https://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
+//
+
+import SwiftUI
+
+struct OpacityLinearGradient: View {
+
+    typealias Stop = (location: CGFloat, opacity: CGFloat)
+
+    private let stops: [Stop]
+
+    init(@ArrayBuilder<Stop> stops: () -> [Stop]) {
+        self.stops = stops()
+    }
+
+    var body: some View {
+        Rectangle()
+            .mask {
+                LinearGradient(
+                    stops: stops.map {
+                        Gradient.Stop(
+                            color: Color.black.opacity($0.opacity),
+                            location: $0.location
+                        )
+                    },
+                    startPoint: .top,
+                    endPoint: .bottom
+                )
+            }
+    }
+}

Shared/Components/ProgressBar.swift

@@ -8,7 +8,7 @@
 
 import SwiftUI
 
-// TODO: remove and replace with below
+// TODO: remove and replace with `PlaybackProgressViewStyle`
 struct ProgressBar: View {
 
     @State
@@ -31,57 +31,3 @@ struct ProgressBar: View {
             .trackingSize($contentSize)
     }
 }
-
-// TODO: fix capsule with low progress
-
-extension ProgressViewStyle where Self == PlaybackProgressViewStyle {
-
-    static var playback: Self { .init(secondaryProgress: nil) }
-
-    static func playback(secondaryProgress: Double?) -> Self {
-        .init(secondaryProgress: secondaryProgress)
-    }
-}
-
-struct PlaybackProgressViewStyle: ProgressViewStyle {
-
-    @State
-    private var contentSize: CGSize = .zero
-
-    let secondaryProgress: Double?
-
-    func makeBody(configuration: Configuration) -> some View {
-        Capsule()
-            .foregroundStyle(.secondary)
-            .opacity(0.2)
-            .overlay(alignment: .leading) {
-                ZStack(alignment: .leading) {
-
-                    if let secondaryProgress {
-                        Capsule()
-                            .mask(alignment: .leading) {
-                                Rectangle()
-                            }
-                            .frame(width: contentSize.width * clamp(secondaryProgress, min: 0, max: 1))
-                            .foregroundStyle(.tertiary)
-                    }
-
-                    Capsule()
-                        .mask(alignment: .leading) {
-                            Rectangle()
-                        }
-                        .frame(width: contentSize.width * (configuration.fractionCompleted ?? 0))
-                        .foregroundStyle(.primary)
-                }
-            }
-            .trackingSize($contentSize)
-    }
-}
-
-// #Preview {
-//    ProgressView(value: 0.3)
-//        .progressViewStyle(.SwiftfinLinear(secondaryProgress: 0.3))
-//        .frame(height: 8)
-//        .padding(.horizontal, 10)
-//        .foregroundStyle(.primary, .secondary, .orange)
-// }

Shared/Components/SystemImageContentView.swift

@@ -10,6 +10,7 @@ import SwiftUI
 
 // TODO: bottom view can probably just be cleaned up and change
 //       usages to use local background views
+// TODO: use heirarchical styles instead of explicit color
 
 struct RelativeSystemImageView: View {
 

Shared/Components/TruncatedText.swift

@@ -59,7 +59,7 @@ struct TruncatedText: View {
                                 }
                         }
                     }
-                    .visible(isTruncated)
+                    .isVisible(isTruncated)
                 }
 
             if isTruncated {

Shared/Components/WrappedView.swift

@@ -12,6 +12,7 @@ import SwiftUI
 //       but doesn't work with animations/transitions.
 //       Look at alternative with just ZStack and remove
 
+// @available(*, deprecated, message: "Use ZStack instead")
 struct WrappedView<Content: View>: View {
 
     @ViewBuilder

Shared/Coordinators/AppSettingsCoordinator.swift

@@ -35,8 +35,8 @@ final class AppSettingsCoordinator: NavigationCoordinatable {
 
     #if os(iOS)
     @ViewBuilder
-    func makeAbout(viewModel: SettingsViewModel) -> some View {
-        AboutAppView(viewModel: viewModel)
+    func makeAbout() -> some View {
+        AboutAppView()
     }
 
     @ViewBuilder

Shared/Coordinators/ItemCoordinator.swift

@@ -90,8 +90,8 @@ final class ItemCoordinator: NavigationCoordinatable {
     #endif
 
     #if os(tvOS)
-    func makeVideoPlayer(manager: VideoPlayerManager) -> NavigationViewCoordinator<VideoPlayerCoordinator> {
-        NavigationViewCoordinator(VideoPlayerCoordinator(manager: manager))
+    func makeVideoPlayer(manager: MediaPlayerManager) -> VideoPlayerCoordinator {
+        VideoPlayerCoordinator(manager: manager)
     }
     #endif
 

Shared/Coordinators/MainCoordinator/iOSMainCoordinator.swift

@@ -35,8 +35,11 @@ final class MainCoordinator: NavigationCoordinatable {
     @Root
     var serverCheck = makeServerCheck
 
+    #if DEBUG
     @Route(.fullScreen)
-    var liveVideoPlayer = makeLiveVideoPlayer
+    var debugPlayground = makeDebugPlayground
+    #endif
+
     @Route(.modal)
     var settings = makeSettings
     @Route(.fullScreen)
@@ -79,6 +82,20 @@ final class MainCoordinator: NavigationCoordinatable {
         Notifications[.didSignOut].subscribe(self, selector: #selector(didSignOut))
         Notifications[.processDeepLink].subscribe(self, selector: #selector(processDeepLink(_:)))
         Notifications[.didChangeCurrentServerURL].subscribe(self, selector: #selector(didChangeCurrentServerURL(_:)))
+
+        #if DEBUG
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(didShake),
+            name: UIDevice.deviceDidShakeNotification,
+            object: nil
+        )
+        #endif
+    }
+
+    @objc
+    private func didShake() {
+        self.route(to: \.debugPlayground)
     }
 
     private func didFinishMigration() {}
@@ -148,11 +165,28 @@ final class MainCoordinator: NavigationCoordinatable {
         }
     }
 
-    func makeVideoPlayer(manager: VideoPlayerManager) -> VideoPlayerCoordinator {
+    func makeVideoPlayer(manager: MediaPlayerManager) -> VideoPlayerCoordinator {
         VideoPlayerCoordinator(manager: manager)
     }
 
-    func makeLiveVideoPlayer(manager: LiveVideoPlayerManager) -> LiveVideoPlayerCoordinator {
-        LiveVideoPlayerCoordinator(manager: manager)
+    #if DEBUG
+    @ViewBuilder
+    func makeDebugPlayground() -> some View {
+        DebugPlaygroundView()
+    }
+    #endif
+}
+
+// The notification we'll send when a shake gesture happens.
+extension UIDevice {
+    static let deviceDidShakeNotification = Notification.Name(rawValue: "deviceDidShakeNotification")
+}
+
+//  Override the default behavior of shake gestures to send our notification instead.
+extension UIWindow {
+    override open func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
+        if motion == .motionShake {
+            NotificationCenter.default.post(name: UIDevice.deviceDidShakeNotification, object: nil)
+        }
     }
 }