diff --git a/Yattee/ContentView.swift b/Yattee/ContentView.swift index 42d8c10a..6d1fd076 100644 --- a/Yattee/ContentView.swift +++ b/Yattee/ContentView.swift @@ -256,10 +256,10 @@ struct iOS18AdaptiveTabView: View { ExpandedPlayerWindowManager.shared.hide() } } - .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerQueueSheetPresented) { _, newValue in + .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerQueueSheetPresented, initial: true) { _, newValue in showingMiniPlayerQueueSheet = newValue } - .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerPlaylistSheetPresented) { _, newValue in + .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerPlaylistSheetPresented, initial: true) { _, newValue in showingMiniPlayerPlaylistSheet = newValue } .sheet(isPresented: $showingMiniPlayerQueueSheet, onDismiss: { @@ -386,10 +386,10 @@ struct iOS26AdaptiveTabView: View { ExpandedPlayerWindowManager.shared.hide() } } - .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerQueueSheetPresented) { _, newValue in + .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerQueueSheetPresented, initial: true) { _, newValue in showingMiniPlayerQueueSheet = newValue } - .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerPlaylistSheetPresented) { _, newValue in + .onChange(of: appEnvironment.navigationCoordinator.isMiniPlayerPlaylistSheetPresented, initial: true) { _, newValue in showingMiniPlayerPlaylistSheet = newValue } .sheet(isPresented: $showingMiniPlayerQueueSheet, onDismiss: { diff --git a/Yattee/Core/Notifications.swift b/Yattee/Core/Notifications.swift index 0fcaa199..924507d0 100644 --- a/Yattee/Core/Notifications.swift +++ b/Yattee/Core/Notifications.swift @@ -8,7 +8,6 @@ import Foundation extension Notification.Name { - static let showSettings = Notification.Name("showSettings") static let showOpenLinkSheet = Notification.Name("showOpenLinkSheet") static let openDescriptionLink = Notification.Name("openDescriptionLink") /// Posted when a URL shortener (bit.ly, etc.) has been resolved to an diff --git a/Yattee/YatteeApp.swift b/Yattee/YatteeApp.swift index 1f6a68ba..56045d7b 100644 --- a/Yattee/YatteeApp.swift +++ b/Yattee/YatteeApp.swift @@ -51,9 +51,6 @@ struct YatteeApp: App { @State private var showingICloudProgress = false @State private var showingLegacyAccountsAlert = false @State private var showingLegacyAccountsImport = false - #if os(iOS) - @State private var showingSettings = false - #endif @State private var showingOpenLinkSheet = false // Ambiguous-link prompts are stored on NavigationCoordinator so they can @@ -221,23 +218,12 @@ struct YatteeApp: App { #endif } #endif - #if os(iOS) - .sheet(isPresented: $showingSettings) { - SettingsView() - .appEnvironment(appEnvironment) - } - #endif #if !os(tvOS) .sheet(isPresented: $showingOpenLinkSheet) { OpenLinkSheet() .appEnvironment(appEnvironment) } #endif - #if os(iOS) - .onReceive(NotificationCenter.default.publisher(for: .showSettings)) { _ in - showingSettings = true - } - #endif .onReceive(NotificationCenter.default.publisher(for: .showOpenLinkSheet)) { _ in appEnvironment.navigationCoordinator.isPlayerExpanded = false showingOpenLinkSheet = true