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

3 files changed, 9 insertions, 16 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index c72d833f..7d82223c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -73,34 +73,29 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
     protected void displayMessageStatusInfo(View view, Message message) {
         TextView msgStatusTextView = (TextView) view.findViewById(R.id.dlgMsgDetMsgStatus);
         int msgStatusResId;
-        int msgStatusColorResId;
+        int msgStatusColorResId = R.color.primaryText;
         switch (message.getStatus()) {
             case Message.STATUS_WAITING:
                 msgStatusResId = R.string.dlg_msg_details_msg_status_waiting;
-                msgStatusColorResId = R.color.black87;
                 break;
             case Message.STATUS_UNSEND:
                 msgStatusResId = R.string.dlg_msg_details_msg_status_unsend;
-                msgStatusColorResId = R.color.black87;
                 break;
             case Message.STATUS_OFFERED:
                 msgStatusResId = R.string.dlg_msg_details_msg_status_offered;
-                msgStatusColorResId = R.color.black87;
                 break;
             case Message.STATUS_SEND_FAILED:
                 msgStatusResId = R.string.dlg_msg_details_msg_status_failed;
-                msgStatusColorResId = R.color.red500;
+                msgStatusColorResId = R.color.error;
                 break;
             case Message.STATUS_RECEIVED:
                 msgStatusResId = R.string.dlg_msg_details_msg_status_received;
-                msgStatusColorResId = R.color.black87;
                 break;
             case Message.STATUS_SEND:
             case Message.STATUS_SEND_DISPLAYED:
             case Message.STATUS_SEND_RECEIVED:
             default:
                 msgStatusResId = R.string.dlg_msg_details_msg_status_sent;
-                msgStatusColorResId = R.color.black87;
         }
         msgStatusTextView.setText(msgStatusResId);
         msgStatusTextView.setTextColor(getContext().getResources().getColor(msgStatusColorResId));
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index aecefbf0..2bc0ca16 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -171,7 +171,7 @@ public class NotificationService {
 	}
 
 	private void setNotificationColor(final Builder mBuilder) {
-		mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.green500));
+		mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.notification));
 	}
 
 	private void updateNotification(final boolean notify) {
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 57166fe6..2acce0f8 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -334,14 +334,12 @@ public abstract class XmppActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		metrics = getResources().getDisplayMetrics();
 		ExceptionHelper.init(getApplicationContext());
-		mPrimaryTextColor = getResources().getColor(R.color.black87);
-		mSecondaryTextColor = getResources().getColor(R.color.black54);
-		mColorRed = getResources().getColor(R.color.red500);
-		mColorOrange = getResources().getColor(R.color.orange500);
-		mColorGreen = getResources().getColor(R.color.green500);
-		mPrimaryColor = getResources().getColor(R.color.green500);
-		mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
-		mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
+		mPrimaryTextColor = getResources().getColor(R.color.primaryText);
+		mSecondaryTextColor = getResources().getColor(R.color.secondaryText);
+		mColorRed = getResources().getColor(R.color.warning);
+		mColorGreen = getResources().getColor(R.color.online);
+		mPrimaryBackgroundColor = getResources().getColor(R.color.primaryBackground);
+		mSecondaryBackgroundColor = getResources().getColor(R.color.secondaryBackground);
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
 		this.mUsingEnterKey = ConversationsPlusPreferences.displayEnterKey();