danvics/Contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed multiple spaces problem in search query (#11)

Browse source
This commit is contained in:
Agnieszka C 2024-01-05 09:28:44 +01:00
parent bd6cad75d1
commit 72537e40fd
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/kotlin/org/fossify/contacts/fragments/MyViewPagerFragment.kt
View file

@ -307,26 +307,27 @@ abstract class MyViewPagerFragment<Binding : MyViewPagerFragment.InnerBinding>(c
fun onSearchQueryChanged(text: String) { fun onSearchQueryChanged(text: String) {
val adapter = innerBinding.fragmentList.adapter val adapter = innerBinding.fragmentList.adapter
val fixedText = text.trim().replace("\\s+".toRegex(), " ")
if (adapter is ContactsAdapter) { if (adapter is ContactsAdapter) {
val shouldNormalize = text.normalizeString() == text val shouldNormalize = fixedText.normalizeString() == fixedText
val filtered = contactsIgnoringSearch.filter { val filtered = contactsIgnoringSearch.filter {
getProperText(it.getNameToDisplay(), shouldNormalize).contains(text, true) || getProperText(it.getNameToDisplay(), shouldNormalize).contains(fixedText, true) ||
getProperText(it.nickname, shouldNormalize).contains(text, true) || getProperText(it.nickname, shouldNormalize).contains(fixedText, true) ||
it.phoneNumbers.any { it.phoneNumbers.any {
text.normalizePhoneNumber().isNotEmpty() && it.normalizedNumber.contains(text.normalizePhoneNumber(), true) fixedText.normalizePhoneNumber().isNotEmpty() && it.normalizedNumber.contains(fixedText.normalizePhoneNumber(), true)
} || } ||
it.emails.any { it.value.contains(text, true) } || it.emails.any { it.value.contains(fixedText, true) } ||
it.addresses.any { getProperText(it.value, shouldNormalize).contains(text, true) } || it.addresses.any { getProperText(it.value, shouldNormalize).contains(fixedText, true) } ||
it.IMs.any { it.value.contains(text, true) } || it.IMs.any { it.value.contains(fixedText, true) } ||
getProperText(it.notes, shouldNormalize).contains(text, true) || getProperText(it.notes, shouldNormalize).contains(fixedText, true) ||
getProperText(it.organization.company, shouldNormalize).contains(text, true) || getProperText(it.organization.company, shouldNormalize).contains(fixedText, true) ||
getProperText(it.organization.jobPosition, shouldNormalize).contains(text, true) || getProperText(it.organization.jobPosition, shouldNormalize).contains(fixedText, true) ||
it.websites.any { it.contains(text, true) } it.websites.any { it.contains(fixedText, true) }
} as ArrayList } as ArrayList
filtered.sortBy { filtered.sortBy {
val nameToDisplay = it.getNameToDisplay() val nameToDisplay = it.getNameToDisplay()
!getProperText(nameToDisplay, shouldNormalize).startsWith(text, true) && !nameToDisplay.contains(text, true) !getProperText(nameToDisplay, shouldNormalize).startsWith(fixedText, true) && !nameToDisplay.contains(fixedText, true)
} }
if (filtered.isEmpty() && this@MyViewPagerFragment is FavoritesFragment) { if (filtered.isEmpty() && this@MyViewPagerFragment is FavoritesFragment) {
@ -336,11 +337,11 @@ abstract class MyViewPagerFragment<Binding : MyViewPagerFragment.InnerBinding>(c
} }
innerBinding.fragmentPlaceholder.beVisibleIf(filtered.isEmpty()) innerBinding.fragmentPlaceholder.beVisibleIf(filtered.isEmpty())
(adapter as? ContactsAdapter)?.updateItems(filtered, text.normalizeString()) (adapter as? ContactsAdapter)?.updateItems(filtered, fixedText.normalizeString())
setupLetterFastscroller(filtered) setupLetterFastscroller(filtered)
} else if (adapter is GroupsAdapter) { } else if (adapter is GroupsAdapter) {
val filtered = groupsIgnoringSearch.filter { val filtered = groupsIgnoringSearch.filter {
it.title.contains(text, true) it.title.contains(fixedText, true)
} as ArrayList } as ArrayList
if (filtered.isEmpty()) { if (filtered.isEmpty()) {