Fix / click|longclick link interference

+ some missing long click (image content wrapper)
+ update markwon version
This commit is contained in:
Valere
2019-06-03 17:53:04 +02:00
parent 466be1dca5
commit 471170a3e0
11 changed files with 119 additions and 37 deletions

View File

@ -91,7 +91,7 @@ dependencies {
def moshi_version = '1.8.0'
def lifecycle_version = '2.0.0'
def coroutines_version = "1.0.1"
def markwon_version = '3.0.0-SNAPSHOT'
def markwon_version = '3.0.0'
implementation fileTree(dir: 'libs', include: ['*.aar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

View File

@ -57,25 +57,25 @@ object MatrixLinkify {
return hasMatch
}
fun addLinks(textView: TextView, callback: MatrixPermalinkSpan.Callback?): Boolean {
val text = textView.text
if (text is Spannable) {
if (addLinks(text, callback)) {
addLinkMovementMethod(textView)
return true
}
return false
} else {
val spannableString = SpannableString.valueOf(text)
if (addLinks(spannableString, callback)) {
addLinkMovementMethod(textView)
textView.text = spannableString
return true
}
return false
}
}
// fun addLinks(textView: TextView, callback: MatrixPermalinkSpan.Callback?): Boolean {
// val text = textView.text
// if (text is Spannable) {
// if (addLinks(text, callback)) {
// addLinkMovementMethod(textView)
// return true
// }
//
// return false
// } else {
// val spannableString = SpannableString.valueOf(text)
// if (addLinks(spannableString, callback)) {
// addLinkMovementMethod(textView)
// textView.text = spannableString
// return true
// }
// return false
// }
// }
/**
* Add linkMovementMethod on textview if not already set