Improve sections visibility

Model/Accounts/AccountsModel.swift

@@ -49,10 +49,6 @@ final class AccountsModel: ObservableObject {
         !isEmpty && !current.anonymous && api.signedIn
     }
 
-    var isDemo: Bool {
-        false
-    }
-
     init() {
         cancellables.append(
             invidious.objectWillChange.sink { [weak self] _ in self?.objectWillChange.send() }
@@ -80,6 +76,7 @@ final class AccountsModel: ObservableObject {
         current = account
 
         guard !account.isNil else {
+            current = nil
             return
         }
 

Shared/Navigation/AppTabNavigation.swift

@@ -39,7 +39,9 @@ struct AppTabNavigation: View {
                 playlistsNavigationView
             }
 
-            searchNavigationView
+            if !accounts.isEmpty {
+                searchNavigationView
+            }
         }
         .id(accounts.current?.id ?? "")
         .overlay(playlistView)

Shared/Navigation/Sidebar.swift

@@ -73,12 +73,14 @@ struct Sidebar: View {
                 .id("trending")
             }
 
-            NavigationLink(destination: LazyView(SearchView()), tag: TabSelection.search, selection: $navigation.tabSelection) {
+            if !accounts.isEmpty {
-                Label("Search", systemImage: "magnifyingglass")
+                NavigationLink(destination: LazyView(SearchView()), tag: TabSelection.search, selection: $navigation.tabSelection) {
-                    .accessibility(label: Text("Search"))
+                    Label("Search", systemImage: "magnifyingglass")
+                        .accessibility(label: Text("Search"))
+                }
+                .id("search")
+                .keyboardShortcut("f")
             }
-            .id("search")
-            .keyboardShortcut("f")
         }
     }
 

Shared/Settings/AdvancedSettings.swift

@@ -46,6 +46,10 @@ struct AdvancedSettings: View {
             InstancesManifest.shared.setPublicAccount(newCountry, accounts: accounts, asCurrent: accounts.current?.isPublic ?? true)
         }
         .onChange(of: instancesManifest) { _ in
+            countryOfPublicInstances = nil
+            if let account = accounts.current, account.isPublic {
+                accounts.setCurrent(nil)
+            }
             countries.removeAll()
         }
         .sheet(isPresented: $presentingInstanceForm) {

Shared/Settings/PlayerSettings.swift

@@ -62,7 +62,9 @@ struct PlayerSettings: View {
     private var sections: some View {
         Group {
             Section(header: SettingsHeader(text: "Playback".localized())) {
-                sourcePicker
+                if !accounts.isEmpty {
+                    sourcePicker
+                }
                 pauseOnHidingPlayerToggle
                 #if !os(macOS)
                     pauseOnEnteringBackgroundToogle
@@ -97,9 +99,8 @@ struct PlayerSettings: View {
                     sidebarPicker
                 #endif
 
-                keywordsToggle
+                if !accounts.isEmpty {
-
+                    keywordsToggle
-                if !accounts.isDemo {
                     returnYouTubeDislikeToggle
                 }
             }

Shared/Settings/SettingsView.swift

@@ -10,7 +10,7 @@ struct SettingsView: View {
             case browsing, player, quality, history, sponsorBlock, advanced, help
         }
 
-        @State private var selection = Tabs.browsing
+        @State private var selection: Tabs?
     #endif
 
     @Environment(\.colorScheme) private var colorScheme
@@ -34,13 +34,15 @@ struct SettingsView: View {
     var settings: some View {
         #if os(macOS)
             TabView(selection: $selection) {
-                Form {
+                if !accounts.isEmpty {
-                    BrowsingSettings()
+                    Form {
+                        BrowsingSettings()
+                    }
+                    .tabItem {
+                        Label("Browsing", systemImage: "list.and.film")
+                    }
+                    .tag(Optional(Tabs.browsing))
                 }
-                .tabItem {
-                    Label("Browsing", systemImage: "list.and.film")
-                }
-                .tag(Tabs.browsing)
 
                 Form {
                     PlayerSettings()
@@ -48,7 +50,7 @@ struct SettingsView: View {
                 .tabItem {
                     Label("Player", systemImage: "play.rectangle")
                 }
-                .tag(Tabs.player)
+                .tag(Optional(Tabs.player))
 
                 Form {
                     QualitySettings()
@@ -56,7 +58,7 @@ struct SettingsView: View {
                 .tabItem {
                     Label("Quality", systemImage: "4k.tv")
                 }
-                .tag(Tabs.quality)
+                .tag(Optional(Tabs.quality))
 
                 Form {
                     HistorySettings()
@@ -64,15 +66,17 @@ struct SettingsView: View {
                 .tabItem {
                     Label("History", systemImage: "clock.arrow.circlepath")
                 }
-                .tag(Tabs.history)
+                .tag(Optional(Tabs.history))
 
-                Form {
+                if !accounts.isEmpty {
-                    SponsorBlockSettings()
+                    Form {
+                        SponsorBlockSettings()
+                    }
+                    .tabItem {
+                        Label("SponsorBlock", systemImage: "dollarsign.circle")
+                    }
+                    .tag(Optional(Tabs.sponsorBlock))
                 }
-                .tabItem {
-                    Label("SponsorBlock", systemImage: "dollarsign.circle")
-                }
-                .tag(Tabs.sponsorBlock)
 
                 Group {
                     AdvancedSettings()
@@ -80,7 +84,7 @@ struct SettingsView: View {
                 .tabItem {
                     Label("Advanced", systemImage: "wrench.and.screwdriver")
                 }
-                .tag(Tabs.advanced)
+                .tag(Optional(Tabs.advanced))
 
                 Form {
                     Help()
@@ -88,7 +92,7 @@ struct SettingsView: View {
                 .tabItem {
                     Label("Help", systemImage: "questionmark.circle")
                 }
-                .tag(Tabs.help)
+                .tag(Optional(Tabs.help))
             }
             .padding(20)
             .frame(width: 600, height: windowHeight)
@@ -106,8 +110,10 @@ struct SettingsView: View {
         var settingsList: some View {
             List {
                 #if os(tvOS)
-                    AccountSelectionView()
+                    if !accounts.isEmpty {
-                    Divider()
+                        AccountSelectionView()
+                        Divider()
+                    }
                 #endif
 
                 Section {
@@ -119,10 +125,12 @@ struct SettingsView: View {
                         }
                     #endif
 
-                    NavigationLink {
+                    if !accounts.isEmpty {
-                        BrowsingSettings()
+                        NavigationLink {
-                    } label: {
+                            BrowsingSettings()
-                        Label("Browsing", systemImage: "list.and.film")
+                        } label: {
+                            Label("Browsing", systemImage: "list.and.film")
+                        }
                     }
 
                     NavigationLink {
@@ -143,10 +151,12 @@ struct SettingsView: View {
                         Label("History", systemImage: "clock.arrow.circlepath")
                     }
 
-                    NavigationLink {
+                    if !accounts.isEmpty {
-                        SponsorBlockSettings()
+                        NavigationLink {
-                    } label: {
+                            SponsorBlockSettings()
-                        Label("SponsorBlock", systemImage: "dollarsign.circle")
+                        } label: {
+                            Label("SponsorBlock", systemImage: "dollarsign.circle")
+                        }
                     }
 
                     NavigationLink {
@@ -210,6 +220,8 @@ struct SettingsView: View {
     #if os(macOS)
         private var windowHeight: Double {
             switch selection {
+            case nil:
+                return accounts.isEmpty ? 680 : 400
             case .browsing:
                 return 400
             case .player:

Shared/Views/ShareButton.swift

@@ -19,7 +19,7 @@ struct ShareButton: View {
                 } else {
                     instanceActions
                     Divider()
-                    if !accounts.isDemo {
+                    if !accounts.isEmpty {
                         youtubeActions
                     }
                 }

macOS/InstancesSettings.swift

@@ -35,7 +35,7 @@ struct InstancesSettings: View {
                 Spacer()
             }
 
-            if !selectedInstance.isNil, selectedInstance.app.supportsAccounts, !accounts.isDemo {
+            if !selectedInstance.isNil, selectedInstance.app.supportsAccounts {
                 SettingsHeader(text: "Accounts".localized())
 
                 let list = List(selection: $selectedAccount) {
@@ -114,13 +114,11 @@ struct InstancesSettings: View {
 
             if selectedInstance != nil {
                 HStack {
-                    if !accounts.isDemo {
+                    Button("Add Account...") {
-                        Button("Add Account...") {
+                        selectedAccount = nil
-                            selectedAccount = nil
+                        presentingAccountForm = true
-                            presentingAccountForm = true
-                        }
-                        .disabled(!selectedInstance.app.supportsAccounts)
                     }
+                    .disabled(!selectedInstance.app.supportsAccounts)
 
                     Spacer()
 

tvOS/TVNavigationView.swift

@@ -47,9 +47,11 @@ struct TVNavigationView: View {
                     .tabItem { Text("Now Playing") }
                     .tag(TabSelection.nowPlaying)
 
-                LazyView(SearchView())
+                if !accounts.isEmpty {
-                    .tabItem { Image(systemName: "magnifyingglass") }
+                    LazyView(SearchView())
-                    .tag(TabSelection.search)
+                        .tabItem { Image(systemName: "magnifyingglass") }
+                        .tag(TabSelection.search)
+                }
 
                 LazyView(SettingsView())
                     .tabItem { Image(systemName: "gear") }