diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-05-13 22:29:41 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-05-13 22:44:27 +0200 |
commit | 8feee8281a79217489077c9a0032ada21f8eda57 (patch) | |
tree | d8f456e23dc512f3cce7f1d1028e2562512392ea /src/main/java/eu/siacs/conversations/ui | |
parent | 3b64ae5e0e9f93d07ad72bd56d301413a33dd588 (diff) |
changed some colors to match blue theme
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 3 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 |
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); } } |