Merge pull request #823 from JamesL813/master

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

View File

@ -108,7 +108,15 @@ data class Contact(
fun getNameToDisplay(): String {
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 suffixComma = if (suffix.isEmpty()) "" else ", $suffix"
val fullName = "$prefix $firstPart $lastPart$suffixComma".trim()