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

Merge pull request #823 from JamesL813/master

Browse source 
Change display mode to add a comma when displaying surname first: "Lastname, Firstname"
This commit is contained in:
Tibor Kaputa 2022-05-21 23:01:43 +02:00 committed by GitHub
commit d83c14dab9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,15 @@ data class Contact(
fun getNameToDisplay(): String { fun getNameToDisplay(): String {
val firstMiddle = "$firstName $middleName".trim() val firstMiddle = "$firstName $middleName".trim()
val firstPart = if (startWithSurname) surname else firstMiddle val firstPart = if (startWithSurname) {
if (surname.isNotEmpty() && firstMiddle.isNotEmpty()) {
"$surname,"
} else {
surname
}
} else {
firstMiddle
}
val lastPart = if (startWithSurname) firstMiddle else surname val lastPart = if (startWithSurname) firstMiddle else surname
val suffixComma = if (suffix.isEmpty()) "" else ", $suffix" val suffixComma = if (suffix.isEmpty()) "" else ", $suffix"
val fullName = "$prefix $firstPart $lastPart$suffixComma".trim() val fullName = "$prefix $firstPart $lastPart$suffixComma".trim()