Add settings to tvOS tab menu (fix #119)

Model/NavigationModel.swift

@@ -13,6 +13,9 @@ final class NavigationModel: ObservableObject {
         case recentlyOpened(String)
         case nowPlaying
         case search
+        #if os(tvOS)
+            case settings
+        #endif
 
         var stringValue: String {
             switch self {
@@ -34,6 +37,10 @@ final class NavigationModel: ObservableObject {
                 return "recentlyOpened"
             case .search:
                 return "search"
+            #if os(tvOS)
+                case .settings: // swiftlint:disable:this switch_case_alignment
+                    return "settings"
+            #endif
             default:
                 return ""
             }

Shared/Settings/SettingsView.swift

@@ -78,8 +78,24 @@ struct SettingsView: View {
             }
             .padding(20)
             .frame(width: 480, height: windowHeight)
+        #else
+            Group {
+                #if os(tvOS)
+                    settingsList
                 #else
                     NavigationView {
+                        settingsList
+                    }
+                #endif
+            }
+            .sheet(isPresented: $presentingInstanceForm) {
+                InstanceForm(savedInstanceID: $savedFormInstanceID)
+            }
+        #endif
+    }
+
+    #if !os(macOS)
+        var settingsList: some View {
             List {
                 #if os(tvOS)
                     AccountSelectionView()
@@ -154,14 +170,7 @@ struct SettingsView: View {
                 .listStyle(.insetGrouped)
             #endif
         }
-            .sheet(isPresented: $presentingInstanceForm) {
-                InstanceForm(savedInstanceID: $savedFormInstanceID)
-            }
-            #if os(tvOS)
-            .background(Color.background(scheme: colorScheme))
     #endif
-        #endif
-    }
 
     #if os(macOS)
         private var windowHeight: Double {

tvOS/TVNavigationView.swift

@@ -10,6 +10,7 @@ struct TVNavigationView: View {
     @Default(.visibleSections) private var visibleSections
 
     var body: some View {
+        NavigationView {
             TabView(selection: navigation.tabSelectionBinding) {
                 if visibleSections.contains(.favorites) {
                     FavoritesView()
@@ -48,6 +49,12 @@ struct TVNavigationView: View {
                 SearchView()
                     .tabItem { Image(systemName: "magnifyingglass") }
                     .tag(TabSelection.search)
+
+                SettingsView()
+                    .navigationBarHidden(true)
+                    .tabItem { Image(systemName: "gear") }
+                    .tag(TabSelection.settings)
+            }
         }
         .fullScreenCover(isPresented: $navigation.presentingSettings) { SettingsView() }
         .fullScreenCover(isPresented: $navigation.presentingAddToPlaylist) {
@@ -68,7 +75,6 @@ struct TVNavigationView: View {
                 ChannelPlaylistView(playlist: playlist)
             }
         }
-        .onPlayPauseCommand { navigation.presentingSettings.toggle() }
     }
 }