changed some colors to match blue theme

2 files changed, 2 insertions, 5 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 7251ef56b..6d4207be7 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -141,10 +141,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
         ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
         loadAvatar(conversation, profilePicture);
 
-        mLastMessage.setTextColor(Color.BLACK);
-
         if (conversation.getIncomingChatState().equals(ChatState.COMPOSING)) {
-            mLastMessage.setTextColor(ContextCompat.getColor(getContext(), R.color.green500));
             mLastMessage.setText(R.string.is_typing);
         }
         return view;
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 499727bba..c6da69fff 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -124,9 +124,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 	private int getMessageTextColor(boolean onDark, boolean primary) {
 		if (onDark) {
-			return activity.getResources().getColor(primary ? R.color.green900 : R.color.primary);
+			return activity.getResources().getColor(primary ? R.color.dark : R.color.primary);
 		} else {
-			return activity.getResources().getColor(primary ? R.color.green900 : R.color.primary);
+			return activity.getResources().getColor(primary ? R.color.dark : R.color.primary);
 		}
 	}