mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-21 13:18:52 +01:00
Fix crash when a single comma doesn't fit in collapsed textview
This commit is contained in:
@@ -25,8 +25,9 @@ import com.moez.QKSMS.common.util.TextViewStyler
|
|||||||
import com.moez.QKSMS.injection.appComponent
|
import com.moez.QKSMS.injection.appComponent
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
open class QkTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
|
open class QkTextView @JvmOverloads constructor(
|
||||||
: EmojiAppCompatTextView(context, attrs) {
|
context: Context, attrs: AttributeSet? = null
|
||||||
|
) : EmojiAppCompatTextView(context, attrs) {
|
||||||
|
|
||||||
@Inject lateinit var textViewStyler: TextViewStyler
|
@Inject lateinit var textViewStyler: TextViewStyler
|
||||||
|
|
||||||
@@ -61,8 +62,9 @@ open class QkTextView @JvmOverloads constructor(context: Context, attrs: Attribu
|
|||||||
?.takeIf { layout -> layout.lineCount > 0 }
|
?.takeIf { layout -> layout.lineCount > 0 }
|
||||||
?.let { layout -> layout.getEllipsisCount(layout.lineCount - 1) }
|
?.let { layout -> layout.getEllipsisCount(layout.lineCount - 1) }
|
||||||
?.takeIf { ellipsisCount -> ellipsisCount > 0 }
|
?.takeIf { ellipsisCount -> ellipsisCount > 0 }
|
||||||
?.let { ellipsisCount ->
|
?.let { ellipsisCount -> text.dropLast(ellipsisCount).lastIndexOf(',') }
|
||||||
val lastComma = text.dropLast(ellipsisCount).lastIndexOf(',')
|
?.takeIf { lastComma -> lastComma >= 0 }
|
||||||
|
?.let { lastComma ->
|
||||||
val remainingNames = text.drop(lastComma).count { c -> c == ',' }
|
val remainingNames = text.drop(lastComma).count { c -> c == ',' }
|
||||||
text = "${text.take(lastComma)}, +$remainingNames"
|
text = "${text.take(lastComma)}, +$remainingNames"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user