From b8b440b9adc923804508fa502ea7c8f6292feabc Mon Sep 17 00:00:00 2001 From: Bing ZHEUNG Date: Mon, 4 Mar 2024 23:21:26 +0800 Subject: [PATCH] Change VisualEffect names to avoid conflicts --- TypeDuck/Settings/SettingsView.swift | 12 ++++++------ TypeDuck/VisualEffect.swift | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TypeDuck/Settings/SettingsView.swift b/TypeDuck/Settings/SettingsView.swift index 6ede31d..5def658 100644 --- a/TypeDuck/Settings/SettingsView.swift +++ b/TypeDuck/Settings/SettingsView.swift @@ -37,23 +37,23 @@ struct SettingsView: View { } detail: { switch selection { case .candidates: - CandidatesView().visualEffect() + CandidatesView().applyVisualEffect() case .help: - HelpView().visualEffect() + HelpView().applyVisualEffect() case .about: - AboutView().visualEffect() + AboutView().applyVisualEffect() } } } else { NavigationView { List { - NavigationLink(destination: CandidatesView().visualEffect(), isActive: $isCandidatesViewActive) { + NavigationLink(destination: CandidatesView().applyVisualEffect(), isActive: $isCandidatesViewActive) { Label("SettingsView.NavigationTitle.Settings", systemImage: "list.number") } - NavigationLink(destination: HelpView().visualEffect(), isActive: $isHelpViewActive) { + NavigationLink(destination: HelpView().applyVisualEffect(), isActive: $isHelpViewActive) { Label("SettingsView.NavigationTitle.Help", systemImage: "keyboard") } - NavigationLink(destination: AboutView().visualEffect(), isActive: $isAboutViewActive) { + NavigationLink(destination: AboutView().applyVisualEffect(), isActive: $isAboutViewActive) { Label("SettingsView.NavigationTitle.About", systemImage: "info.circle") } } diff --git a/TypeDuck/VisualEffect.swift b/TypeDuck/VisualEffect.swift index 65dbe21..a136f0a 100644 --- a/TypeDuck/VisualEffect.swift +++ b/TypeDuck/VisualEffect.swift @@ -1,6 +1,6 @@ import SwiftUI -struct VisualEffect: NSViewRepresentable { +struct VisualEffectView: NSViewRepresentable { func makeNSView(context: Self.Context) -> NSView { let view = NSVisualEffectView() view.material = .sidebar @@ -23,15 +23,15 @@ struct HUDVisualEffect: NSViewRepresentable { } extension View { - func visualEffect() -> some View { - return self.background(VisualEffect()) + func applyVisualEffect() -> some View { + return self.background(VisualEffectView()) } func hudVisualEffect() -> some View { return self.background(HUDVisualEffect()) } func roundedVisualEffect() -> some View { return self.background( - VisualEffect() + VisualEffectView() .cornerRadius(8) .shadow(radius: 4) )