diff --git a/app/src/main/java/com/gh/common/view/ExpandTextView.java b/app/src/main/java/com/gh/common/view/ExpandTextView.java index c7e2c3c15d..becf21376a 100644 --- a/app/src/main/java/com/gh/common/view/ExpandTextView.java +++ b/app/src/main/java/com/gh/common/view/ExpandTextView.java @@ -2,7 +2,6 @@ package com.gh.common.view; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Color; import android.os.Build; import android.text.Layout; import android.text.SpannableStringBuilder; @@ -25,7 +24,6 @@ public class ExpandTextView extends AppCompatTextView { private String mEndText = "..."; private String mExpandText = mEndText + "全文"; private boolean mUseGradientAlphaEndText = false; - private int mExpandTextBackgroundColor = Color.TRANSPARENT; private int mMaxLines = 3; // 由于sdk版本限制(getMaxLines) 这里设置默认值 @@ -47,7 +45,6 @@ public class ExpandTextView extends AppCompatTextView { mUseGradientAlphaEndText = ta.getBoolean(R.styleable.ExpandTextView_useGradientAlphaEndText, false); mEndText = ta.getString(R.styleable.ExpandTextView_endText) == null ? mEndText : ta.getString(R.styleable.ExpandTextView_endText); mExpandText = ta.getString(R.styleable.ExpandTextView_expandText) == null ? mExpandText : ta.getString(R.styleable.ExpandTextView_expandText); - mExpandTextBackgroundColor = ta.getColor(R.styleable.ExpandTextView_expandTextBackgroundColor, mExpandTextBackgroundColor); ta.recycle(); } @@ -102,6 +99,8 @@ public class ExpandTextView extends AppCompatTextView { // TODO 可能最后一行只有一个字符,这里的 -ADDITIONAL_END_TEXT_COUNT 有隐藏问题 if (mUseGradientAlphaEndText) { finalEndText = content.toString().substring(content.length() - additionalEndTextCount, content.length()) + mEndText; + finalEndText = finalEndText.replace("\n", " "); + content = content.subSequence(0, content.length() - additionalEndTextCount) + finalEndText + mExpandText; } else { content = content.toString().trim() + mExpandText; @@ -114,6 +113,8 @@ public class ExpandTextView extends AppCompatTextView { if (viewWidth - w - DisplayUtils.dip2px(5) > expandTextWidth) { if (mUseGradientAlphaEndText) { finalEndText = lastText.subSequence(i - additionalEndTextCount, i) + mEndText; + finalEndText = finalEndText.replace("\n", " "); + content = mSnapshotText.subSequence(start, lastLineStart + i - additionalEndTextCount) + finalEndText + mExpandText; } else { content = mSnapshotText.subSequence(start, lastLineStart + i) + mExpandText; diff --git a/app/src/main/java/com/gh/common/view/GradientAlphaTextSpan.kt b/app/src/main/java/com/gh/common/view/GradientAlphaTextSpan.kt index 8b4e67b574..8abd015857 100644 --- a/app/src/main/java/com/gh/common/view/GradientAlphaTextSpan.kt +++ b/app/src/main/java/com/gh/common/view/GradientAlphaTextSpan.kt @@ -26,7 +26,6 @@ class GradientAlphaTextSpan() : ReplacementSpan() { canvas.drawText(text, start, end, x, y.toFloat(), paint) paint.shader = null - paint.color = originalColor } } \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_rating_comment.xml b/app/src/main/res/layout/item_game_detail_rating_comment.xml index f105f8136e..cb360de686 100644 --- a/app/src/main/res/layout/item_game_detail_rating_comment.xml +++ b/app/src/main/res/layout/item_game_detail_rating_comment.xml @@ -178,7 +178,6 @@ app:useGradientAlphaEndText="true" app:endText="... " app:expandText="全部" - app:expandTextBackgroundColor="@color/f8f8f8" app:layout_constraintTop_toBottomOf="@+id/user_icon_container" tools:text="每个评论的正文,最多显示4行,超过则使用省略号…全部,点击[全部]即可展开余下全文" /> diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index 1cc1d2d611..5361ac7387 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -198,7 +198,6 @@ app:useGradientAlphaEndText="true" app:endText="... " app:expandText="全部" - app:expandTextBackgroundColor="@color/f8f8f8" app:layout_constraintTop_toBottomOf="@+id/user_icon_container" tools:text="每个评论的正文,最多显示4行,超过则使用省略号…全部,点击[全部]即可展开余下全文" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 572574774e..21d9968f78 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -106,7 +106,6 @@ -