diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-28 23:17:24 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-28 23:17:24 +0200 |
| commit | f2e361d273c228a5007c4a3e257b0b77d5d990d4 (patch) | |
| tree | 3361c96cbb699b895129b962cf32e2a5927ece88 /src/main | |
| parent | eda5a98448ec0db825f1a60aa53031417c85888e (diff) | |
Fixes FS#170: Message Details: Status display has different Text color
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java index fb8aedef..fed3049b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java @@ -363,7 +363,7 @@ public abstract class XmppActivity extends Activity { mPrimaryTextColor = getResources().getColor(R.color.primaryText); mSecondaryTextColor = getResources().getColor(R.color.secondaryText); mTertiaryTextColor = getResources().getColor(R.color.black12); - mColorRed = getResources().getColor(R.color.warning); + mColorRed = getResources().getColor(R.color.error); mColorOrange = getResources().getColor(R.color.orange500); mColorGreen = getResources().getColor(R.color.online); mPrimaryColor = getResources().getColor(R.color.primary); 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 2e7e8354..9ef51dd4 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java @@ -74,7 +74,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog { protected void displayMessageStatusInfo(View view, Message message) { TextView msgStatusTextView = (TextView) view.findViewById(R.id.dlgMsgDetMsgStatus); int msgStatusResId; - int msgStatusColorResId = R.color.primaryText; switch (message.getStatus()) { case Message.STATUS_WAITING: msgStatusResId = R.string.dlg_msg_details_msg_status_waiting; @@ -87,7 +86,7 @@ public class MessageDetailsDialog extends AbstractAlertDialog { break; case Message.STATUS_SEND_FAILED: msgStatusResId = R.string.dlg_msg_details_msg_status_failed; - msgStatusColorResId = R.color.error; + msgStatusTextView.setTextColor(getContext().getResources().getColor(R.color.error)); break; case Message.STATUS_RECEIVED: msgStatusResId = R.string.dlg_msg_details_msg_status_received; @@ -99,7 +98,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog { msgStatusResId = R.string.dlg_msg_details_msg_status_sent; } msgStatusTextView.setText(msgStatusResId); - msgStatusTextView.setTextColor(getContext().getResources().getColor(msgStatusColorResId)); } /** |