Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

This commit is contained in:
张玉久
2020-06-23 18:13:58 +08:00
2 changed files with 11 additions and 6 deletions

View File

@ -213,14 +213,19 @@ public class ExpandTextView extends AppCompatTextView {
}
}, startPosition + mEndText.length(), msp.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
int paintColor = paint.getColor();
int paintColor = 0;
// 找到最后一个 ForegroundSpan 并获取颜色给 GradientAlphaTextSpan
ForegroundColorSpan[] foregroundColorSpans = msp.getSpans(0, startPosition, ForegroundColorSpan.class);
if (foregroundColorSpans.length != 0) {
int endPosition = msp.getSpanEnd(foregroundColorSpans[foregroundColorSpans.length - 1]);
Object[] objects = msp.getSpans(0, startPosition, Object.class);
if (objects.length != 0) {
Object span = objects[objects.length - 1];
int endPosition = msp.getSpanEnd(span);
if (endPosition == startPosition) {
paintColor = foregroundColorSpans[foregroundColorSpans.length - 1].getForegroundColor();
if (span instanceof ForegroundColorSpan) {
paintColor = ((ForegroundColorSpan) span).getForegroundColor();
} else if (span instanceof ClickableSpan) {
paintColor = getResources().getColor(R.color.theme_font);
}
}
}
msp.setSpan(new GradientAlphaTextSpan(paintColor), startPosition, startPosition + finalEndText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

View File

@ -11,7 +11,7 @@ class GradientAlphaTextSpan(var textColor: Int) : ReplacementSpan() {
}
override fun draw(canvas: Canvas, text: CharSequence?, start: Int, end: Int, x: Float, top: Int, y: Int, bottom: Int, paint: Paint) {
val originalColor = textColor
val originalColor = if (textColor == 0) paint.color else textColor
val originalColorWithAlphaChanged = ColorUtils.setAlphaComponent(paint.color, 1)
val textWidth = paint.measureText(text, start, end).toInt()