Skip to content

Commit 365d3d2

Browse files
committed
v1.7 release, fix onClick not working
1 parent 6e6eaed commit 365d3d2

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ val text = span {
5858
You can grab it via Gradle:
5959

6060
```
61-
implementation 'me.gujun.android:span:1.6'
61+
implementation 'me.gujun.android:span:1.7'
6262
```
6363

6464
### Usage

span/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323

2424
def GROUP = 'me.gujun.android'
2525
def ARTIFACTID = 'span'
26-
def VERSION = '1.6'
26+
def VERSION = '1.7'
2727

2828
group = GROUP
2929
version = VERSION

span/src/main/kotlin/me/gujun/android/span/span.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import android.text.TextUtils
1111
import android.text.style.AbsoluteSizeSpan
1212
import android.text.style.AlignmentSpan
1313
import android.text.style.BackgroundColorSpan
14-
import android.text.style.ClickableSpan
1514
import android.text.style.ForegroundColorSpan
1615
import android.text.style.ImageSpan
1716
import android.text.style.QuoteSpan
@@ -23,6 +22,7 @@ import android.text.style.URLSpan
2322
import android.view.View
2423
import me.gujun.android.span.style.CustomTypefaceSpan
2524
import me.gujun.android.span.style.LineSpacingSpan
25+
import me.gujun.android.span.style.SimpleClickableSpan
2626
import me.gujun.android.span.style.TextDecorationLineSpan
2727
import me.gujun.android.span.style.VerticalPaddingSpan
2828

@@ -102,7 +102,7 @@ class Span(val parent: Span? = null) : SpannableStringBuilder() {
102102
}
103103

104104
if (onClick != null) {
105-
builder.add(object : ClickableSpan() {
105+
builder.add(object : SimpleClickableSpan() {
106106
override fun onClick(widget: View) {
107107
onClick?.invoke()
108108
}
@@ -205,7 +205,7 @@ class Span(val parent: Span? = null) : SpannableStringBuilder() {
205205
if (verticalPadding == null) {
206206
verticalPadding = style.verticalPadding
207207
}
208-
if (onClick != null) {
208+
if (onClick == null) {
209209
onClick = style.onClick
210210
}
211211
spans.addAll(style.spans)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package me.gujun.android.span.style
2+
3+
import android.text.TextPaint
4+
import android.text.style.ClickableSpan
5+
6+
abstract class SimpleClickableSpan : ClickableSpan() {
7+
override fun updateDrawState(ds: TextPaint?) {
8+
// no-op
9+
}
10+
}

0 commit comments

Comments
 (0)