1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 1c0813a5..478c0604 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -39,6 +39,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusColors;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.providers.ConversationsPlusFileProvider;
 import eu.siacs.conversations.R;
@@ -121,9 +122,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 	private int getMessageTextColor(boolean onDark, boolean primary) {
 		if (onDark) {
-			return activity.getResources().getColor(primary ? R.color.white : R.color.white70);
+			return primary ? ConversationsPlusColors.primaryTextOnDark() : ConversationsPlusColors.secondaryTextOnDark();
 		} else {
-			return activity.getResources().getColor(primary ? R.color.black87 : R.color.black54);
+			return primary ? ConversationsPlusColors.primaryText() : ConversationsPlusColors.secondaryText();
 		}
 	}
 
@@ -184,7 +185,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				break;
 		}
 		if (error && type == SENT) {
-			viewHolder.time.setTextColor(activity.getWarningTextColor());
+			viewHolder.time.setTextColor(ConversationsPlusColors.warning());
 		} else {
 			viewHolder.time.setTextColor(this.getMessageTextColor(darkBackground,false));
 		}
@@ -199,7 +200,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 								message.getAxolotlFingerprint());
 
 				if(trust == null || (!trust.trusted() && !trust.trustedInactive())) {
-					viewHolder.indicator.setColorFilter(activity.getWarningTextColor());
+					viewHolder.indicator.setColorFilter(ConversationsPlusColors.warning());
 					viewHolder.indicator.setAlpha(1.0f);
 				} else {
 					viewHolder.indicator.clearColorFilter();