Mastodon
/
Bubble
mirror of https://github.com/lumaa-dev/BubbleApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Search function but no UI yet

This commit is contained in:
Lumaa 2024-02-10 17:20:19 +01:00
parent e6388aefb6
commit b90273e0ff
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Threaded/Views/DiscoveryView.swift
View File

@ -10,7 +10,7 @@ struct DiscoveryView: View {
@State private var searchQuery: String = "" @State private var searchQuery: String = ""
@State private var results: [String : SearchResults] = [:] @State private var results: [String : SearchResults] = [:]
let allTokens = [Token(name: String(localized: "discovery.search.users")), Token(name: String(localized: "discovery.search.posts")), Token(name: String(localized: "discovery.search.posts"))] let allTokens = [Token(id: "accounts", name: String(localized: "discovery.search.users")), Token(id: "statuses", name: String(localized: "discovery.search.posts")), Token(id: "hashtags", name: String(localized: "discovery.search.tags"))]
@State private var currentTokens = [Token]() @State private var currentTokens = [Token]()
@State private var suggestedAccounts: [Account] = [] @State private var suggestedAccounts: [Account] = []
@ -40,6 +40,19 @@ struct DiscoveryView: View {
tagsView tagsView
} }
} }
.submitLabel(.search)
.onSubmit {
Task {
await search()
}
}
.onChange(of: currentTokens) { old, new in
guard new.count > 1 else { return }
let oldToken = old.first ?? allTokens[0]
let newToken = new.last ?? allTokens[1]
currentTokens.removeAll(where: { $0 == oldToken })
}
.searchable(text: $searchQuery, tokens: $currentTokens, suggestedTokens: .constant(allTokens), prompt: Text("discovery.search.prompt")) { token in .searchable(text: $searchQuery, tokens: $currentTokens, suggestedTokens: .constant(allTokens), prompt: Text("discovery.search.prompt")) { token in
Text(token.name) Text(token.name)
} }
@ -134,8 +147,8 @@ struct DiscoveryView: View {
do { do {
try await Task.sleep(for: .milliseconds(250)) try await Task.sleep(for: .milliseconds(250))
var results: SearchResults = try await client.get(endpoint: Search.search(query: searchQuery, type: nil, offset: nil, following: nil), forceVersion: .v2) var results: SearchResults = try await client.get(endpoint: Search.search(query: searchQuery, type: nil, offset: nil, following: nil), forceVersion: .v2)
let relationships: [Relationship] = try await client.get(endpoint: Accounts.relationships(ids: results.accounts.map(\.id))) // let relationships: [Relationship] = try await client.get(endpoint: Accounts.relationships(ids: results.accounts.map(\.id)))
results.relationships = relationships // results.relationships = relationships
withAnimation { withAnimation {
self.results[searchQuery] = results self.results[searchQuery] = results
} }
@ -174,8 +187,8 @@ struct DiscoveryView: View {
let trendingLinks: [Card] let trendingLinks: [Card]
} }
struct Token: Identifiable { struct Token: Identifiable, Equatable {
var id: String { name } var id: String
var name: String var name: String
} }
} }