changed some colors to match blue theme

13 files changed, 9 insertions, 16 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);
 		}
 	}
 
diff --git a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
new file mode 100644
index 000000000..20fe4bbaa
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
new file mode 100644
index 000000000..c32a27ae2
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
new file mode 100644
index 000000000..14b0c9e37
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
new file mode 100644
index 000000000..5ec4c0102
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
new file mode 100644
index 000000000..7b4a6b307
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
new file mode 100644
index 000000000..0e1490625
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
new file mode 100644
index 000000000..72bf5c45e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
new file mode 100644
index 000000000..4f681f90a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 2be8ada8c..8487cd3f8 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -56,8 +56,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
-                android:textColorLink="@color/green900"
-                android:textColor="@color/green900"
+                android:textColorLink="@color/dark"
+                android:textColor="@color/dark"
                 android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody" />
 
@@ -98,9 +98,8 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
-                    android:alpha="0.70"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_lock_white_18dp" />
+                    android:src="@drawable/ic_lock_blue_18dp" />
 
                 <ImageView
                     android:id="@+id/edit_indicator"
@@ -108,9 +107,8 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginRight="4sp"
-                    android:alpha="0.70"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_mode_edit_white_18dp" />
+                    android:src="@drawable/ic_mode_edit_blue_18dp" />
 
                 <TextView
                     android:id="@+id/message_time"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index dae361ef3..ec313cde8 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -98,9 +98,8 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
-                    android:alpha="0.54"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_lock_black_18dp" />
+                    android:src="@drawable/ic_lock_blue_18dp" />
 
                 <ImageView
                     android:id="@+id/edit_indicator"
@@ -108,9 +107,8 @@
                     android:layout_height="?attr/TextSizeInfo"
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="4sp"
-                    android:alpha="0.54"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_mode_edit_black_18dp" />
+                    android:src="@drawable/ic_mode_edit_blue_18dp" />
 
                 <ImageView
                     android:id="@+id/indicator_received"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a4b43d589..698d8e36e 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
 	<color name="realgreen">#ff259b24</color>
 	<color name="primary">#ff2e4272</color>
 	<color name="primary_dark">#ff08183e</color>
-	<color name="green900">#ff000309</color>
+	<color name="dark">#ff000309</color>
 	<color name="accent">#ff2e4272</color>
 	<color name="black87">#de000309</color>
 	<color name="black54">#8a000309</color>