Commit 2407d7c5 authored by Grigory Fedorov's avatar Grigory Fedorov

Default status do not written in contact list. Contact alias centered if second line is empty.

parent 71ea97b0
...@@ -84,7 +84,7 @@ public class ContactItemInflater { ...@@ -84,7 +84,7 @@ public class ContactItemInflater {
AbstractChat chat = messageManager.getChat(contact.getAccount(), contact.getUser()); AbstractChat chat = messageManager.getChat(contact.getAccount(), contact.getUser());
statusText = chat.getLastText(); statusText = chat.getLastText().trim();
viewHolder.smallRightText.setText(StringUtils.getSmartTimeText(context, chat.getLastTime())); viewHolder.smallRightText.setText(StringUtils.getSmartTimeText(context, chat.getLastTime()));
viewHolder.smallRightText.setVisibility(View.VISIBLE); viewHolder.smallRightText.setVisibility(View.VISIBLE);
...@@ -102,9 +102,6 @@ public class ContactItemInflater { ...@@ -102,9 +102,6 @@ public class ContactItemInflater {
viewHolder.largeClientIcon.setVisibility(View.GONE); viewHolder.largeClientIcon.setVisibility(View.GONE);
} else { } else {
statusText = contact.getStatusText().trim(); statusText = contact.getStatusText().trim();
if (statusText.isEmpty()) {
statusText = context.getString(contact.getStatusMode().getStringID());
}
viewHolder.smallRightText.setVisibility(View.GONE); viewHolder.smallRightText.setVisibility(View.GONE);
view.setBackgroundColor(context.getResources().getColor(R.color.grey_300)); view.setBackgroundColor(context.getResources().getColor(R.color.grey_300));
viewHolder.smallRightIcon.setVisibility(View.GONE); viewHolder.smallRightIcon.setVisibility(View.GONE);
...@@ -112,7 +109,12 @@ public class ContactItemInflater { ...@@ -112,7 +109,12 @@ public class ContactItemInflater {
viewHolder.largeClientIcon.setImageLevel(clientSoftware.ordinal()); viewHolder.largeClientIcon.setImageLevel(clientSoftware.ordinal());
} }
viewHolder.secondLineMessage.setText(statusText.trim()); if (statusText.isEmpty()) {
viewHolder.secondLineMessage.setVisibility(View.GONE);
} else {
viewHolder.secondLineMessage.setVisibility(View.VISIBLE);
viewHolder.secondLineMessage.setText(statusText.trim());
}
viewHolder.statusIcon.setImageLevel(contact.getStatusMode().getStatusLevel()); viewHolder.statusIcon.setImageLevel(contact.getStatusMode().getStatusLevel());
return view; return view;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment