From e0ad43ca0b90574b05372e0557790954b1e30302 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Thu, 23 Apr 2026 07:39:03 +0200 Subject: [PATCH] Move Integrations into main settings section above Advanced Drop the standalone iOS section for Integrations and inline its row into the main list right above Advanced Settings. Swap the tvOS sidebar order so Integrations appears before Advanced as well. macOS was already correctly ordered via SettingsSection enum declaration. --- Yattee/Views/Settings/SettingsView.swift | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Yattee/Views/Settings/SettingsView.swift b/Yattee/Views/Settings/SettingsView.swift index 1ffb8936..d78ab584 100644 --- a/Yattee/Views/Settings/SettingsView.swift +++ b/Yattee/Views/Settings/SettingsView.swift @@ -161,16 +161,16 @@ struct SettingsView: View { Label(String(localized: "settings.privacy.title"), systemImage: "hand.raised") } - NavigationLink { TVSidebarDetailContainer(systemImage: "gearshape.2", title: String(localized: "settings.advanced.title")) { AdvancedSettingsView() } } label: { - Label(String(localized: "settings.advanced.title"), systemImage: "gearshape.2") - } - if appEnvironment.instancesManager.enabledInstances.contains(where: \.isYouTubeInstance) { NavigationLink { TVSidebarDetailContainer(systemImage: "puzzlepiece.extension", title: String(localized: "settings.youtubeEnhancements.title")) { YouTubeEnhancementsSettingsView() } } label: { Label(String(localized: "settings.youtubeEnhancements.title"), systemImage: "puzzlepiece.extension") } } + NavigationLink { TVSidebarDetailContainer(systemImage: "gearshape.2", title: String(localized: "settings.advanced.title")) { AdvancedSettingsView() } } label: { + Label(String(localized: "settings.advanced.title"), systemImage: "gearshape.2") + } + NavigationLink { TVSidebarDetailContainer(systemImage: "info.circle", title: String(localized: "settings.about.title")) { AboutView() } } label: { Label(String(localized: "settings.about.title"), systemImage: "info.circle") } @@ -290,21 +290,19 @@ struct SettingsView: View { Label(String(localized: "settings.privacy.title"), systemImage: "hand.raised") } - NavigationLink { - AdvancedSettingsView() - } label: { - Label(String(localized: "settings.advanced.title"), systemImage: "gearshape.2") - } - } - - if appEnvironment.instancesManager.enabledInstances.contains(where: \.isYouTubeInstance) { - Section { + if appEnvironment.instancesManager.enabledInstances.contains(where: \.isYouTubeInstance) { NavigationLink { YouTubeEnhancementsSettingsView() } label: { Label(String(localized: "settings.youtubeEnhancements.title"), systemImage: "puzzlepiece.extension") } } + + NavigationLink { + AdvancedSettingsView() + } label: { + Label(String(localized: "settings.advanced.title"), systemImage: "gearshape.2") + } } Section {