Better quote handling, parsing state refactor

Should be easier to test in the future
Still needs some work on spacing
This commit is contained in:
Bradlee Speice
2015-04-16 00:37:11 -04:00
parent aec86f9898
commit 3a0a5baa1c
8 changed files with 72 additions and 49 deletions

View File

@ -3,7 +3,6 @@ package org.bspeice.minimalbible.activity.viewer
import android.support.v7.widget.RecyclerView
import android.text.SpannableStringBuilder
import android.widget.TextView
import com.orhanobut.logger.Logger
import org.bspeice.minimalbible.service.format.osisparser.OsisParser
import org.crosswire.jsword.book.Book
import org.crosswire.jsword.book.getVersification
@ -11,18 +10,18 @@ import org.crosswire.jsword.book.getVersification
class PassageView(val v: TextView, val b: Book)
: RecyclerView.ViewHolder(v) {
val parser = OsisParser()
fun buildOrdinal(verse: Int, info: BookAdapter.ChapterInfo) =
b.getVersification().decodeOrdinal(verse + info.vOffset)
fun getAllVerses(verses: Progression<Int>, info: BookAdapter.ChapterInfo): SpannableStringBuilder {
val builder = SpannableStringBuilder()
val parser = OsisParser()
verses.forEach { parser.appendVerse(b, buildOrdinal(it, info), builder) }
return builder
}
fun bind(info: BookAdapter.ChapterInfo) {
Logger.d("PassageView", "Binding chapter ${info.chapter}")
v setText getAllVerses(info.vStart..info.vEnd, info)
}
}