Merge remote-tracking branch 'github/pr/2622'

This commit is contained in:
William Casarin
2024-10-28 11:40:16 -07:00

View File

@@ -54,7 +54,6 @@ struct InnerSearchResults: View {
let search_model = SearchModel(state: damus_state, search: .filter_hashtag([ht])) let search_model = SearchModel(state: damus_state, search: .filter_hashtag([ht]))
return NavigationLink(value: Route.Search(search: search_model)) { return NavigationLink(value: Route.Search(search: search_model)) {
HStack { HStack {
Image("search")
Text("#\(ht)", comment: "Navigation link to search hashtag.") Text("#\(ht)", comment: "Navigation link to search hashtag.")
} }
.padding(.horizontal, 15) .padding(.horizontal, 15)
@@ -71,8 +70,7 @@ struct InnerSearchResults: View {
func TextSearch(_ txt: String) -> some View { func TextSearch(_ txt: String) -> some View {
return NavigationLink(value: Route.NDBSearch(results: $results)) { return NavigationLink(value: Route.NDBSearch(results: $results)) {
HStack { HStack {
Image("search") Text("\(txt)", comment: "Navigation link to search text.")
Text("Notes", comment: "Navigation link to search text.")
} }
.padding(.horizontal, 15) .padding(.horizontal, 15)
.padding(.vertical, 5) .padding(.vertical, 5)
@@ -119,10 +117,12 @@ struct InnerSearchResults: View {
SearchingEventView(state: damus_state, search_type: .naddr(naddr)) SearchingEventView(state: damus_state, search_type: .naddr(naddr))
case .multi(let multi): case .multi(let multi):
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack { HStack(spacing: 20) {
HashtagSearch(multi.hashtag) HashtagSearch(multi.hashtag)
TextSearch(multi.text) TextSearch(multi.text)
} }
.padding(.bottom, 10)
ProfilesSearch(multi.profiles) ProfilesSearch(multi.profiles)
} }