blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

only apply tag filters on empty search

Browse Source
This commit is contained in:
Diogo
2024-12-13 22:36:23 +00:00
parent 704bf857d2
commit 1983653c5e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/ChatList/ChatListView.swift
+7 -7
View File
@@ -414,9 +414,9 @@ struct ChatListView: View {
let cInfo = chat.chatInfo
switch cInfo {
case let .direct(contact):
return filterByTag(chat) && !contact.chatDeleted && chatContactType(chat: chat) != ContactType.card && (
return !contact.chatDeleted && chatContactType(chat: chat) != ContactType.card && (
s == ""
? filtered(chat)
? filterByTag(chat) && filtered(chat)
: (viewNameContains(cInfo, s) ||
contact.profile.displayName.localizedLowercase.contains(s) ||
contact.fullName.localizedLowercase.contains(s))
@@ -424,13 +424,13 @@ struct ChatListView: View {
case let .group(gInfo):
return s == ""
? filterByTag(chat) && (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
: filterByTag(chat) && viewNameContains(cInfo, s)
: viewNameContains(cInfo, s)
case .local:
return filterByTag(chat) && (s == "" || viewNameContains(cInfo, s))
return s == "" ? filterByTag(chat) : viewNameContains(cInfo, s)
case .contactRequest:
return filterByTag(chat) && (s == "" || viewNameContains(cInfo, s))
return s == "" ? filterByTag(chat) : viewNameContains(cInfo, s)
case let .contactConnection(conn):
return filterByTag(chat) && (s != "" && conn.localAlias.localizedLowercase.contains(s))
return s == "" ? filterByTag(chat) : conn.localAlias.localizedLowercase.contains(s)
case .invalidJSON:
return false
}
@@ -751,7 +751,7 @@ struct ChatTagsView: View {
@ViewBuilder private func collapsedTagsFilterView(_ filters: [ChatTagFilter]) -> some View {
let selectedPresetTag = filters.first(where: { $0 == chatTagsModel.selectedTag })
let presetFilterIsSelected = selectedPresetTag != nil || chatTagsModel.selectedTag == nil
let presetFilterIsSelected = selectedPresetTag != nil
let color: Color = presetFilterIsSelected ? .accentColor : .secondary
Menu {
ForEach(filters, id: \.id) { tag in