From 4494f3f39d4e4fd07843efd9e48da6f60964d8c7 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Tue, 18 Jun 2019 18:24:04 -0400 Subject: [PATCH] Fix crash when a single comma doesn't fit in collapsed textview --- .../java/com/moez/QKSMS/common/widget/QkTextView.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt index b8aa9256..bc771a1c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt @@ -25,8 +25,9 @@ import com.moez.QKSMS.common.util.TextViewStyler import com.moez.QKSMS.injection.appComponent import javax.inject.Inject -open class QkTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) - : EmojiAppCompatTextView(context, attrs) { +open class QkTextView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : EmojiAppCompatTextView(context, attrs) { @Inject lateinit var textViewStyler: TextViewStyler @@ -61,8 +62,9 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu ?.takeIf { layout -> layout.lineCount > 0 } ?.let { layout -> layout.getEllipsisCount(layout.lineCount - 1) } ?.takeIf { ellipsisCount -> ellipsisCount > 0 } - ?.let { ellipsisCount -> - val lastComma = text.dropLast(ellipsisCount).lastIndexOf(',') + ?.let { ellipsisCount -> text.dropLast(ellipsisCount).lastIndexOf(',') } + ?.takeIf { lastComma -> lastComma >= 0 } + ?.let { lastComma -> val remainingNames = text.drop(lastComma).count { c -> c == ',' } text = "${text.take(lastComma)}, +$remainingNames" }