diff --git a/Fixtures/View+Fixtures.swift b/Fixtures/View+Fixtures.swift index 03bc4b74..5a69bc78 100644 --- a/Fixtures/View+Fixtures.swift +++ b/Fixtures/View+Fixtures.swift @@ -18,6 +18,7 @@ struct FixtureEnvironmentObjectsModifier: ViewModifier { .environmentObject(PlaylistsModel()) .environmentObject(RecentsModel()) .environmentObject(SearchModel()) + .environmentObject(SettingsModel()) .environmentObject(subscriptions) .environmentObject(ThumbnailsModel()) } diff --git a/Shared/Settings/SettingsView.swift b/Shared/Settings/SettingsView.swift index b483b1d1..57252d00 100644 --- a/Shared/Settings/SettingsView.swift +++ b/Shared/Settings/SettingsView.swift @@ -5,10 +5,10 @@ import SwiftUI struct SettingsView: View { #if os(macOS) private enum Tabs: Hashable { - case browsing, player, history, sponsorBlock, locations, advanced, help + case locations, browsing, player, history, sponsorBlock, advanced, help } - @State private var selection = Tabs.browsing + @State private var selection = Tabs.locations #endif @Environment(\.colorScheme) private var colorScheme @@ -32,6 +32,14 @@ struct SettingsView: View { var settings: some View { #if os(macOS) TabView(selection: $selection) { + Form { + LocationsSettings() + } + .tabItem { + Label("Locations", systemImage: "globe") + } + .tag(Tabs.locations) + Form { BrowsingSettings() } @@ -64,14 +72,6 @@ struct SettingsView: View { } .tag(Tabs.sponsorBlock) - Form { - LocationsSettings() - } - .tabItem { - Label("Locations", systemImage: "globe") - } - .tag(Tabs.locations) - Group { AdvancedSettings() } @@ -121,6 +121,12 @@ struct SettingsView: View { } #endif + NavigationLink { + LocationsSettings() + } label: { + Label("Locations", systemImage: "globe") + } + NavigationLink { BrowsingSettings() } label: { @@ -145,12 +151,6 @@ struct SettingsView: View { Label("SponsorBlock", systemImage: "dollarsign.circle") } - NavigationLink { - LocationsSettings() - } label: { - Label("Locations", systemImage: "globe") - } - NavigationLink { AdvancedSettings() } label: {