Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 02:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace environment objects with observed objects

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-11-24 21:36:05 +01:00
parent 23fa0968c6
commit 0d333b5583
102 changed files with 427 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Shared/Player/AppleAVPlayerView.swift
View File

@@ -4,11 +4,8 @@ import SwiftUI
#if os(iOS)
struct AppleAVPlayerView: UIViewRepresentable {
@EnvironmentObject<PlayerModel> private var player
func makeUIView(context _: Context) -> some UIView {
let playerLayerView = PlayerLayerView(frame: .zero)
playerLayerView.player = player
return playerLayerView
}
@@ -16,30 +13,15 @@ import SwiftUI
}
#else
struct AppleAVPlayerView: UIViewControllerRepresentable {
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<CommentsModel> private var comments
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<PlaylistsModel> private var playlists
@EnvironmentObject<SubscriptionsModel> private var subscriptions
func makeUIViewController(context _: Context) -> AppleAVPlayerViewController {
let controller = AppleAVPlayerViewController()
controller.accountsModel = accounts
controller.commentsModel = comments
controller.navigationModel = navigation
controller.playerModel = player
controller.playlistsModel = playlists
controller.subscriptionsModel = subscriptions
player.avPlayerBackend.controller = controller
PlayerModel.shared.avPlayerBackend.controller = controller
return controller
}
func updateUIViewController(_: AppleAVPlayerViewController, context _: Context) {
player.rebuildTVMenu()
PlayerModel.shared.rebuildTVMenu()
}
}
#endif

17
Shared/Player/AppleAVPlayerViewController.swift
View File

