Replace environment objects with observed objects

2025-08-09 20:24:06 +00:00 · 2022-11-24 21:36:05 +01:00
parent 23fa0968c6
commit 0d333b5583
102 changed files with 427 additions and 723 deletions
--- a/Shared/Navigation/AccountsMenuView.swift
+++ b/Shared/Navigation/AccountsMenuView.swift
@@ -2,7 +2,7 @@ import Defaults
 import SwiftUI

 struct AccountsMenuView: View {
-    @EnvironmentObject<AccountsModel> private var model
+    @ObservedObject private var model = AccountsModel.shared

    @Default(.accounts) private var accounts
    @Default(.instances) private var instances
--- a/Shared/Navigation/AppSidebarNavigation.swift
+++ b/Shared/Navigation/AppSidebarNavigation.swift
@@ -5,20 +5,11 @@ import SwiftUI
 #endif

 struct AppSidebarNavigation: View {
-    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<NavigationModel> private var navigation
+    @ObservedObject private var accounts = AccountsModel.shared
+    private var navigation: NavigationModel { .shared }

    #if os(iOS)
        @State private var didApplyPrimaryViewWorkAround = false
-
-        @EnvironmentObject<CommentsModel> private var comments
-        @EnvironmentObject<InstancesModel> private var instances
-        @EnvironmentObject<PlayerModel> private var player
-        @EnvironmentObject<PlaylistsModel> private var playlists
-        @EnvironmentObject<RecentsModel> private var recents
-        @EnvironmentObject<SearchModel> private var search
-        @EnvironmentObject<SubscriptionsModel> private var subscriptions
-        @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
    #endif

    @Default(.showOpenActionsToolbarItem) private var showOpenActionsToolbarItem
--- a/Shared/Navigation/AppSidebarPlaylists.swift
+++ b/Shared/Navigation/AppSidebarPlaylists.swift
@@ -1,9 +1,10 @@
 import SwiftUI

 struct AppSidebarPlaylists: View {
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<PlayerModel> private var player
-    @EnvironmentObject<PlaylistsModel> private var playlists
+    @ObservedObject private var accounts = AccountsModel.shared
+    @ObservedObject private var navigation = NavigationModel.shared
+    private var player = PlayerModel.shared
+    @ObservedObject private var playlists = PlaylistsModel.shared

    var body: some View {
        Section(header: Text("Playlists")) {
@@ -35,7 +36,7 @@ struct AppSidebarPlaylists: View {
    @ViewBuilder func playlistLabel(_ playlist: Playlist) -> some View {
        let label = Label(playlist.title, systemImage: RecentsModel.symbolSystemImage(playlist.title))

-        if player.accounts.app.userPlaylistsEndpointIncludesVideos, !playlist.videos.isEmpty {
+        if accounts.app.userPlaylistsEndpointIncludesVideos, !playlist.videos.isEmpty {
            label
                .backport
                .badge(Text("\(playlist.videos.count)"))
--- a/Shared/Navigation/AppSidebarRecents.swift
+++ b/Shared/Navigation/AppSidebarRecents.swift
@@ -2,7 +2,8 @@ import Defaults
 import SwiftUI

 struct AppSidebarRecents: View {
-    @EnvironmentObject<RecentsModel> private var recents
+    @ObservedObject private var navigation = NavigationModel.shared
+    var recents = RecentsModel.shared

    @Default(.recentlyOpened) private var recentItems

@@ -47,8 +48,8 @@ struct AppSidebarRecents: View {
 }

 struct RecentNavigationLink<DestinationContent: View>: View {
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<RecentsModel> private var recents
+    var recents = RecentsModel.shared
+    @ObservedObject private var navigation = NavigationModel.shared

    var recent: RecentItem
    var systemImage: String?
--- a/Shared/Navigation/AppSidebarSubscriptions.swift
+++ b/Shared/Navigation/AppSidebarSubscriptions.swift
@@ -2,8 +2,8 @@ import Defaults
 import SwiftUI

 struct AppSidebarSubscriptions: View {
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<SubscriptionsModel> private var subscriptions
+    @ObservedObject private var navigation = NavigationModel.shared
+    @ObservedObject private var subscriptions = SubscriptionsModel.shared

    var body: some View {
        Section(header: Text("Subscriptions")) {
--- a/Shared/Navigation/AppTabNavigation.swift
+++ b/Shared/Navigation/AppTabNavigation.swift
@@ -2,16 +2,10 @@ import Defaults
 import SwiftUI

 struct AppTabNavigation: View {
-    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<CommentsModel> private var comments
-    @EnvironmentObject<InstancesModel> private var instances
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<PlayerModel> private var player
-    @EnvironmentObject<PlaylistsModel> private var playlists
-    @EnvironmentObject<RecentsModel> private var recents
-    @EnvironmentObject<SearchModel> private var search
-    @EnvironmentObject<SubscriptionsModel> private var subscriptions
-    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
+    @ObservedObject private var accounts = AccountsModel.shared
+    @ObservedObject private var navigation = NavigationModel.shared
+    private var player = PlayerModel.shared
+    @ObservedObject private var subscriptions = SubscriptionsModel.shared

    @Default(.showHome) private var showHome
    @Default(.showDocuments) private var showDocuments
@@ -187,11 +181,6 @@ struct AppTabNavigation: View {
                .environment(\.managedObjectContext, persistenceController.container.viewContext)
                .environment(\.inChannelView, true)
                .environment(\.navigationStyle, .tab)
-                .environmentObject(accounts)
-                .environmentObject(navigation)
-                .environmentObject(player)
-                .environmentObject(subscriptions)
-                .environmentObject(thumbnailsModel)
                .id("channelVideos")
                .zIndex(player.presentingPlayer ? -1 : 2)
                .transition(.move(edge: .bottom))
@@ -202,11 +191,6 @@ struct AppTabNavigation: View {
        if navigation.presentingPlaylist {
            ChannelPlaylistView()
                .environment(\.managedObjectContext, persistenceController.container.viewContext)
-                .environmentObject(accounts)
-                .environmentObject(navigation)
-                .environmentObject(player)
-                .environmentObject(subscriptions)
-                .environmentObject(thumbnailsModel)
                .id("channelPlaylist")
                .zIndex(player.presentingPlayer ? -1 : 1)
                .transition(.move(edge: .bottom))
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -8,19 +8,11 @@ import Siesta
 import SwiftUI

 struct ContentView: View {
-    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<CommentsModel> private var comments
-    @EnvironmentObject<InstancesModel> private var instances
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<PlayerModel> private var player
-    @EnvironmentObject<PlaylistsModel> private var playlists
-    @EnvironmentObject<RecentsModel> private var recents
-    @EnvironmentObject<SearchModel> private var search
-    @EnvironmentObject<SettingsModel> private var settings
-    @EnvironmentObject<SubscriptionsModel> private var subscriptions
-    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel
-
-    @EnvironmentObject<MenuModel> private var menu
+    @ObservedObject private var accounts = AccountsModel.shared
+    @ObservedObject private var navigation = NavigationModel.shared
+    @ObservedObject private var player = PlayerModel.shared
+    private var playlists = PlaylistsModel.shared
+    private var subscriptions = SubscriptionsModel.shared

    #if os(iOS)
        @Environment(\.horizontalSizeClass) private var horizontalSizeClass
@@ -44,7 +36,6 @@ struct ContentView: View {
                AppSidebarNavigation()
            #elseif os(tvOS)
                TVNavigationView()
-                    .environmentObject(settings)
            #endif
        }
        .onChange(of: accounts.current) { _ in
@@ -55,99 +46,74 @@ struct ContentView: View {
            subscriptions.load(force: true)
            playlists.load(force: true)
        }
-        .environmentObject(accounts)
-        .environmentObject(comments)
-        .environmentObject(instances)
-        .environmentObject(navigation)
-        .environmentObject(player)
-        .environmentObject(playlists)
-        .environmentObject(recents)
-        .environmentObject(search)
-        .environmentObject(subscriptions)
-        .environmentObject(thumbnailsModel)

        #if os(iOS)
-            .overlay(videoPlayer)
-            .sheet(isPresented: $navigation.presentingShareSheet) {
-                if let shareURL = navigation.shareURL {
-                    ShareSheet(activityItems: [shareURL])
-                }
+        .overlay(videoPlayer)
+        .sheet(isPresented: $navigation.presentingShareSheet) {
+            if let shareURL = navigation.shareURL {
+                ShareSheet(activityItems: [shareURL])
            }
+        }
        #endif

-            // iOS 14 has problem with multiple sheets in one view
-            // but it's ok when it's in background
-            .background(
-                EmptyView().sheet(isPresented: $navigation.presentingWelcomeScreen) {
-                    WelcomeScreen()
-                        .environmentObject(accounts)
-                        .environmentObject(navigation)
-                }
-            )
-            .background(
-                EmptyView().sheet(isPresented: $navigation.presentingSettings) {
-                    SettingsView()
-                        .environmentObject(accounts)
-                        .environmentObject(instances)
-                        .environmentObject(settings)
-                        .environmentObject(navigation)
-                        .environmentObject(player)
-                }
-            )
+        // iOS 14 has problem with multiple sheets in one view
+        // but it's ok when it's in background
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingWelcomeScreen) {
+                WelcomeScreen()
+            }
+        )
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingSettings) {
+                SettingsView()
+            }
+        )
        #if !os(tvOS)
-            .fileImporter(
-                isPresented: $navigation.presentingFileImporter,
-                allowedContentTypes: [.audiovisualContent],
-                allowsMultipleSelection: true
-            ) { result in
-                do {
-                    let selectedFiles = try result.get()
-                    let urlsToOpen = selectedFiles.map { url in
-                        if let bookmarkURL = URLBookmarkModel.shared.loadBookmark(url) {
-                            return bookmarkURL
-                        }
-
-                        if url.startAccessingSecurityScopedResource() {
-                            URLBookmarkModel.shared.saveBookmark(url)
-                        }
-
-                        return url
+        .fileImporter(
+            isPresented: $navigation.presentingFileImporter,
+            allowedContentTypes: [.audiovisualContent],
+            allowsMultipleSelection: true
+        ) { result in
+            do {
+                let selectedFiles = try result.get()
+                let urlsToOpen = selectedFiles.map { url in
+                    if let bookmarkURL = URLBookmarkModel.shared.loadBookmark(url) {
+                        return bookmarkURL
                    }

-                    OpenVideosModel.shared.openURLs(urlsToOpen)
-                } catch {
-                    NavigationModel.shared.presentAlert(title: "Could not open Files")
+                    if url.startAccessingSecurityScopedResource() {
+                        URLBookmarkModel.shared.saveBookmark(url)
+                    }
+
+                    return url
                }

-                NavigationModel.shared.presentingOpenVideos = false
+                OpenVideosModel.shared.openURLs(urlsToOpen)
+            } catch {
+                NavigationModel.shared.presentAlert(title: "Could not open Files")
            }
-            .onOpenURL(perform: OpenURLHandler.shared.handle)
-            .background(
-                EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
-                    AddToPlaylistView(video: navigation.videoToAddToPlaylist)
-                        .environmentObject(playlists)
-                }
-            )
-            .background(
-                EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
-                    PlaylistFormView(playlist: $navigation.editedPlaylist)
-                        .environmentObject(accounts)
-                        .environmentObject(playlists)
-                }
-            )
+
+            NavigationModel.shared.presentingOpenVideos = false
+        }
+        .onOpenURL(perform: OpenURLHandler.shared.handle)
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
+                AddToPlaylistView(video: navigation.videoToAddToPlaylist)
+            }
+        )
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
+                PlaylistFormView(playlist: $navigation.editedPlaylist)
+            }
+        )
        #endif
-            .background(
-                EmptyView().sheet(isPresented: $navigation.presentingOpenVideos) {
-                    OpenVideosView()
-                        .environmentObject(accounts)
-                        .environmentObject(navigation)
-                        .environmentObject(player)
-                        .environmentObject(recents)
-                        .environmentObject(search)
-                }
-            )
-            .background(playerViewInitialize)
-            .alert(isPresented: $navigation.presentingAlert) { navigation.alert }
+        .background(
+            EmptyView().sheet(isPresented: $navigation.presentingOpenVideos) {
+                OpenVideosView()
+            }
+        )
+        .background(playerViewInitialize)
+        .alert(isPresented: $navigation.presentingAlert) { navigation.alert }
    }

    var navigationStyle: NavigationStyle {
@@ -174,16 +140,6 @@ struct ContentView: View {

    var playerView: some View {
        VideoPlayerView()
-            .environmentObject(accounts)
-            .environmentObject(comments)
-            .environmentObject(instances)
-            .environmentObject(navigation)
-            .environmentObject(player)
-            .environmentObject(playerControls)
-            .environmentObject(playlists)
-            .environmentObject(recents)
-            .environmentObject(subscriptions)
-            .environmentObject(thumbnailsModel)
            .environment(\.navigationStyle, navigationStyle)
    }

--- a/Shared/Navigation/Sidebar.swift
+++ b/Shared/Navigation/Sidebar.swift
@@ -2,8 +2,8 @@ import Defaults
 import SwiftUI

 struct Sidebar: View {
-    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<NavigationModel> private var navigation
+    @ObservedObject private var accounts = AccountsModel.shared
+    @ObservedObject private var navigation = NavigationModel.shared

    @Default(.showHome) private var showHome
    @Default(.visibleSections) private var visibleSections