Replace environment objects with observed objects

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

View File

@@ -5,7 +5,7 @@ import SwiftUI
struct AccountSelectionView: View {
var showHeader = true
@EnvironmentObject<AccountsModel> private var accountsModel
@ObservedObject private var accountsModel = AccountsModel.shared
@Default(.accounts) private var accounts
@Default(.instances) private var instances

View File

@@ -15,9 +15,8 @@ struct NowPlayingView: View {
@FetchRequest(sortDescriptors: [.init(key: "watchedAt", ascending: false)])
var watches: FetchedResults<Watch>
@EnvironmentObject<CommentsModel> private var comments
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<RecentsModel> private var recents
@ObservedObject private var comments = CommentsModel.shared
@ObservedObject private var player = PlayerModel.shared
@Default(.saveHistory) private var saveHistory

View File

@@ -2,11 +2,10 @@ import Defaults
import SwiftUI
struct TVNavigationView: View {
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<NavigationModel> private var navigation
@EnvironmentObject<PlayerModel> private var player
@EnvironmentObject<RecentsModel> private var recents
@EnvironmentObject<SettingsModel> private var settings
@ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var navigation = NavigationModel.shared
@ObservedObject private var player = PlayerModel.shared
@ObservedObject private var recents = RecentsModel.shared
@Default(.visibleSections) private var visibleSections