fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-20 05:20:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

make an if/else check clearer

Browse Source
This commit is contained in:
tibbi 2018-10-28 11:23:13 +01:00
parent 952cce20c0
commit 6de4f09319
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,12 +94,12 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
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()
return if (fullName.isEmpty()) { return if (fullName.isEmpty()) {
if (organization.isEmpty()) { if (organization.isNotEmpty()) {
emails.firstOrNull()?.value?.trim() ?: ""
} else {
var fullOrganization = if (organization.jobPosition.isEmpty()) "" else "${organization.jobPosition}, " var fullOrganization = if (organization.jobPosition.isEmpty()) "" else "${organization.jobPosition}, "
fullOrganization += organization.company fullOrganization += organization.company
fullOrganization.trim().trimEnd(',') fullOrganization.trim().trimEnd(',')
} else {
emails.firstOrNull()?.value?.trim() ?: ""
} }
} else { } else {
fullName fullName

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

@ -2,4 +2,6 @@ package com.simplemobiletools.contacts.models
data class Organization(var company: String, var jobPosition: String) { data class Organization(var company: String, var jobPosition: String) {
fun isEmpty() = company.isEmpty() && jobPosition.isEmpty() fun isEmpty() = company.isEmpty() && jobPosition.isEmpty()
fun isNotEmpty() = !isEmpty()
} }