remove NotificationsConstants

4 files changed, 16 insertions, 25 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsConstants.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsConstants.java
deleted file mode 100644
index be3e7c176..000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsConstants.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.wordpress.android.ui.notifications;
-
-
-import android.graphics.Color;
-
-public class NotificationsConstants {
-    // These colors are used in NoteBlockClickableSpan.
-    // If those colors are updated there, they should be updated here as well
-    public static final int COLOR_CALYPSO_BLUE_BORDER   = Color.parseColor("#d2dee6");
-    public static int COLOR_CALYPSO_DARK_BLUE           = Color.parseColor("#324155");
-    public static final int COLOR_NEW_KID_BLUE          = Color.parseColor("#2EA2CC");
-    public static final int COLOR_CALYPSO_BLUE          = Color.parseColor("#90aec2");
-    public static final int COLOR_CALYPSO_WHITE         = Color.parseColor("#FFFFFF");
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java
index 087e2f4f3..cae4534ae 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.notifications.blocks;
 
+import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.text.TextPaint;
@@ -9,7 +10,7 @@ import android.view.View;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.wordpress.android.ui.notifications.NotificationsConstants;
+import org.wordpress.android.R;
 import org.wordpress.android.util.JSONUtil;
 
 import javax.annotation.Nonnull;
@@ -27,14 +28,16 @@ public class NoteBlockClickableSpan extends ClickableSpan {
     private int[] mIndices;
     private boolean mPressed;
     private boolean mShouldLink;
-
-    private int mTextColor = NotificationsConstants.COLOR_CALYPSO_DARK_BLUE;
+    private Context mContext;
+    private int mTextColor;
 
     private final JSONObject mBlockData;
 
-    public NoteBlockClickableSpan(JSONObject idData, boolean shouldLink) {
+    public NoteBlockClickableSpan(Context context, JSONObject idData, boolean shouldLink) {
         mBlockData = idData;
         mShouldLink = shouldLink;
+        mContext = context;
+        mTextColor = context.getResources().getColor(R.color.grey_dark);
         processRangeData();
     }
 
@@ -59,7 +62,7 @@ public class NoteBlockClickableSpan extends ClickableSpan {
             // Apply different coloring for blockquotes
             if (getRangeType() == NoteBlockRangeType.BLOCKQUOTE) {
                 mShouldLink = false;
-                mTextColor = NotificationsConstants.COLOR_CALYPSO_BLUE;
+                mTextColor = mContext.getResources().getColor(R.color.grey);
             }
         }
     }
@@ -67,8 +70,9 @@ public class NoteBlockClickableSpan extends ClickableSpan {
     @Override
     public void updateDrawState(@Nonnull TextPaint textPaint) {
         // Set background color
-        textPaint.bgColor = mPressed && !isBlockquoteType() ? NotificationsConstants.COLOR_CALYPSO_BLUE_BORDER : Color.TRANSPARENT;
-        textPaint.setColor(mShouldLink ? NotificationsConstants.COLOR_NEW_KID_BLUE : mTextColor);
+        textPaint.bgColor = mPressed && !isBlockquoteType() ?
+                mContext.getResources().getColor(R.color.grey_lighten_20) : Color.TRANSPARENT;
+        textPaint.setColor(mShouldLink ? mContext.getResources().getColor(R.color.blue_medium) : mTextColor);
         // No underlines
         textPaint.setUnderlineText(false);
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java
index a1f94fb96..bfcb256eb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.notifications.blocks;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
@@ -9,7 +10,6 @@ import android.widget.TextView;
 
 import org.json.JSONObject;
 import org.wordpress.android.R;
-import org.wordpress.android.ui.notifications.NotificationsConstants;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.JSONUtil;
 import org.wordpress.android.widgets.WPNetworkImageView;
@@ -93,7 +93,7 @@ public class UserNoteBlock extends NoteBlock {
                 noteBlockHolder.rootView.setOnClickListener(mOnClickListener);
             } else {
                 noteBlockHolder.avatarImageView.setOnTouchListener(null);
-                noteBlockHolder.rootView.setBackgroundColor(NotificationsConstants.COLOR_CALYPSO_WHITE);
+                noteBlockHolder.rootView.setBackgroundColor(view.getContext().getResources().getColor(R.color.white));
                 noteBlockHolder.rootView.setOnClickListener(null);
             }
         } else {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
index b7a34a960..314050ac1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
@@ -244,7 +244,8 @@ public class NotificationsUtils {
                     continue;
                 }
 
-                NoteBlockClickableSpan clickableSpan = new NoteBlockClickableSpan(rangeObject, shouldLink) {
+                NoteBlockClickableSpan clickableSpan = new NoteBlockClickableSpan(WordPress.getContext(), rangeObject,
+                        shouldLink) {
                     @Override
                     public void onClick(View widget) {
                         if (onNoteBlockTextClickListener != null) {
@@ -368,7 +369,7 @@ public class NotificationsUtils {
 
         boolean shouldLink = onNoteBlockTextClickListener != null;
 
-        NoteBlockClickableSpan clickableSpan = new NoteBlockClickableSpan(idBlock, shouldLink) {
+        NoteBlockClickableSpan clickableSpan = new NoteBlockClickableSpan(WordPress.getContext(), idBlock, shouldLink) {
             @Override
             public void onClick(View widget) {
                 if (onNoteBlockTextClickListener != null) {