From a74853fa2e2708b82edc779c01b98f3ed68d81a7 Mon Sep 17 00:00:00 2001 From: Krocks Date: Mon, 14 Aug 2017 12:07:12 +0300 Subject: [PATCH] fixes to # 125 UI of contacts by marshal's ticket --- .../ui/adapters/viewholders/NynjaContactVh.java | 6 +++--- .../ui/fragments/contacts/NynjaContactsFragment.java | 2 +- .../main/res/layout/fragment_add_contact_from_phone.xml | 9 ++++----- ...t_roster_contacts.xml => fragment_nynja_contacts.xml} | 5 +++-- .../{li_roster_contact.xml => li_nynja_contact.xml} | 8 ++++++-- 5 files changed, 17 insertions(+), 13 deletions(-) rename app/src/main/res/layout/{fragment_roster_contacts.xml => fragment_nynja_contacts.xml} (80%) rename app/src/main/res/layout/{li_roster_contact.xml => li_nynja_contact.xml} (92%) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/NynjaContactVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/NynjaContactVh.java index af66d70d02..6fabc623cc 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/NynjaContactVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/NynjaContactVh.java @@ -24,17 +24,17 @@ public class NynjaContactVh extends BaseViewHolder { private Contact mItem; public NynjaContactVh(ViewGroup parent) { - super(parent, R.layout.li_roster_contact); + super(parent, R.layout.li_nynja_contact); } public NynjaContactVh(ViewGroup parent, OnItemClickListener onItemClickListener) { - super(parent, R.layout.li_roster_contact, onItemClickListener); + super(parent, R.layout.li_nynja_contact, onItemClickListener); } @Override public void setData(Contact item) { mItem = item; mName.setText(item.getFullName()); - mPhoneNick.setText(item.getPhone()); + mPhoneNick.setText(item.getFormattedPhone(item.getPhone())); itemView.setOnClickListener((view) -> mListener.onItemClick(item, getAdapterPosition())); Glide.with(getContext()).load(item.avatar).placeholder(R.drawable.contact_placeholder).into(mPhoto); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/NynjaContactsFragment.java b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/NynjaContactsFragment.java index 4b57b54e9e..7e2837858d 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/NynjaContactsFragment.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/NynjaContactsFragment.java @@ -34,7 +34,7 @@ public class NynjaContactsFragment extends BaseFragment implements NynjaContacts @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_roster_contacts, container, false); + return inflater.inflate(R.layout.fragment_nynja_contacts, container, false); } @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { diff --git a/app/src/main/res/layout/fragment_add_contact_from_phone.xml b/app/src/main/res/layout/fragment_add_contact_from_phone.xml index 8217b2cf29..88c50f5c83 100644 --- a/app/src/main/res/layout/fragment_add_contact_from_phone.xml +++ b/app/src/main/res/layout/fragment_add_contact_from_phone.xml @@ -1,8 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_roster_contacts.xml b/app/src/main/res/layout/fragment_nynja_contacts.xml similarity index 80% rename from app/src/main/res/layout/fragment_roster_contacts.xml rename to app/src/main/res/layout/fragment_nynja_contacts.xml index e3aa3a83f2..a43cff4aa7 100644 --- a/app/src/main/res/layout/fragment_roster_contacts.xml +++ b/app/src/main/res/layout/fragment_nynja_contacts.xml @@ -6,11 +6,12 @@ android:orientation="vertical"> + tools:listItem="@layout/li_roster_contact" /> + tools:text="Richard Smith" /> + tools:text="User phone" + android:textColor="@color/li.history.phone.text.color" />