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

compacting Contacts model comparing a bit

Browse source
This commit is contained in:
Tibor Kaputa 2021-08-17 14:57:09 +02:00 committed by GitHub
parent 2bafac3ca9
commit 31b3e49031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt
View file

@ -19,36 +19,28 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m
} }
override fun compareTo(other: Contact): Int { override fun compareTo(other: Contact): Int {
var result: Int var result = when {
when {
sorting and SORT_BY_FIRST_NAME != 0 -> { sorting and SORT_BY_FIRST_NAME != 0 -> {
val firstString = firstName.normalizeString() val firstString = firstName.normalizeString()
val secondString = other.firstName.normalizeString() val secondString = other.firstName.normalizeString()
compareUsingStrings(firstString, secondString, other)
result = compareUsingStrings(firstString, secondString, other)
} }
sorting and SORT_BY_MIDDLE_NAME != 0 -> { sorting and SORT_BY_MIDDLE_NAME != 0 -> {
val firstString = middleName.normalizeString() val firstString = middleName.normalizeString()
val secondString = other.middleName.normalizeString() val secondString = other.middleName.normalizeString()
compareUsingStrings(firstString, secondString, other)
result = compareUsingStrings(firstString, secondString, other)
} }
sorting and SORT_BY_SURNAME != 0 -> { sorting and SORT_BY_SURNAME != 0 -> {
val firstString = surname.normalizeString() val firstString = surname.normalizeString()
val secondString = other.surname.normalizeString() val secondString = other.surname.normalizeString()
compareUsingStrings(firstString, secondString, other)
result = compareUsingStrings(firstString, secondString, other)
} }
sorting and SORT_BY_FULL_NAME != 0 -> { sorting and SORT_BY_FULL_NAME != 0 -> {
val firstString = getNameToDisplay().normalizeString() val firstString = getNameToDisplay().normalizeString()
val secondString = other.getNameToDisplay().normalizeString() val secondString = other.getNameToDisplay().normalizeString()
compareUsingStrings(firstString, secondString, other)
result = compareUsingStrings(firstString, secondString, other)
}
else -> {
result = compareUsingIds(other)
} }
else -> compareUsingIds(other)
} }
if (sorting and SORT_DESCENDING != 0) { if (sorting and SORT_DESCENDING != 0) {
@ -80,7 +72,7 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m
} }
} }
val result = if (firstValue.firstOrNull()?.isLetter() == true && secondValue.firstOrNull()?.isLetter() == false) { return if (firstValue.firstOrNull()?.isLetter() == true && secondValue.firstOrNull()?.isLetter() == false) {
-1 -1
} else if (firstValue.firstOrNull()?.isLetter() == false && secondValue.firstOrNull()?.isLetter() == true) { } else if (firstValue.firstOrNull()?.isLetter() == false && secondValue.firstOrNull()?.isLetter() == true) {
1 1
@ -97,8 +89,6 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m
} }
} }
} }
return result
} }
private fun compareUsingIds(other: Contact): Int { private fun compareUsingIds(other: Contact): Int {