fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-03-06 12:07:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #131, properly sort all UTF8 names

Browse Source
This commit is contained in:
tibbi 2018-08-11 22:03:26 +02:00
parent 32dd6aac80
commit 6bf77d73bd
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import com.simplemobiletools.commons.helpers.SORT_BY_FIRST_NAME
import com.simplemobiletools.commons.helpers.SORT_BY_MIDDLE_NAME import com.simplemobiletools.commons.helpers.SORT_BY_MIDDLE_NAME
import com.simplemobiletools.commons.helpers.SORT_DESCENDING import com.simplemobiletools.commons.helpers.SORT_DESCENDING
import com.simplemobiletools.contacts.helpers.PHONE_NUMBER_PATTERN import com.simplemobiletools.contacts.helpers.PHONE_NUMBER_PATTERN
import java.text.Normalizer
data class Contact(val id: Int, var prefix: String, var firstName: String, var middleName: String, var surname: String, var suffix: String, var photoUri: String, data class Contact(val id: Int, var prefix: String, var firstName: String, var middleName: String, var surname: String, var suffix: String, var photoUri: String,
var phoneNumbers: ArrayList<PhoneNumber>, var emails: ArrayList<Email>, var addresses: ArrayList<Address>, var events: ArrayList<Event>, var phoneNumbers: ArrayList<PhoneNumber>, var emails: ArrayList<Email>, var addresses: ArrayList<Address>, var events: ArrayList<Event>,
@ -13,6 +14,7 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
companion object { companion object {
var sorting = 0 var sorting = 0
var startWithSurname = false var startWithSurname = false
val regex = "\\p{InCombiningDiacriticalMarks}+".toRegex()
} }
override fun compareTo(other: Contact): Int { override fun compareTo(other: Contact): Int {
@ -21,25 +23,25 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
when { when {
sorting and SORT_BY_FIRST_NAME != 0 -> { sorting and SORT_BY_FIRST_NAME != 0 -> {
firstString = firstName firstString = normalizeString(firstName)
secondString = other.firstName secondString = normalizeString(other.firstName)
} }
sorting and SORT_BY_MIDDLE_NAME != 0 -> { sorting and SORT_BY_MIDDLE_NAME != 0 -> {
firstString = middleName firstString = normalizeString(middleName)
secondString = other.middleName secondString = normalizeString(other.middleName)
} }
else -> { else -> {
firstString = surname firstString = normalizeString(surname)
secondString = other.surname secondString = normalizeString(other.surname)
} }
} }
if (firstString.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty() && organization.company.isNotEmpty()) { if (firstString.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty() && organization.company.isNotEmpty()) {
firstString = organization.company firstString = normalizeString(organization.company)
} }
if (secondString.isEmpty() && other.firstName.isEmpty() && other.middleName.isEmpty() && other.surname.isEmpty() && other.organization.company.isNotEmpty()) { if (secondString.isEmpty() && other.firstName.isEmpty() && other.middleName.isEmpty() && other.surname.isEmpty() && other.organization.company.isNotEmpty()) {
secondString = other.organization.company secondString = normalizeString(other.organization.company)
} }
var result = if (firstString.firstOrNull()?.isLetter() == true && secondString.firstOrNull()?.isLetter() == false) { var result = if (firstString.firstOrNull()?.isLetter() == true && secondString.firstOrNull()?.isLetter() == false) {
@ -67,6 +69,8 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
return result return result
} }
private fun normalizeString(string: String) = Normalizer.normalize(string, Normalizer.Form.NFD).replace(regex, "")
fun getBubbleText() = when { fun getBubbleText() = when {
sorting and SORT_BY_FIRST_NAME != 0 -> firstName sorting and SORT_BY_FIRST_NAME != 0 -> firstName
sorting and SORT_BY_MIDDLE_NAME != 0 -> middleName sorting and SORT_BY_MIDDLE_NAME != 0 -> middleName