From 605f32041d1440b259c5c05a75f2116039e92d19 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 12 Dec 2020 19:07:31 -0500 Subject: [PATCH] Filter non-alphanumeric initials --- .../com/moez/QKSMS/common/widget/AvatarView.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt index 6cca5a68..05e37b6c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt @@ -44,7 +44,7 @@ class AvatarView @JvmOverloads constructor( private val binding = viewBinding(AvatarViewBinding::inflate) private var lookupKey: String? = null - private var name: String? = null + private var fullName: String? = null private var photoUri: String? = null private var lastUpdated: Long? = null @@ -63,7 +63,7 @@ class AvatarView @JvmOverloads constructor( */ fun setRecipient(recipient: Recipient?) { lookupKey = recipient?.contact?.lookupKey - name = recipient?.contact?.name + fullName = recipient?.contact?.name photoUri = recipient?.contact?.photoUri lastUpdated = recipient?.contact?.lastUpdate theme = colors.theme(recipient) @@ -84,12 +84,14 @@ class AvatarView @JvmOverloads constructor( binding.initial.setTextColor(theme.textPrimary) binding.icon.setTint(theme.textPrimary) - if (name?.isNotEmpty() == true) { - val initials = name + if (fullName?.isNotEmpty() == true) { + val initials = fullName ?.substringBefore(',') ?.split(" ").orEmpty() - .filter { subname -> subname.isNotEmpty() } - .map { subname -> subname[0].toString() } + .filter { name -> name.isNotEmpty() } + .map { name -> name[0] } + .filter { initial -> initial.isLetterOrDigit() } + .map { initial -> initial.toString() } binding.initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first() binding.icon.visibility = GONE