Reorganize locations settings

2025-08-04 01:34:10 +00:00 · 2022-11-11 19:55:18 +01:00
parent 611bcde238
commit 4c2d473caa
5 changed files with 110 additions and 159 deletions
--- a/Shared/Settings/AdvancedSettings.swift
+++ b/Shared/Settings/AdvancedSettings.swift
@@ -7,20 +7,30 @@ struct AdvancedSettings: View {
    @Default(.mpvCacheSecs) private var mpvCacheSecs
    @Default(.mpvCachePauseWait) private var mpvCachePauseWait
    @Default(.mpvEnableLogging) private var mpvEnableLogging
+    @Default(.countryOfPublicInstances) private var countryOfPublicInstances
+    @Default(.instances) private var instances

+    @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<NavigationModel> private var navigation
    @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<SettingsModel> private var settings

-    @State private var presentingShareSheet = false
+    @State private var countries = [String]()
    @State private var filesToShare = [MPVClient.logFile]
+    @State private var presentingInstanceForm = false
+    @State private var presentingShareSheet = false
+    @State private var savedFormInstanceID: Instance.ID?

    var body: some View {
        VStack(alignment: .leading) {
            #if os(macOS)
                advancedSettings
+                locationsSettings
                Spacer()
            #else
                List {
                    advancedSettings
+                    locationsSettings
                }
                #if os(iOS)
                .sheet(isPresented: $presentingShareSheet) {
@@ -31,6 +41,16 @@ struct AdvancedSettings: View {
                #endif
            #endif
        }
+        .onAppear(perform: loadCountries)
+        .onChange(of: countryOfPublicInstances) { newCountry in
+            InstancesManifest.shared.setPublicAccount(newCountry, accounts: accounts, asCurrent: accounts.current?.isPublic ?? true)
+        }
+        .onChange(of: instancesManifest) { _ in
+            countries.removeAll()
+        }
+        .sheet(isPresented: $presentingInstanceForm) {
+            InstanceForm(savedInstanceID: $savedFormInstanceID)
+        }
        #if os(tvOS)
        .frame(maxWidth: 1000)
        #endif
@@ -82,6 +102,8 @@ struct AdvancedSettings: View {

        Section(header: manifestHeader) {
            TextField("URL", text: $instancesManifest)
+            Button("Reload manifest", action: loadCountries)
+                .disabled(instancesManifest.isEmpty)
            #if !os(macOS)
                .keyboardType(.webSearch)
            #endif
@@ -112,7 +134,7 @@ struct AdvancedSettings: View {
    }

    var manifestHeader: some View {
-        SettingsHeader(text: "Public Manifest".localized())
+        SettingsHeader(text: "Locations Manifest".localized())
    }

    var showMPVPlaybackStatsToggle: some View {
@@ -132,10 +154,85 @@ struct AdvancedSettings: View {
            }
        }
    #endif
+
+    @ViewBuilder var locationsSettings: some View {
+        if !InstancesManifest.shared.manifestURL.isNil, !countries.isEmpty {
+            Section(header: SettingsHeader(text: "Public Locations".localized()), footer: countryFooter) {
+                Picker("Country", selection: $countryOfPublicInstances) {
+                    Text("Don't use public locations").tag(String?.none)
+                    ForEach(countries, id: \.self) { country in
+                        Text(country).tag(Optional(country))
+                    }
+                }
+                #if os(tvOS)
+                .pickerStyle(.inline)
+                #endif
+                .disabled(countries.isEmpty)
+
+                Button {
+                    InstancesManifest.shared.changePublicAccount(accounts, settings: settings)
+                } label: {
+                    if let account = accounts.current, account.isPublic {
+                        Text("Switch to other public location")
+                    } else {
+                        Text("Switch to public locations")
+                    }
+                }
+                .disabled(countryOfPublicInstances.isNil)
+            }
+        }
+
+        Section(header: SettingsHeader(text: "Custom Locations".localized())) {
+            #if os(macOS)
+                InstancesSettings()
+                    .environmentObject(settings)
+            #else
+                ForEach(instances) { instance in
+                    AccountsNavigationLink(instance: instance)
+                }
+                addInstanceButton
+            #endif
+        }
+    }
+
+    @ViewBuilder var countryFooter: some View {
+        if let account = accounts.current {
+            let locationType = account.isPublic ? (account.country ?? "Unknown") : "Custom".localized()
+            let description = account.isPublic ? account.url : account.instance?.description ?? "unknown".localized()
+
+            Text("Current: \(locationType)\n\(description)")
+                .foregroundColor(.secondary)
+            #if os(macOS)
+                .padding(.bottom, 10)
+            #endif
+        }
+    }
+
+    func loadCountries() {
+        InstancesManifest.shared.configure()
+        InstancesManifest.shared.instancesList?.load()
+            .onSuccess { response in
+                if let instances: [ManifestedInstance] = response.typedContent() {
+                    self.countries = instances.map(\.country).unique().sorted()
+                }
+            }
+            .onFailure { _ in
+                settings.presentAlert(title: "Could not load locations manifest".localized())
+            }
+    }
+
+    private var addInstanceButton: some View {
+        Button {
+            presentingInstanceForm = true
+        } label: {
+            Label("Add Location...", systemImage: "plus")
+        }
+    }
 }

 struct AdvancedSettings_Previews: PreviewProvider {
    static var previews: some View {
        AdvancedSettings()
+            .injectFixtureEnvironmentObjects()
    }
 }
--- a/Shared/Settings/LocationsSettings.swift
+++ b/Shared/Settings/LocationsSettings.swift
@@ -1,124 +0,0 @@
-import Defaults
-import SwiftUI
-
-struct LocationsSettings: View {
-    @State private var countries = [String]()
-    @State private var presentingInstanceForm = false
-    @State private var savedFormInstanceID: Instance.ID?
-
-    @EnvironmentObject<AccountsModel> private var accounts
-    @EnvironmentObject<NavigationModel> private var navigation
-    @EnvironmentObject<SettingsModel> private var model
-
-    @Default(.countryOfPublicInstances) private var countryOfPublicInstances
-    @Default(.instances) private var instances
-
-    var body: some View {
-        VStack(alignment: .leading) {
-            #if os(macOS)
-                settings
-                Spacer()
-            #else
-                Group {
-                    settings
-                }
-                #if os(iOS)
-                .listStyle(.insetGrouped)
-                #endif
-            #endif
-        }
-        .onAppear(perform: loadCountries)
-        .onChange(of: countryOfPublicInstances) { newCountry in
-            InstancesManifest.shared.setPublicAccount(newCountry, accounts: accounts, asCurrent: accounts.current?.isPublic ?? true)
-        }
-        .sheet(isPresented: $presentingInstanceForm) {
-            InstanceForm(savedInstanceID: $savedFormInstanceID)
-        }
-        #if os(tvOS)
-        .frame(maxWidth: 1000)
-        #endif
-        .navigationTitle("Locations")
-    }
-
-    @ViewBuilder var settings: some View {
-        if !InstancesManifest.shared.manifestURL.isNil {
-            Section(header: SettingsHeader(text: "Public Locations".localized()), footer: countryFooter) {
-                Picker("Country", selection: $countryOfPublicInstances) {
-                    Text("Don't use public locations").tag(String?.none)
-                    ForEach(countries, id: \.self) { country in
-                        Text(country).tag(Optional(country))
-                    }
-                }
-                #if os(tvOS)
-                .pickerStyle(.inline)
-                #endif
-                .disabled(countries.isEmpty)
-
-                Button {
-                    InstancesManifest.shared.changePublicAccount(accounts, settings: model)
-                } label: {
-                    if let account = accounts.current, account.isPublic {
-                        Text("Switch to other public location")
-                    } else {
-                        Text("Switch to public locations")
-                    }
-                }
-                .disabled(countryOfPublicInstances.isNil)
-            }
-        }
-
-        Section(header: SettingsHeader(text: "Custom Locations".localized())) {
-            #if os(macOS)
-                InstancesSettings()
-                    .environmentObject(model)
-            #else
-                ForEach(instances) { instance in
-                    AccountsNavigationLink(instance: instance)
-                }
-                addInstanceButton
-            #endif
-        }
-    }
-
-    @ViewBuilder var countryFooter: some View {
-        if let account = accounts.current {
-            let locationType = account.isPublic ? (account.country ?? "Unknown") : "Custom".localized()
-            let description = account.isPublic ? account.url : account.instance?.description ?? "unknown".localized()
-
-            Text("Current: \(locationType)\n\(description)")
-                .foregroundColor(.secondary)
-            #if os(macOS)
-                .padding(.bottom, 10)
-            #endif
-        }
-    }
-
-    func loadCountries() {
-        InstancesManifest.shared.configure()
-        InstancesManifest.shared.instancesList?.load()
-            .onSuccess { response in
-                if let instances: [ManifestedInstance] = response.typedContent() {
-                    self.countries = instances.map(\.country).unique().sorted()
-                }
-            }
-            .onFailure { _ in
-                model.presentAlert(title: "Could not load locations manifest".localized())
-            }
-    }
-
-    private var addInstanceButton: some View {
-        Button {
-            presentingInstanceForm = true
-        } label: {
-            Label("Add Location...", systemImage: "plus")
-        }
-    }
-}
-
-struct LocationsSettings_Previews: PreviewProvider {
-    static var previews: some View {
-        LocationsSettings()
-            .environmentObject(AccountsModel())
-            .environmentObject(NavigationModel())
-    }
-}
--- a/Shared/Settings/SettingsView.swift
+++ b/Shared/Settings/SettingsView.swift
@@ -7,10 +7,10 @@ struct SettingsView: View {

    #if os(macOS)
        private enum Tabs: Hashable {
-            case locations, browsing, player, quality, history, sponsorBlock, advanced, help
+            case browsing, player, quality, history, sponsorBlock, advanced, help
        }

-        @State private var selection = Tabs.locations
+        @State private var selection = Tabs.browsing
    #endif

    @Environment(\.colorScheme) private var colorScheme
@@ -34,14 +34,6 @@ 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()
                }
@@ -127,12 +119,6 @@ struct SettingsView: View {
                        }
                    #endif

-                    NavigationLink {
-                        LocationsSettings()
-                    } label: {
-                        Label("Locations", systemImage: "globe")
-                    }
-
                    NavigationLink {
                        BrowsingSettings()
                    } label: {
@@ -233,11 +219,9 @@ struct SettingsView: View {
            case .history:
                return 500
            case .sponsorBlock:
-                return 660
-            case .locations:
-                return 480
+                return 700
            case .advanced:
-                return 340
+                return 650
            case .help:
                return 600
            }
--- a/Shared/Views/MPVPlayerView.swift
+++ b/Shared/Views/MPVPlayerView.swift
@@ -20,13 +20,15 @@ import SwiftUI
        func makeNSView(context _: Context) -> some NSView {
            player.mpvBackend.client = client

-            client.layer = layer
-            layer.client = client
-
            let view = MPVOGLView()

-            view.layer = client.layer
-            view.wantsLayer = true
+            if !YatteeApp.isForPreviews {
+                client.layer = layer
+                layer.client = client
+
+                view.layer = client.layer
+                view.wantsLayer = true
+            }

            return view
        }