Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 33575a7

Browse files
kunall17niftynei
authored andcommitted
Initialize user tag text color
1 parent 029e886 commit 33575a7

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

app/src/main/java/com/zulip/android/models/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ public Drawable getDrawable(String source) {
531531
};
532532

533533
CustomHtmlToSpannedConverter converter = new CustomHtmlToSpannedConverter(
534-
source, null, null, parser, emojiGetter, app.getServerURI());
534+
source, null, null, parser, emojiGetter, app.getServerURI(), context);
535535

536536
return CustomHtmlToSpannedConverter.linkifySpanned(converter.convert(), Linkify.ALL);
537537
}

app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616

1717
package com.zulip.android.util;
1818

19+
import android.content.Context;
1920
import android.content.res.ColorStateList;
2021
import android.content.res.Resources;
2122
import android.graphics.Canvas;
2223
import android.graphics.Paint;
2324
import android.graphics.Typeface;
2425
import android.graphics.drawable.Drawable;
2526
import android.support.annotation.NonNull;
27+
import android.support.v4.content.ContextCompat;
2628
import android.text.Html;
2729
import android.text.Layout;
2830
import android.text.Spannable;
@@ -44,6 +46,8 @@
4446
import android.text.util.Linkify;
4547
import android.util.Pair;
4648

49+
import com.zulip.android.R;
50+
4751
import org.ccil.cowan.tagsoup.Parser;
4852
import org.xml.sax.Attributes;
4953
import org.xml.sax.ContentHandler;
@@ -72,17 +76,18 @@ public class CustomHtmlToSpannedConverter implements ContentHandler {
7276
private Html.TagHandler mTagHandler;
7377
private Html.ImageGetter mEmojiGetter;
7478
private String mBaseUri;
75-
79+
private static int userMentionColor;
7680
public CustomHtmlToSpannedConverter(String source,
7781
Html.ImageGetter imageGetter, Html.TagHandler tagHandler,
78-
Parser parser, Html.ImageGetter emojiGetter, String baseUri) {
82+
Parser parser, Html.ImageGetter emojiGetter, String baseUri, Context context) {
7983
mSource = source;
8084
mSpannableStringBuilder = new SpannableStringBuilder();
8185
mImageGetter = imageGetter;
8286
mTagHandler = tagHandler;
8387
mReader = parser;
8488
mEmojiGetter = emojiGetter;
8589
mBaseUri = baseUri;
90+
userMentionColor = ContextCompat.getColor(context, R.color.dark_red);
8691
}
8792

8893
public Spanned convert() {

app/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@
1717
<color name="stream_background">#ffff</color>
1818
<color name="loadingBackground">#eeeeee</color>
1919
<color name="indigo_material_500">#3F51B5</color>
20+
<color name="dark_red">#d14444</color>
2021
</resources>

0 commit comments

Comments
 (0)