@@ -4,12 +4,11 @@ import SwiftUI
final class AppleAVPlayerViewController: UIViewController {
var playerLoaded = false
var accountsModel: AccountsModel!
var commentsModel: CommentsModel!
var navigationModel: NavigationModel!
var playerModel: PlayerModel!
var playlistsModel: PlaylistsModel!
var subscriptionsModel: SubscriptionsModel!
var accountsModel: AccountsModel { .shared }
var navigationModel: NavigationModel { .shared }
var playerModel: PlayerModel { .shared }
var playlistsModel: PlaylistsModel { .shared }
var subscriptionsModel: SubscriptionsModel { .shared }
var playerView = AVPlayerViewController()
let persistenceController = PersistenceController.shared
@@ -66,12 +65,6 @@ final class AppleAVPlayerViewController: UIViewController {
AnyView(
NowPlayingView(sections: sections, inInfoViewController: true)
.frame(maxHeight: 600)
.environmentObject(accountsModel)
.environmentObject(commentsModel)
.environmentObject(navigationModel)
.environmentObject(playerModel)
.environmentObject(playlistsModel)
.environmentObject(subscriptionsModel)
.environment(\.managedObjectContext, persistenceController.container.viewContext)
)
)

7
Shared/Player/Controls/ControlsOverlay.swift
View File

@@ -2,8 +2,8 @@ import Defaults
import SwiftUI
struct ControlsOverlay: View {
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<PlayerControlsModel> private var model
@ObservedObject private var player = PlayerModel.shared
private var model = PlayerControlsModel.shared
@State private var contentSize: CGSize = .zero
@@ -399,8 +399,5 @@ struct ControlsOverlay: View {
struct ControlsOverlay_Previews: PreviewProvider {
static var previews: some View {
ControlsOverlay()
.environmentObject(NetworkStateModel())
.environmentObject(PlayerModel())
.environmentObject(PlayerControlsModel())
}
}

2
Shared/Player/Controls/OSD/Buffering.swift
View File

@@ -10,7 +10,7 @@ struct Buffering: View {
@Environment(\.verticalSizeClass) private var verticalSizeClass
#endif
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var player = PlayerModel.shared
@Default(.playerControlsLayout) private var regularPlayerControlsLayout
@Default(.fullScreenPlayerControlsLayout) private var fullScreenPlayerControlsLayout

2
Shared/Player/Controls/OSD/NetworkState.swift
View File

@@ -15,7 +15,5 @@ struct NetworkState_Previews: PreviewProvider {
networkState.bufferingState = 30
return NetworkState()
.environmentObject(networkState)
.environmentObject(PlayerModel())
}
}

4
Shared/Player/Controls/OSD/OpeningStream.swift
View File

@@ -1,8 +1,8 @@
import SwiftUI
struct OpeningStream: View {
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<NetworkStateModel> private var model
@ObservedObject private var player = PlayerModel.shared
@ObservedObject private var model = NetworkStateModel.shared
var body: some View {
Buffering(reason: reason, state: state)

3
Shared/Player/Controls/OSD/Seek.swift
View File

@@ -6,7 +6,7 @@ struct Seek: View {
@Environment(\.verticalSizeClass) private var verticalSizeClass
#endif
@EnvironmentObject<PlayerControlsModel> private var controls
@ObservedObject private var controls = PlayerControlsModel.shared
@StateObject private var model = SeekModel.shared
private var updateThrottle = Throttle(interval: 2)
@@ -137,6 +137,5 @@ struct Seek: View {
struct Seek_Previews: PreviewProvider {
static var previews: some View {
Seek()
.environmentObject(PlayerTimeModel())
}
}

15
Shared/Player/Controls/PlayerControls.swift
View File

@@ -6,8 +6,8 @@ import SwiftUI
struct PlayerControls: View {
static let animation = Animation.easeInOut(duration: 0.2)
private var player: PlayerModel!
private var thumbnails: ThumbnailsModel!
private var player: PlayerModel { .shared }
private var thumbnails: ThumbnailsModel { .shared }
@ObservedObject private var model = PlayerControlsModel.shared
@@ -39,11 +39,6 @@ struct PlayerControls: View {
player.playingFullScreen ? fullScreenPlayerControlsLayout : regularPlayerControlsLayout
}
init(player: PlayerModel, thumbnails: ThumbnailsModel) {
self.player = player
self.thumbnails = thumbnails
}
var body: some View {
ZStack(alignment: .topLeading) {
Seek()
@@ -206,12 +201,12 @@ struct PlayerControls: View {
}
var detailsWidth: Double {
guard let player, player.playerSize.width.isFinite else { return 200 }
guard player.playerSize.width.isFinite else { return 200 }
return [player.playerSize.width, 600].min()!
}
var detailsHeight: Double {
guard let player, player.playerSize.height.isFinite else { return 200 }
guard player.playerSize.height.isFinite else { return 200 }
var inset = 0.0
#if os(iOS)
inset = SafeArea.insets.bottom
@@ -499,7 +494,7 @@ struct PlayerControls_Previews: PreviewProvider {
ZStack {
Color.gray
PlayerControls(player: PlayerModel(), thumbnails: ThumbnailsModel())
PlayerControls()
.injectFixtureEnvironmentObjects()
}
}

6
Shared/Player/Controls/TVControls.swift
View File

@@ -3,8 +3,8 @@ import SwiftUI
struct TVControls: UIViewRepresentable {
var model: PlayerControlsModel!
var player: PlayerModel!
var thumbnails: ThumbnailsModel!
var player: PlayerModel { .shared }
var thumbnails: ThumbnailsModel { .shared }
@State private var direction = ""
@State private var controlsArea = UIView()
@@ -30,7 +30,7 @@ struct TVControls: UIViewRepresentable {
controlsArea.addGestureRecognizer(downSwipe)
controlsArea.addGestureRecognizer(tap)
let controls = UIHostingController(rootView: PlayerControls(player: player, thumbnails: thumbnails))
let controls = UIHostingController(rootView: PlayerControls())
controls.view.frame = .init(
origin: .init(x: SafeArea.insets.left, y: SafeArea.insets.top),
size: .init(

13
Shared/Player/Controls/TimelineView.swift
View File

@@ -45,9 +45,9 @@ struct TimelineView: View {
#endif
@ObservedObject private var playerTime = PlayerTimeModel.shared
@ObservedObject private var player = PlayerModel.shared
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<PlayerControlsModel> private var controls
private var controls = PlayerControlsModel.shared
@Default(.playerControlsLayout) private var regularPlayerControlsLayout
@Default(.fullScreenPlayerControlsLayout) private var fullScreenPlayerControlsLayout
@@ -124,6 +124,8 @@ struct TimelineView: View {
.frame(minWidth: 35)
.padding(.leading, playerControlsLayout.timeLeadingEdgePadding)
.padding(.trailing, playerControlsLayout.timeTrailingEdgePadding)
.modifier(ControlBackgroundModifier())
.clipShape(RoundedRectangle(cornerRadius: 4))
ZStack(alignment: .center) {
ZStack(alignment: .leading) {
@@ -172,6 +174,8 @@ struct TimelineView: View {
.padding(.leading, playerControlsLayout.timeTrailingEdgePadding)
.padding(.trailing, playerControlsLayout.timeLeadingEdgePadding)
.frame(minWidth: 30, alignment: .trailing)
.modifier(ControlBackgroundModifier())
.clipShape(RoundedRectangle(cornerRadius: 4))
}
#if !os(tvOS)
.highPriorityGesture(
@@ -207,8 +211,6 @@ struct TimelineView: View {
}
)
#endif
.modifier(ControlBackgroundModifier())
.clipShape(RoundedRectangle(cornerRadius: 4))
.font(.system(size: playerControlsLayout.timeFontSize).monospacedDigit())
.zIndex(2)
}
@@ -369,14 +371,11 @@ struct TimelineView_Previews: PreviewProvider {
let playerModel = PlayerModel()
playerModel.currentItem = .init(Video.fixture)
let playerTimeModel = PlayerTimeModel.shared
playerTimeModel.player = playerModel
playerTimeModel.currentTime = .secondsInDefaultTimescale(33)
playerTimeModel.duration = .secondsInDefaultTimescale(100)
return VStack(spacing: 40) {
TimelineView()
}
.environmentObject(playerModel)
.environmentObject(PlayerControlsModel())
.padding()
}
}

2
Shared/Player/Controls/VideoDetailsOverlay.swift
View File

@@ -2,7 +2,7 @@ import Defaults
import SwiftUI
struct VideoDetailsOverlay: View {
@EnvironmentObject<PlayerControlsModel> private var controls
@ObservedObject private var controls = PlayerControlsModel.shared
@State private var detailsPage = VideoDetails.DetailsPage.queue

5
Shared/Player/PlayerBackendView.swift
View File

@@ -4,8 +4,7 @@ struct PlayerBackendView: View {
#if os(iOS)
@Environment(\.verticalSizeClass) private var verticalSizeClass
#endif
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<ThumbnailsModel> private var thumbnails
@ObservedObject private var player = PlayerModel.shared
var body: some View {
ZStack(alignment: .top) {
@@ -29,7 +28,7 @@ struct PlayerBackendView: View {
#if !os(tvOS)
PlayerGestures()
PlayerControls(player: player, thumbnails: thumbnails)
PlayerControls()
#if os(iOS)
.padding(.top, controlsTopPadding)
.padding(.bottom, controlsBottomPadding)

4
Shared/Player/PlayerGestures.swift
View File

@@ -1,8 +1,8 @@
import SwiftUI
struct PlayerGestures: View {
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<PlayerControlsModel> private var model
private var player = PlayerModel.shared
@ObservedObject private var model = PlayerControlsModel.shared
var body: some View {
HStack(spacing: 0) {

4
Shared/Player/PlayerLayerView.swift
View File

@@ -8,7 +8,7 @@ import Foundation
#if os(macOS)
final class PlayerLayerView: NSView {
var player: PlayerModel! { didSet {
var player = PlayerModel.shared { didSet {
wantsLayer = true
}}
@@ -26,7 +26,7 @@ import Foundation
}
#else
final class PlayerLayerView: UIView {
var player: PlayerModel!
var player: PlayerModel { .shared }
override init(frame: CGRect) {
super.init(frame: frame)

2
Shared/Player/PlayerQueueRow.swift
View File

@@ -9,7 +9,7 @@ struct PlayerQueueRow: View {
var autoplay = false
@Binding var fullScreen: Bool
@EnvironmentObject<PlayerModel> private var player
private var player = PlayerModel.shared
@Default(.closePiPOnNavigation) var closePiPOnNavigation

5
Shared/Player/RelatedView.swift
View File

@@ -2,10 +2,7 @@ import Defaults
import SwiftUI
struct RelatedView: View {
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<PlaylistsModel> private var playlists
@ObservedObject private var player = PlayerModel.shared
var body: some View {
List {

2
Shared/Player/StreamControl.swift
View File

@@ -9,7 +9,7 @@ struct StreamControl: View {
}
#endif
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var player = PlayerModel.shared
var body: some View {
Group {

2
Shared/Player/Video Details/ChapterView.swift
View File

@@ -5,7 +5,7 @@ import SwiftUI
struct ChapterView: View {
var chapter: Chapter
@EnvironmentObject<PlayerModel> private var player
var player = PlayerModel.shared
var body: some View {
Button {

2
Shared/Player/Video Details/ChaptersView.swift
View File

@@ -3,7 +3,7 @@ import SDWebImageSwiftUI
import SwiftUI
struct ChaptersView: View {
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var player = PlayerModel.shared
var body: some View {
if let chapters = player.currentVideo?.chapters, !chapters.isEmpty {

13
Shared/Player/Video Details/CommentView.swift
View File

@@ -14,11 +14,8 @@ struct CommentView: View {
@Environment(\.colorScheme) private var colorScheme
@Environment(\.navigationStyle) private var navigationStyle
@EnvironmentObject<CommentsModel> private var comments
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<RecentsModel> private var recents
@EnvironmentObject<SubscriptionsModel> private var subscriptions
@ObservedObject private var comments = CommentsModel.shared
var subscriptions = SubscriptionsModel.shared
var body: some View {
VStack(alignment: .leading) {
@@ -252,11 +249,8 @@ struct CommentView: View {
}
private func openChannelAction() {
NavigationModel.openChannel(
NavigationModel.shared.openChannel(
comment.channel,
player: player,
recents: recents,
navigation: navigation,
navigationStyle: navigationStyle
)
}
@@ -269,7 +263,6 @@ struct CommentView_Previews: PreviewProvider {
static var previews: some View {
CommentView(comment: fixture, repliesID: .constant(fixture.id))
.environmentObject(SubscriptionsModel())
.padding(5)
}
}

2
Shared/Player/Video Details/CommentsView.swift
View File

@@ -4,7 +4,7 @@ struct CommentsView: View {
var embedInScrollView = false
@State private var repliesID: Comment.ID?
@EnvironmentObject<CommentsModel> private var comments
@ObservedObject private var comments = CommentsModel.shared
var body: some View {
Group {

2
Shared/Player/Video Details/InspectorView.swift
View File

@@ -3,7 +3,7 @@ import SwiftUI
struct InspectorView: View {
var video: Video?
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var player = PlayerModel.shared
var body: some View {
ScrollView {

5
Shared/Player/Video Details/PlayerQueueView.swift
View File

@@ -9,10 +9,7 @@ struct PlayerQueueView: View {
@FetchRequest(sortDescriptors: [.init(key: "watchedAt", ascending: false)])
var watches: FetchedResults<Watch>
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlaylistsModel> private var playlists
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var player = PlayerModel.shared
@Default(.saveHistory) private var saveHistory

8
Shared/Player/Video Details/VideoActions.swift
View File

@@ -2,10 +2,10 @@ import Defaults
import SwiftUI
struct VideoActions: View {
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<SubscriptionsModel> private var subscriptions
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var accounts = AccountsModel.shared
var navigation = NavigationModel.shared
@ObservedObject private var subscriptions = SubscriptionsModel.shared
@ObservedObject private var player = PlayerModel.shared
var video: Video?

10
Shared/Player/Video Details/VideoDescription.swift
View File

@@ -6,10 +6,7 @@ import Foundation
import SwiftUI
struct VideoDescription: View {
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<RecentsModel> private var recents
@EnvironmentObject<SearchModel> private var search
private var search: SearchModel { .shared }
@Default(.showKeywords) private var showKeywords
var video: Video
@@ -56,7 +53,7 @@ struct VideoDescription: View {
HStack {
ForEach(video.keywords, id: \.self) { keyword in
Button {
NavigationModel.openSearchQuery(keyword, player: player, recents: recents, navigation: navigation, search: search)
NavigationModel.shared.openSearchQuery(keyword)
} label: {
HStack(alignment: .center, spacing: 0) {
Text("#")
@@ -96,7 +93,8 @@ struct VideoDescription: View {
@State private var label = ActiveLabel()
@Environment(\.openURL) private var openURL
@EnvironmentObject<PlayerModel> private var player
var player = PlayerModel.shared
func makeUIView(context _: Context) -> some UIView {
customizeLabel()

10
Shared/Player/Video Details/VideoDetails.swift
View File

@@ -23,12 +23,9 @@ struct VideoDetails: View {
@Environment(\.colorScheme) private var colorScheme
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<CommentsModel> private var comments
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<RecentsModel> private var recents
@EnvironmentObject<SubscriptionsModel> private var subscriptions
@ObservedObject private var accounts = AccountsModel.shared
let comments = CommentsModel.shared
@ObservedObject private var player = PlayerModel.shared
@Default(.enableReturnYouTubeDislike) private var enableReturnYouTubeDislike
@Default(.detailsToolbarPosition) private var detailsToolbarPosition
@@ -148,6 +145,7 @@ struct VideoDetails: View {
}
}
.contentShape(Rectangle())
.frame(maxHeight: .infinity)
}
@State private var detailsSize = CGSize.zero

2
Shared/Player/Video Details/VideoDetailsToolbar.swift
View File

@@ -13,7 +13,7 @@ struct VideoDetailsToolbar: View {
@State private var startedToolPosition: CGRect = .zero
@State private var opacity = 1.0
@EnvironmentObject<PlayerModel> private var player
@ObservedObject private var player = PlayerModel.shared
@Default(.playerDetailsPageButtonLabelStyle) private var playerDetailsPageButtonLabelStyle
var body: some View {

11
Shared/Player/VideoPlayerView.swift
View File

@@ -57,13 +57,10 @@ struct VideoPlayerView: View {
@State internal var orientationNotification: Any?
#endif
@EnvironmentObject<PlayerModel> internal var player
internal var player: PlayerModel! = PlayerModel.shared
#if os(macOS)
@EnvironmentObject<NavigationModel> internal var navigation
@EnvironmentObject<SearchModel> internal var search
#endif
#if os(tvOS)
@EnvironmentObject<ThumbnailsModel> private var thumbnails
@ObservedObject private var navigation = NavigationModel.shared
#endif
@Default(.horizontalPlayerGestureEnabled) var horizontalPlayerGestureEnabled
@@ -482,7 +479,7 @@ struct VideoPlayerView: View {
#if os(tvOS)
var tvControls: some View {
TVControls(player: player, thumbnails: thumbnails)
TVControls()
}
#endif
}