Fixed crash + added missing hint in contacts filter bar
This commit is contained in:
parent
747ce18803
commit
acc9edf4f6
2 changed files with 3 additions and 1 deletions
|
@ -94,6 +94,7 @@
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:contentDescription="@string/content_description_search_contact"
|
android:contentDescription="@string/content_description_search_contact"
|
||||||
|
android:hint="@string/chat_room_creation_filter_hint"
|
||||||
android:textCursorDrawable="@null"
|
android:textCursorDrawable="@null"
|
||||||
android:id="@+id/searchField"
|
android:id="@+id/searchField"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
@ -108,7 +108,8 @@ public class ContactAvatar {
|
||||||
holder.contactPicture.setVisibility(View.VISIBLE);
|
holder.contactPicture.setVisibility(View.VISIBLE);
|
||||||
holder.generatedAvatar.setVisibility(View.GONE);
|
holder.generatedAvatar.setVisibility(View.GONE);
|
||||||
} else {
|
} else {
|
||||||
holder.generatedAvatar.setText(generateAvatar(contact.getFullName()));
|
holder.generatedAvatar.setText(generateAvatar(contact.getFullName() == null ?
|
||||||
|
contact.getFirstName() + " " + contact.getLastName() : contact.getFullName()));
|
||||||
holder.generatedAvatar.setVisibility(View.VISIBLE);
|
holder.generatedAvatar.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue