Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
	src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java

1 files changed, 17 insertions, 13 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 5e4b4acd..a97b16a4 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -12,6 +12,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
+import de.thedevstack.conversationsplus.ConversationsPlusColors;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
@@ -242,19 +244,21 @@ public class UIHelper {
 		}
 	}
 
-	public static String getStatusColor(Presence.Status status) {
-		switch (status) {
-			case ONLINE:
-			case CHAT:
-				return "#259B23";
-			case AWAY:
-			case XA:
-				return "#FF9800";
-			case DND:
-				return "#E51C23";
-		}
-		return "#CCCCCC";
-	}
+    public static int getStatusColor(Presence.Status status) {
+        switch (status) {
+            case ONLINE:
+                return ConversationsPlusColors.online();
+            case CHAT:
+                return ConversationsPlusColors.chat();
+            case AWAY:
+                return ConversationsPlusColors.away();
+            case XA:
+                return ConversationsPlusColors.xa();
+            case DND:
+                return ConversationsPlusColors.dnd();
+        }
+        return ConversationsPlusColors.offline();
+    }
 
 	private static String getDisplayedMucCounterpart(final Jid counterpart) {
 		if (counterpart==null) {