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

feat: search support

Browse Source
This commit is contained in:
mrFq1
2023-05-18 15:20:27 +08:00
parent e23239ecd9
commit 088fc47329
5 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ClashX Dashboard/Views/ContentTabs/Providers/ProviderProxiesView.swift
View File

@@ -16,6 +16,16 @@ struct ProviderProxiesView: View {
@State private var isTesting = false
@State private var isUpdating = false
var proxies: [DBProxy] {
if searchString.string.isEmpty {
return provider.proxies
} else {
return provider.proxies.filter {
$0.name.lowercased().contains(searchString.string.lowercased())
}
}
}
var body: some View {
ScrollView {
Section {
@@ -55,21 +65,13 @@ struct ProviderProxiesView: View {
var proxyListView: some View {
LazyVGrid(columns: Array(repeating: GridItem(.flexible()),
count: columnCount)) {
ForEach($provider.proxies, id: \.id) { proxy in
ForEach(proxies, id: \.id) { proxy in
ProxyItemView(
proxy: proxy,
selectable: false
)
.background(.white)
.cornerRadius(8)
.show(isVisible: {
if searchString.string.isEmpty {
return true
} else {
return proxy.wrappedValue.name.lowercased().contains(searchString.string.lowercased())
}
}())
}
}
}

13
ClashX Dashboard/Views/ContentTabs/Providers/ProxyProvidersRowView.swift
View File

@@ -9,9 +9,20 @@ import SwiftUI
struct ProxyProvidersRowView: View {
@ObservedObject var providerStorage: DBProviderStorage
@EnvironmentObject var searchString: ProxiesSearchString
@State private var isUpdating = false
var providers: [DBProxyProvider] {
if searchString.string.isEmpty {
return providerStorage.proxyProviders
} else {
return providerStorage.proxyProviders.filter {
$0.name.lowercased().contains(searchString.string.lowercased())
}
}
}
var body: some View {
NavigationLink {
contentView
@@ -53,7 +64,7 @@ struct ProxyProvidersRowView: View {
}
var listView: some View {
ForEach(providerStorage.proxyProviders, id: \.id) {
ForEach(providers, id: \.id) {
ProxyProviderInfoView(provider: $0)
}
}

13
ClashX Dashboard/Views/ContentTabs/Providers/RuleProvidersRowView.swift
View File

@@ -9,9 +9,20 @@ import SwiftUI
struct RuleProvidersRowView: View {
@ObservedObject var providerStorage: DBProviderStorage
@EnvironmentObject var searchString: ProxiesSearchString
@State private var isUpdating = false
var providers: [DBRuleProvider] {
if searchString.string.isEmpty {
return providerStorage.ruleProviders
} else {
return providerStorage.ruleProviders.filter {
$0.name.lowercased().contains(searchString.string.lowercased())
}
}
}
var body: some View {
NavigationLink {
contentView
@@ -26,7 +37,7 @@ struct RuleProvidersRowView: View {
ScrollView {
Section {
VStack(spacing: 12) {
ForEach(providerStorage.ruleProviders, id: \.id) {
ForEach(providers, id: \.id) {
RuleProviderView(provider: $0)
}
}

23
ClashX Dashboard/Views/ContentTabs/Proxies/ProxyGroupView.swift
View File

@@ -18,6 +18,16 @@ struct ProxyGroupView: View {
@State private var selectable = false
@State private var isTesting = false
var proxies: [DBProxy] {
if searchString.string.isEmpty {
return proxyGroup.proxies
} else {
return proxyGroup.proxies.filter {
$0.name.lowercased().contains(searchString.string.lowercased())
}
}
}
var body: some View {
ScrollView {
Section {
@@ -96,24 +106,17 @@ struct ProxyGroupView: View {
var proxyListView: some View {
LazyVGrid(columns: Array(repeating: GridItem(.flexible()),
count: columnCount)) {
ForEach($proxyGroup.proxies, id: \.id) { proxy in
ForEach(proxies, id: \.id) { proxy in
ProxyItemView(
proxy: proxy,
selectable: selectable
)
.background(proxyGroup.now == proxy.wrappedValue.name ? Color.teal : Color.white)
.background(proxyGroup.now == proxy.name ? Color.teal : Color.white)
.cornerRadius(8)
.onTapGesture {
let item = proxy.wrappedValue
let item = proxy
updateSelect(item.name)
}
.show(isVisible: {
if searchString.string.isEmpty {
return true
} else {
return proxy.wrappedValue.name.lowercased().contains(searchString.string.lowercased())
}
}())
}
}
}

8
ClashX Dashboard/Views/ContentTabs/Proxies/ProxyItemView.swift
View File

@@ -8,16 +8,16 @@ import SwiftUI
struct ProxyItemView: View {
@Binding var proxy: DBProxy
@ObservedObject var proxy: DBProxy
@State var selectable: Bool
@EnvironmentObject var hideProxyNames: HideProxyNames
init(proxy: Binding<DBProxy>, selectable: Bool) {
self._proxy = proxy
init(proxy: DBProxy, selectable: Bool) {
self.proxy = proxy
self.selectable = selectable
self.isBuiltInProxy = [.pass, .direct, .reject].contains(proxy.wrappedValue.type)
self.isBuiltInProxy = [.pass, .direct, .reject].contains(proxy.type)
}
@State private var isBuiltInProxy: Bool