Skip to content

fix: include company and job in speed dial contact search (#689) #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ibrahim-iqbal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: include company and job in speed dial contact search (#689) #902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/src/main/kotlin/org/fossify/phone/dialogs/SelectContactDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import android.widget.ImageView
import androidx.activity.addCallback
import androidx.appcompat.app.AlertDialog
import org.fossify.commons.extensions.*
import org.fossify.commons.helpers.getProperText
import org.fossify.commons.models.contacts.Contact
import org.fossify.commons.views.MySearchMenu
import org.fossify.phone.R
Expand Down Expand Up @@ -98,7 +99,14 @@ class SelectContactDialog(val activity: SimpleActivity, val contacts: List<Conta
val adapter = binding.selectContactList.adapter as? ContactsAdapter
var contactsToShow = contacts
if (query.isNotEmpty()) {
contactsToShow = contacts.filter { it.name.contains(query, true) }
val fixedText = query.trim().replace("\\s+".toRegex(), " ")
val shouldNormalize = fixedText.normalizeString() == fixedText
contactsToShow = contacts.filter { contact ->
getProperText(contact.getNameToDisplay(), shouldNormalize).contains(fixedText, true) ||
getProperText(contact.nickname, shouldNormalize).contains(fixedText, true) ||
getProperText(contact.organization.company, shouldNormalize).contains(fixedText, true) ||
getProperText(contact.organization.jobPosition, shouldNormalize).contains(fixedText, true)
}
}
checkPlaceholderVisibility(contactsToShow)

Expand Down
Loading