mirrors2/ClashX-Dashboard
1
0
Fork 0
mirror of https://github.com/yJason/ClashX-Dashboard.git synced 2026-02-04 10:02:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc: remove swiftui toolbar

Browse Source
This commit is contained in:
mrFq1
2023-08-16 14:02:28 +08:00
parent b6b8515f48
commit 1f155f7e4b
8 changed files with 0 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Examples/ClashX Dashboard Demo.xcodeproj/project.pbxproj
View File

@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
012875E22A2E38D1004FB615 /* ClashX Dashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 012875E12A2E38D1004FB615 /* ClashX Dashboard */; }; 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 */; }; 0192316329DD4DD100539EDD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0192316229DD4DD100539EDD /* Assets.xcassets */; };
0192316629DD4DD100539EDD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0192316529DD4DD100539EDD /* Preview 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 */; }; 01A78B7F2A2B188F0058D1CA /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01A78B7E2A2B188E0058D1CA /* Main.storyboard */; };
@@ -18,7 +17,6 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
012875DE2A2E37AB004FB615 /* ClashX Dashboard */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "ClashX Dashboard"; path = ..; sourceTree = "<group>"; }; 012875DE2A2E37AB004FB615 /* ClashX Dashboard */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "ClashX Dashboard"; path = ..; sourceTree = "<group>"; };
0192315B29DD4DCF00539EDD /* ClashX Dashboard Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClashX Dashboard Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = "<group>"; };
0192316229DD4DD100539EDD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 0192316229DD4DD100539EDD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
0192316529DD4DD100539EDD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; }; 0192316529DD4DD100539EDD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
0192316729DD4DD100539EDD /* ClashX_Dashboard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClashX_Dashboard.entitlements; sourceTree = "<group>"; }; 0192316729DD4DD100539EDD /* ClashX_Dashboard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClashX_Dashboard.entitlements; sourceTree = "<group>"; };
@@ -74,7 +72,6 @@
0192315D29DD4DCF00539EDD /* ClashX Dashboard */ = { 0192315D29DD4DCF00539EDD /* ClashX Dashboard */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
0192315E29DD4DCF00539EDD /* ClashX_DashboardApp.swift */,
01FE884B2A29BB590084902C /* AppDelegate.swift */, 01FE884B2A29BB590084902C /* AppDelegate.swift */,
01A78B7E2A2B188E0058D1CA /* Main.storyboard */, 01A78B7E2A2B188E0058D1CA /* Main.storyboard */,
0192316229DD4DD100539EDD /* Assets.xcassets */, 0192316229DD4DD100539EDD /* Assets.xcassets */,
@@ -169,7 +166,6 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
01FE884C2A29BB590084902C /* AppDelegate.swift in Sources */, 01FE884C2A29BB590084902C /* AppDelegate.swift in Sources */,
0192315F29DD4DCF00539EDD /* ClashX_DashboardApp.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

20
Examples/ClashX Dashboard/ClashX_DashboardApp.swift
View File

@@ -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()
}
}
}

10
Sources/ClashX Dashboard/Views/ContentTabs/Connections/ConnectionsView.swift
View File

@@ -17,7 +17,6 @@ struct ConnectionsView: View {
ConnectionsTableView(data: data.conns, ConnectionsTableView(data: data.conns,
filterString: searchString) filterString: searchString)
.background(Color(nsColor: .textBackgroundColor)) .background(Color(nsColor: .textBackgroundColor))
.searchable(text: $searchString)
.onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) {
guard let string = $0.userInfo?["String"] as? String else { return } guard let string = $0.userInfo?["String"] as? String else { return }
searchString = string searchString = string
@@ -25,15 +24,6 @@ struct ConnectionsView: View {
.onReceive(NotificationCenter.default.publisher(for: .stopConns)) { _ in .onReceive(NotificationCenter.default.publisher(for: .stopConns)) { _ in
stopConns() stopConns()
} }
.toolbar {
ToolbarItem {
Button {
stopConns()
} label: {
Image(systemName: "stop.circle.fill")
}
}
}
} }
func stopConns() { func stopConns() {

21
Sources/ClashX Dashboard/Views/ContentTabs/Logs/LogsView.swift
View File

@@ -17,7 +17,6 @@ struct LogsView: View {
Group { Group {
LogsTableView(data: logStorage.logs.reversed(), filterString: searchString) LogsTableView(data: logStorage.logs.reversed(), filterString: searchString)
} }
.searchable(text: $searchString)
.onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) {
guard let string = $0.userInfo?["String"] as? String else { return } guard let string = $0.userInfo?["String"] as? String else { return }
searchString = string searchString = string
@@ -26,26 +25,6 @@ struct LogsView: View {
guard let level = $0.userInfo?["level"] as? ClashLogLevel else { return } guard let level = $0.userInfo?["level"] as? ClashLogLevel else { return }
logLevelChanged(level) 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) { func logLevelChanged(_ level: ClashLogLevel) {

10
Sources/ClashX Dashboard/Views/ContentTabs/Providers/ProvidersView.swift
View File

@@ -20,7 +20,6 @@ struct ProvidersView: View {
listView listView
EmptyView() EmptyView()
} }
.searchable(text: $searchString.string)
.onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) {
guard let string = $0.userInfo?["String"] as? String else { return } guard let string = $0.userInfo?["String"] as? String else { return }
searchString.string = string searchString.string = string
@@ -34,15 +33,6 @@ struct ProvidersView: View {
loadProviders() loadProviders()
} }
.environmentObject(hideProxyNames) .environmentObject(hideProxyNames)
.toolbar {
ToolbarItem {
Button {
hideProxyNames.hide = !hideProxyNames.hide
} label: {
Image(systemName: hideProxyNames.hide ? "eyeglasses" : "wand.and.stars")
}
}
}
} }
var listView: some View { var listView: some View {

10
Sources/ClashX Dashboard/Views/ContentTabs/Proxies/ProxiesView.swift
View File

@@ -33,7 +33,6 @@ struct ProxiesView: View {
.listStyle(.plain) .listStyle(.plain)
EmptyView() EmptyView()
} }
.searchable(text: $searchString.string)
.onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) {
guard let string = $0.userInfo?["String"] as? String else { return } guard let string = $0.userInfo?["String"] as? String else { return }
searchString.string = string searchString.string = string
@@ -47,15 +46,6 @@ struct ProxiesView: View {
loadProxies() loadProxies()
} }
.environmentObject(hideProxyNames) .environmentObject(hideProxyNames)
.toolbar {
ToolbarItem {
Button {
hideProxyNames.hide = !hideProxyNames.hide
} label: {
Image(systemName: hideProxyNames.hide ? "eyeglasses" : "wand.and.stars")
}
}
}
} }

1
Sources/ClashX Dashboard/Views/ContentTabs/Rules/RulesView.swift
View File

@@ -28,7 +28,6 @@ struct RulesView: View {
RuleItemView(index: $0.offset, rule: $0.element) RuleItemView(index: $0.offset, rule: $0.element)
} }
} }
.searchable(text: $searchString)
.onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) { .onReceive(NotificationCenter.default.publisher(for: .toolbarSearchString)) {
guard let string = $0.userInfo?["String"] as? String else { return } guard let string = $0.userInfo?["String"] as? String else { return }
searchString = string searchString = string

10
Sources/ClashX Dashboard/Views/ContentView.swift
View File

@@ -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 .onReceive(runningState) { _ in
isRunning = ConfigManager.shared.isRunning isRunning = ConfigManager.shared.isRunning
} }