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 af66d70d02a99fa540a8da9e764acaa06de98378..6fabc623cc2f42121ce19b35ff58f2c8cc218eae 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 4b57b54e9e1b8c1ebf33d7628dd2ff599297010a..7e2837858db841206450b35830c0ecfbe7fe779e 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 8217b2cf2943150ae113f8ecc0dcfa0dccee8c4b..88c50f5c8325c5d6e0175da5f09e8bf65815382b 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 e3aa3a83f2932e76fd7ffa361c0be38dd0a8b91c..a43cff4aa7e8d8081dccff50e7ff10df84ddc9e4 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" />