From 1f155f7e4bc78d36e6885ab9b84eb46c2aec3bcf Mon Sep 17 00:00:00 2001 From: mrFq1 <1xxbx0il0@mozmail.com> Date: Wed, 16 Aug 2023 14:02:28 +0800 Subject: [PATCH] misc: remove swiftui toolbar --- .../project.pbxproj | 4 ---- .../ClashX_DashboardApp.swift | 20 ------------------ .../Connections/ConnectionsView.swift | 10 --------- .../Views/ContentTabs/Logs/LogsView.swift | 21 ------------------- .../ContentTabs/Providers/ProvidersView.swift | 10 --------- .../ContentTabs/Proxies/ProxiesView.swift | 10 --------- .../Views/ContentTabs/Rules/RulesView.swift | 1 - .../ClashX Dashboard/Views/ContentView.swift | 10 --------- 8 files changed, 86 deletions(-) delete mode 100644 Examples/ClashX Dashboard/ClashX_DashboardApp.swift diff --git a/Examples/ClashX Dashboard Demo.xcodeproj/project.pbxproj b/Examples/ClashX Dashboard Demo.xcodeproj/project.pbxproj index 86463c4..4d80b32 100644 --- a/Examples/ClashX Dashboard Demo.xcodeproj/project.pbxproj +++ b/Examples/ClashX Dashboard Demo.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 012875E22A2E38D1004FB615 /* ClashX Dashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 012875E12A2E38D1004FB615 /* ClashX Dashboard */; }; - 0192315F29DD4DCF00539EDD /* ClashX_DashboardApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0192315E29DD4DCF00539EDD /* ClashX_DashboardApp.swift */; }; 0192316329DD4DD100539EDD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0192316229DD4DD100539EDD /* Assets.xcassets */; }; 0192316629DD4DD100539EDD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0192316529DD4DD100539EDD /* Preview Assets.xcassets */; }; 01A78B7F2A2B188F0058D1CA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01A78B7E2A2B188E0058D1CA /* Main.storyboard */; }; @@ -18,7 +17,6 @@ /* Begin PBXFileReference section */ 012875DE2A2E37AB004FB615 /* ClashX Dashboard */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "ClashX Dashboard"; path = ..; sourceTree = ""; }; 0192315B29DD4DCF00539EDD /* ClashX Dashboard Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClashX Dashboard Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 0192315E29DD4DCF00539EDD /* ClashX_DashboardApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClashX_DashboardApp.swift; sourceTree = ""; }; 0192316229DD4DD100539EDD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 0192316529DD4DD100539EDD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 0192316729DD4DD100539EDD /* ClashX_Dashboard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClashX_Dashboard.entitlements; sourceTree = ""; }; @@ -74,7 +72,6 @@ 0192315D29DD4DCF00539EDD /* ClashX Dashboard */ = { isa = PBXGroup; children = ( - 0192315E29DD4DCF00539EDD /* ClashX_DashboardApp.swift */, 01FE884B2A29BB590084902C /* AppDelegate.swift */, 01A78B7E2A2B188E0058D1CA /* Main.storyboard */, 0192316229DD4DD100539EDD /* Assets.xcassets */, @@ -169,7 +166,6 @@ buildActionMask = 2147483647; files = ( 01FE884C2A29BB590084902C /* AppDelegate.swift in Sources */, - 0192315F29DD4DCF00539EDD /* ClashX_DashboardApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Examples/ClashX Dashboard/ClashX_DashboardApp.swift b/Examples/ClashX Dashboard/ClashX_DashboardApp.swift deleted file mode 100644 index 301e17a..0000000 --- a/Examples/ClashX Dashboard/ClashX_DashboardApp.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// ClashX_DashboardApp.swift -// ClashX Dashboard -// -// - -import SwiftUI -import ClashX_Dashboard - -//@main -struct ClashX_DashboardApp: App { - var body: some Scene { - WindowGroup { - DashboardView() - } - .commands { - SidebarCommands() - } - } -} diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Connections/ConnectionsView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Connections/ConnectionsView.swift index d21996f..0ae8fc7 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Connections/ConnectionsView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Connections/ConnectionsView.swift @@ -17,7 +17,6 @@ struct ConnectionsView: View { ConnectionsTableView(data: data.conns, filterString: searchString) .background(Color(nsColor: .textBackgroundColor)) - .searchable(text: $searchString) .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { guard let string = $0.userInfo?["String"] as? String else { return } searchString = string @@ -25,15 +24,6 @@ struct ConnectionsView: View { .onReceive(NotificationCenter.default.publisher(for: .stopConns)) { _ in stopConns() } - .toolbar { - ToolbarItem { - Button { - stopConns() - } label: { - Image(systemName: "stop.circle.fill") - } - } - } } func stopConns() { diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Logs/LogsView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Logs/LogsView.swift index 5928e32..58b803c 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Logs/LogsView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Logs/LogsView.swift @@ -17,7 +17,6 @@ struct LogsView: View { Group { LogsTableView(data: logStorage.logs.reversed(), filterString: searchString) } - .searchable(text: $searchString) .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { guard let string = $0.userInfo?["String"] as? String else { return } searchString = string @@ -26,26 +25,6 @@ struct LogsView: View { guard let level = $0.userInfo?["level"] as? ClashLogLevel else { return } logLevelChanged(level) } - .toolbar { - ToolbarItem { - Picker("", selection: $logLevel) { - ForEach([ - ClashLogLevel.silent, - .error, - .warning, - .info, - .debug - ], id: \.self) { - Text($0.rawValue.capitalized).tag($0) - } - } - .pickerStyle(.menu) - .onChange(of: logLevel) { newValue in - guard newValue != ConfigManager.selectLoggingApiLevel else { return } - logLevelChanged(newValue) - } - } - } } func logLevelChanged(_ level: ClashLogLevel) { diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift index 125dcb9..7c00bb3 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift @@ -20,7 +20,6 @@ struct ProvidersView: View { listView EmptyView() } - .searchable(text: $searchString.string) .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { guard let string = $0.userInfo?["String"] as? String else { return } searchString.string = string @@ -34,15 +33,6 @@ struct ProvidersView: View { loadProviders() } .environmentObject(hideProxyNames) - .toolbar { - ToolbarItem { - Button { - hideProxyNames.hide = !hideProxyNames.hide - } label: { - Image(systemName: hideProxyNames.hide ? "eyeglasses" : "wand.and.stars") - } - } - } } var listView: some View { diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift index 6858a82..e050f5b 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift @@ -33,7 +33,6 @@ struct ProxiesView: View { .listStyle(.plain) EmptyView() } - .searchable(text: $searchString.string) .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { guard let string = $0.userInfo?["String"] as? String else { return } searchString.string = string @@ -47,15 +46,6 @@ struct ProxiesView: View { loadProxies() } .environmentObject(hideProxyNames) - .toolbar { - ToolbarItem { - Button { - hideProxyNames.hide = !hideProxyNames.hide - } label: { - Image(systemName: hideProxyNames.hide ? "eyeglasses" : "wand.and.stars") - } - } - } } diff --git a/Sources/ClashX Dashboard/Views/ContentTabs/Rules/RulesView.swift b/Sources/ClashX Dashboard/Views/ContentTabs/Rules/RulesView.swift index 4b000aa..cc4ba74 100644 --- a/Sources/ClashX Dashboard/Views/ContentTabs/Rules/RulesView.swift +++ b/Sources/ClashX Dashboard/Views/ContentTabs/Rules/RulesView.swift @@ -28,7 +28,6 @@ struct RulesView: View { RuleItemView(index: $0.offset, rule: $0.element) } } - .searchable(text: $searchString) .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { guard let string = $0.userInfo?["String"] as? String else { return } searchString = string diff --git a/Sources/ClashX Dashboard/Views/ContentView.swift b/Sources/ClashX Dashboard/Views/ContentView.swift index dc917d1..7b8ffa8 100644 --- a/Sources/ClashX Dashboard/Views/ContentView.swift +++ b/Sources/ClashX Dashboard/Views/ContentView.swift @@ -29,16 +29,6 @@ struct ContentView: View { } } } - .toolbar { - ToolbarItem(placement: .navigation) { - Button { - NSApp.keyWindow?.firstResponder?.tryToPerform(#selector(NSSplitViewController.toggleSidebar(_:)), with: nil) - } label: { - Image(systemName: "sidebar.left") - } - .help("Toggle Sidebar") - } - } .onReceive(runningState) { _ in isRunning = ConfigManager.shared.isRunning }