remove context and fix StringIndexOutOfBoundsException

iamageo · Jun 3, 2023 · 35b6412 · 35b6412
1 parent 851aec1
commit 35b6412
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/src/main/java/com/iamageo/another_read_more/simple-adapter/SimpleAnotherAdapter.kt b/app/src/main/java/com/iamageo/another_read_more/simple-adapter/SimpleAnotherAdapter.kt
@@ -15,7 +15,7 @@ import java.util.*
 internal class SimpleAnotherAdapter internal constructor(private val context: Context) :
     RecyclerView.Adapter<SimpleAnotherAdapter.ViewHolder>() {
 
-    private val readMoreOption: AnotherReadMore = AnotherReadMore.Builder(context)
+    private val readMoreOption: AnotherReadMore = AnotherReadMore.Builder()
         .build()
 
     internal class ViewHolder(v: View) : RecyclerView.ViewHolder(v) {

diff --git a/library/src/main/java/com/iamageo/library/AnotherReadMore.kt b/library/src/main/java/com/iamageo/library/AnotherReadMore.kt
@@ -14,15 +14,13 @@ import android.view.ViewGroup.MarginLayoutParams
 import android.widget.TextView
 
 class AnotherReadMore(
-    var context: Context? = null,
     val textLength: Int = 0,
     val textLengthType: Int = 0,
     val moreLabel: String? = null,
     val lessLabel: String? = null,
 ) {
 
     private constructor(builder: Builder) : this(
-        builder.context,
         builder.textLength,
         builder.textLengthType,
         builder.moreLabel,
@@ -48,9 +46,10 @@ class AnotherReadMore(
                     return@Runnable
                 }
                 val lp = textView.layoutParams as MarginLayoutParams
+                val endLine = (textLength - 1).coerceAtMost(textView.layout.lineCount - 1);
                 val subString = text.toString().substring(
                     textView.layout.getLineStart(0),
-                    textView.layout.getLineEnd(textLength - 1)
+                    textView.layout.getLineEnd(endLine)
                 )
                 textLengthNew = subString.length - (moreLabel!!.length + 4 + lp.rightMargin / 6)
             }
@@ -99,8 +98,7 @@ class AnotherReadMore(
         textView.movementMethod = LinkMovementMethod.getInstance()
     }
 
-    class Builder(c: Context) {
-        val context: Context = c
+    class Builder() {
 
         var textLength = 100
             private set