Settings for iOS/macOS

tvOS/AddToPlaylistView.swift

@@ -3,7 +3,7 @@ import Siesta
 import SwiftUI
 
 struct AddToPlaylistView: View {
-    @ObservedObject private var store = Store<[Playlist]>()
+    @StateObject private var store = Store<[Playlist]>()
 
     @State private var selectedPlaylist: Playlist?
 
@@ -11,8 +11,10 @@ struct AddToPlaylistView: View {
 
     @Environment(\.dismiss) private var dismiss
 
+    @EnvironmentObject<InvidiousAPI> private var api
+
     var resource: Resource {
-        InvidiousAPI.shared.playlists
+        api.playlists
     }
 
     init() {
@@ -85,12 +87,12 @@ struct AddToPlaylistView: View {
             return
         }
 
-        let resource = InvidiousAPI.shared.playlistVideos(currentPlaylist!.id)
+        let resource = api.playlistVideos(currentPlaylist!.id)
         let body = ["videoId": videoID]
 
         resource.request(.post, json: body).onSuccess { _ in
             Defaults.reset(.videoIDToAddToPlaylist)
-            InvidiousAPI.shared.playlists.load()
+            api.playlists.load()
             dismiss()
         }
     }

tvOS/Options/OptionsView.swift

@@ -2,7 +2,7 @@ import Defaults
 import SwiftUI
 
 struct OptionsView: View {
-    @EnvironmentObject<NavigationState> private var navigationState
+    @EnvironmentObject<NavigationModel> private var navigation
 
     @Default(.layout) private var layout
 
@@ -28,6 +28,8 @@ struct OptionsView: View {
                         }
 
                         Spacer()
+
+                        SettingsView()
                     }
                     .frame(maxWidth: 800)
 
@@ -42,7 +44,7 @@ struct OptionsView: View {
 
     var tabSelectionOptions: some View {
         VStack {
-            switch navigationState.tabSelection {
+            switch navigation.tabSelection {
             case .search:
                 SearchOptionsView()
 

tvOS/TVNavigationView.swift

@@ -2,17 +2,17 @@ import Defaults
 import SwiftUI
 
 struct TVNavigationView: View {
-    @EnvironmentObject<NavigationState> private var navigationState
-    @EnvironmentObject<PlaybackState> private var playbackState
+    @EnvironmentObject<NavigationModel> private var navigation
+    @EnvironmentObject<PlaybackModel> private var playback
     @EnvironmentObject<Recents> private var recents
-    @EnvironmentObject<SearchState> private var searchState
+    @EnvironmentObject<SearchModel> private var search
 
     @State private var showingOptions = false
 
     @Default(.showingAddToPlaylist) var showingAddToPlaylist
 
     var body: some View {
-        TabView(selection: $navigationState.tabSelection) {
+        TabView(selection: $navigation.tabSelection) {
             WatchNowView()
                 .tabItem { Text("Watch Now") }
                 .tag(TabSelection.watchNow)
@@ -34,30 +34,30 @@ struct TVNavigationView: View {
                 .tag(TabSelection.playlists)
 
             SearchView()
-                .searchable(text: $searchState.queryText) {
-                    ForEach(searchState.querySuggestions.collection, id: \.self) { suggestion in
+                .searchable(text: $search.queryText) {
+                    ForEach(search.querySuggestions.collection, id: \.self) { suggestion in
                         Text(suggestion)
                             .searchCompletion(suggestion)
                     }
                 }
-                .onChange(of: searchState.queryText) { newQuery in
-                    searchState.loadQuerySuggestions(newQuery)
-                    searchState.changeQuery { query in query.query = newQuery }
+                .onChange(of: search.queryText) { newQuery in
+                    search.loadSuggestions(newQuery)
+                    search.changeQuery { query in query.query = newQuery }
                 }
                 .tabItem { Image(systemName: "magnifyingglass") }
                 .tag(TabSelection.search)
         }
         .fullScreenCover(isPresented: $showingOptions) { OptionsView() }
         .fullScreenCover(isPresented: $showingAddToPlaylist) { AddToPlaylistView() }
-        .fullScreenCover(isPresented: $navigationState.showingVideo) {
-            if let video = navigationState.video {
+        .fullScreenCover(isPresented: $navigation.showingVideo) {
+            if let video = navigation.video {
                 VideoPlayerView(video)
-                    .environmentObject(playbackState)
+                    .environmentObject(playback)
             }
         }
-        .fullScreenCover(isPresented: $navigationState.isChannelOpen) {
+        .fullScreenCover(isPresented: $navigation.isChannelOpen) {
             if let channel = recents.presentedChannel {
-                ChannelVideosView(channel)
+                ChannelVideosView(channel: channel)
                     .background(.thickMaterial)
             }
         }