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

5
Shared/Playlists/AddToPlaylistView.swift
View File

@@ -13,8 +13,7 @@ struct AddToPlaylistView: View {
@Environment(\.colorScheme) private var colorScheme
@Environment(\.presentationMode) private var presentationMode
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlaylistsModel> private var model
@ObservedObject private var model = PlaylistsModel.shared
var body: some View {
Group {
@@ -164,7 +163,7 @@ struct AddToPlaylistView: View {
Defaults[.lastUsedPlaylistID] = id
model.addVideo(playlistID: id, videoID: video.videoID, navigation: navigation)
model.addVideo(playlistID: id, videoID: video.videoID)
presentationMode.wrappedValue.dismiss()
}

4
Shared/Playlists/PlaylistFormView.swift
View File

@@ -16,8 +16,8 @@ struct PlaylistFormView: View {
@Environment(\.colorScheme) private var colorScheme
@Environment(\.presentationMode) private var presentationMode
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<PlaylistsModel> private var playlists
@ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var playlists = PlaylistsModel.shared
var editing: Bool {
playlist != nil

16
Shared/Playlists/PlaylistsView.swift
View File

@@ -14,9 +14,9 @@ struct PlaylistsView: View {
@StateObject private var channelPlaylist = Store<ChannelPlaylist>()
@StateObject private var userPlaylist = Store<Playlist>()
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<PlaylistsModel> private var model
@ObservedObject private var accounts = AccountsModel.shared
private var player = PlayerModel.shared
@ObservedObject private var model = PlaylistsModel.shared
@Namespace private var focusNamespace
@@ -26,7 +26,7 @@ struct PlaylistsView: View {
if videos.isEmpty {
videos = userPlaylist.item?.videos ?? channelPlaylist.item?.videos ?? []
if !player.accounts.app.userPlaylistsEndpointIncludesVideos {
if !accounts.app.userPlaylistsEndpointIncludesVideos {
var i = 0
for index in videos.indices {
@@ -44,9 +44,9 @@ struct PlaylistsView: View {
private var resource: Resource? {
guard let playlist = currentPlaylist else { return nil }
let resource = player.accounts.api.playlist(playlist.id)
let resource = accounts.api.playlist(playlist.id)
if player.accounts.app.userPlaylistsUseChannelPlaylistEndpoint {
if accounts.app.userPlaylistsUseChannelPlaylistEndpoint {
resource?.addObserver(channelPlaylist)
} else {
resource?.addObserver(userPlaylist)
@@ -150,11 +150,9 @@ struct PlaylistsView: View {
#if os(tvOS)
.fullScreenCover(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
PlaylistFormView(playlist: $createdPlaylist)
.environmentObject(accounts)
}
.fullScreenCover(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
PlaylistFormView(playlist: $editedPlaylist)
.environmentObject(accounts)
}
.focusScope(focusNamespace)
#else
@@ -162,14 +160,12 @@ struct PlaylistsView: View {
EmptyView()
.sheet(isPresented: $showingNewPlaylist, onDismiss: selectCreatedPlaylist) {
PlaylistFormView(playlist: $createdPlaylist)
.environmentObject(accounts)
}
)
.background(
EmptyView()
.sheet(isPresented: $showingEditPlaylist, onDismiss: selectEditedPlaylist) {
PlaylistFormView(playlist: $editedPlaylist)
.environmentObject(accounts)
}
)
#endif