Skip to content

Fixed escaping html tags before highlighting #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2017
Merged

Fixed escaping html tags before highlighting #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb71a28
Fixed applying html tags before highlighting
kbiakov Sep 9, 2017
3b0d640
Merge branch 'develop' into bugfix/html_tags
kbiakov Sep 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import java.util.*
abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter.ViewHolder> {

protected val context: Context
protected var lines: List<String> = ArrayList() // items
protected var lines: List<String> = ArrayList()
protected var droppedLines: List<String>? = null

internal var options: Options
Expand Down Expand Up @@ -157,6 +157,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
*/
private fun updateContent(code: String, onUpdated: () -> Unit) {
options.code = code
options.isHighlighted = true
prepareCodeLines()
ui(onUpdated)
}
Expand Down Expand Up @@ -227,7 +228,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
}
}
tvLineContent.apply {
text = html(lines[pos])
text = lines[pos].let { if (options.isHighlighted) html(it) else it }
textSize = fontSize
setTextColor(options.theme.noteColor.color())
}
Expand Down Expand Up @@ -333,6 +334,8 @@ data class Options(
var maxLines: Int = 0,
var lineClickListener: OnCodeLineClickListener? = null) {

internal var isHighlighted: Boolean = false

fun withCode(code: String): Options {
this.code = code
return this
Expand Down