fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-04-16 02:47:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

at dialpad search at organization name too, not just contact name

Browse Source
This commit is contained in:
tibbi 2019-08-26 16:39:33 +02:00
parent d856649618
commit 18c94cfa63
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialpadActivity.kt
View File

@ -174,7 +174,8 @@ class DialpadActivity : SimpleActivity() {
(dialpad_list.adapter as? ContactsAdapter)?.finishActMode() (dialpad_list.adapter as? ContactsAdapter)?.finishActMode()
val filtered = contacts.filter { val filtered = contacts.filter {
val convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.getNameToDisplay()) val convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(it.getNameToDisplay())
it.doesContainPhoneNumber(text, showLetters) || (showLetters && convertedName.contains(text, true)) val company = PhoneNumberUtils.convertKeypadLettersToDigits(it.getFullCompany())
it.doesContainPhoneNumber(text, showLetters) || (showLetters && (convertedName.contains(text, true) || company.contains(text, true)))
}.sortedWith(compareBy { }.sortedWith(compareBy {
if (showLetters) { if (showLetters) {
!it.doesContainPhoneNumber(text, showLetters) !it.doesContainPhoneNumber(text, showLetters)

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
View File

@ -118,7 +118,7 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m
fun getHashToCompare() = getStringToCompare().hashCode() fun getHashToCompare() = getStringToCompare().hashCode()
private fun getFullCompany(): String { fun getFullCompany(): String {
var fullOrganization = if (organization.company.isEmpty()) "" else "${organization.company}, " var fullOrganization = if (organization.company.isEmpty()) "" else "${organization.company}, "
fullOrganization += organization.jobPosition fullOrganization += organization.jobPosition
return fullOrganization.trim().trimEnd(',') return fullOrganization.trim().trimEnd(',')