aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-04 16:35:40 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-04 16:35:40 +0100
commitca0d68224ec804cac739ed955390aa7f6a585856 (patch)
treee0e8cb976fbac953e49be6f391b053502d5a9fc6 /src/main/java/de/thedevstack
parent274a689dce6b903674cc738159bb112dcad17800 (diff)
parent96e6604d9eed10d08534ddb6c7a33b7ec9dfc68e (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java9
1 files changed, 2 insertions, 7 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));