Show another color if the user is mentioned

zulip · Aug 26, 2016 · be45398 · be45398
1 parent 08ec3ab
commit be45398
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java b/app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java
@@ -44,6 +44,7 @@
 import android.text.style.UnderlineSpan;
 
 import com.zulip.android.R;
+import com.zulip.android.ZulipApp;
 
 import org.ccil.cowan.tagsoup.Parser;
 import org.xml.sax.Attributes;
@@ -72,6 +73,7 @@ public class CustomHtmlToSpannedConverter implements ContentHandler {
     private Html.ImageGetter mEmojiGetter;
     private String mBaseUri;
     private static int userMentionColor;
+    private static int userMentionSelfColor;
     public CustomHtmlToSpannedConverter(String source,
                                         Html.ImageGetter imageGetter, Html.TagHandler tagHandler,
                                         Parser parser, Html.ImageGetter emojiGetter, String baseUri, Context context) {
@@ -83,6 +85,7 @@ public CustomHtmlToSpannedConverter(String source,
         mEmojiGetter = emojiGetter;
         mBaseUri = baseUri;
         userMentionColor = ContextCompat.getColor(context, R.color.dark_red);
+        userMentionSelfColor = ContextCompat.getColor(context, R.color.dark_blue);
     }
 
     public Spanned convert() {
@@ -432,8 +435,11 @@ private static void endSpan(SpannableStringBuilder text) {
         if (where != len) {
             Href h = (Href) obj;
             if (h != null && h.mHref != null) {
-                text.setSpan(new ProfileSpan(h.mHref, userMentionColor), where, len,
-                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                if (ZulipApp.get().getEmail().equals(h.mHref)) {
+                    text.setSpan(new ForegroundColorSpan(userMentionSelfColor), where, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                } else {
+                    text.setSpan(new ProfileSpan(h.mHref, userMentionColor), where, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
             }
         }
     }

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -18,4 +18,5 @@
     <color name="loadingBackground">#eeeeee</color>
     <color name="indigo_material_500">#3F51B5</color>
     <color name="dark_red">#d14444</color>
+    <color name="dark_blue">#303F9F</color>
 </resources>