aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-25 20:38:43 +0100
committerChristian Schneppe <christian@pix-art.de>2017-11-25 20:38:43 +0100
commit5efdeb9de7bb38115b6082ba803c16c25f8472f4 (patch)
treea398062f97cf6c0d63115ce9ff91ece3fae42ebe
parentf0aaa60581cd6d2f29e10b74cf737823a1f16f41 (diff)
optimize colors
-rw-r--r--src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java1
-rw-r--r--src/main/res/drawable/message_bubble_received_white.xml2
-rw-r--r--src/main/res/drawable/message_bubble_sent_white.xml2
-rw-r--r--src/main/res/values/colors.xml3
4 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index dabf104bf..286d841bf 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -955,6 +955,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
} else {
viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_lightred);
viewHolder.encryption.setVisibility(View.VISIBLE);
+ viewHolder.encryption.setTextColor(activity.getWarningTextColor());
if (omemoEncryption && !message.isTrusted()) {
viewHolder.encryption.setText(R.string.not_trusted);
} else {
diff --git a/src/main/res/drawable/message_bubble_received_white.xml b/src/main/res/drawable/message_bubble_received_white.xml
index 9055bad70..32e146460 100644
--- a/src/main/res/drawable/message_bubble_received_white.xml
+++ b/src/main/res/drawable/message_bubble_received_white.xml
@@ -16,6 +16,6 @@
android:color="@color/grey500">
</stroke>
<solid
- android:color="@color/realwhite">
+ android:color="@color/lightwhite">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_white.xml b/src/main/res/drawable/message_bubble_sent_white.xml
index 7e627ed11..73d080cf1 100644
--- a/src/main/res/drawable/message_bubble_sent_white.xml
+++ b/src/main/res/drawable/message_bubble_sent_white.xml
@@ -16,6 +16,6 @@
android:color="@color/grey500">
</stroke>
<solid
- android:color="@color/realwhite">
+ android:color="@color/lightwhite">
</solid>
</shape> \ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 11a0ba698..d3b0e6a88 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -18,9 +18,10 @@
<color name="orange500">#ffff9800</color>
<color name="bubble">#ff2e4272</color>
<color name="realwhite">#ffffffff</color>
+ <color name="lightwhite">#fffafbfd</color>
<color name="lightblue">#ffd7deee</color>
<color name="lightred">#fff5d9d9</color>
- <color name="lightgreen">#ffb0ecaf</color>
+ <color name="lightgreen">#ffcaf2ca</color>
<color name="online">#ff259b24</color>
<color name="away">#ffff9800</color>
<color name="notavailable">#fff44336</color>