Fixed runtime issue in Kotlin code

spacecowboy · Sep 22, 2024 · 050f3cf · 050f3cf
1 parent c8440a9
commit 050f3cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/com/nononsenseapps/feeder/model/html/LinearTextBuilder.kt b/app/src/main/java/com/nononsenseapps/feeder/model/html/LinearTextBuilder.kt
@@ -104,7 +104,7 @@ class LinearTextBuilder : Appendable {
     fun pop() {
         check(annotationsStack.isNotEmpty()) { "No annotation to pop" }
         // pop the last element
-        val item = annotationsStack.removeLast()
+        val item = annotationsStack.removeAt(annotationsStack.lastIndex)
         item.end = text.lastIndex
     }
 
@@ -190,7 +190,7 @@ private fun CharSequence.secondToLast(): Char {
 private fun <T> MutableList<T>.pushMaxTwo(item: T) {
     this.add(0, item)
     if (count() > 2) {
-        this.removeLast()
+        this.removeAt(this.lastIndex)
     }
 }
 

diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/AnnotatedString.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/AnnotatedString.kt
@@ -131,7 +131,7 @@ private fun CharSequence.secondToLast(): Char {
 private fun <T> MutableList<T>.pushMaxTwo(item: T) {
     this.add(0, item)
     if (count() > 2) {
-        this.removeLast()
+        this.removeAt(this.lastIndex)
     }
 }
 

diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlComposer.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/text/HtmlComposer.kt
@@ -32,7 +32,7 @@ abstract class HtmlParser {
         annotation: String,
     ): Int = builder.pushStringAnnotation(tag = tag, annotation = annotation)
 
-    fun popSpan() = spanStack.removeLast()
+    fun popSpan() = spanStack.removeAt(spanStack.lastIndex)
 }
 
 inline fun <R : Any> HtmlParser.withParagraph(crossinline block: HtmlParser.() -> R): R {