From a74853fa2e2708b82edc779c01b98f3ed68d81a7 Mon Sep 17 00:00:00 2001 From: Krocks Date: Mon, 14 Aug 2017 12:07:12 +0300 Subject: [PATCH 1/2] 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" /> Date: Mon, 14 Aug 2017 13:06:15 +0300 Subject: [PATCH 2/2] fixes to UI according to #115 issue, chat UI --- .../viewholders/ChatOtherMessageVh.java | 8 --- app/src/main/res/layout/fragment_chat.xml | 2 +- .../res/layout/li_chat_my_image_message.xml | 8 ++- .../main/res/layout/li_chat_my_message.xml | 66 +++++++++++-------- .../layout/li_chat_other_image_message.xml | 6 +- .../main/res/layout/li_chat_other_message.xml | 37 ++++------- .../main/res/layout/partial_chat_header.xml | 7 +- app/src/main/res/values/dimen.xml | 5 ++ 8 files changed, 71 insertions(+), 68 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java index 64468c81c8..ff26f9904e 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java @@ -1,16 +1,12 @@ package com.ninja.mobile.communicator.ui.adapters.viewholders; -import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.Message; import com.ninja.mobile.communicator.intetfaces.OnItemClickListener; -import java.util.Date; - import butterknife.BindView; /** @@ -19,10 +15,8 @@ import butterknife.BindView; public class ChatOtherMessageVh extends BaseChatVh { - @BindView(R.id.li_chat_other_avatar) ImageView avatar; @BindView(R.id.li_chat_other_ime) TextView mTime; @BindView(R.id.li_chat_other_message) TextView mMessage; - @BindView(R.id.li_chat_other_user_name) TextView mUserName; public ChatOtherMessageVh(ViewGroup parent) { super(parent, R.layout.li_chat_other_message); @@ -37,7 +31,5 @@ public class ChatOtherMessageVh extends BaseChatVh { mMessage.setText(item.files.get(0).payload); long time = item.created == null ? System.currentTimeMillis() : item.created; mTime.setText(getTime(time)); - avatar.setVisibility(View.GONE); - mUserName.setVisibility(View.GONE); } } diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml index eb3fc92435..2aaf37b414 100644 --- a/app/src/main/res/layout/fragment_chat.xml +++ b/app/src/main/res/layout/fragment_chat.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - tools:listitem="@layout/li_chat_my_image_message" /> + tools:listitem="@layout/li_chat_other_message" /> + android:orientation="horizontal" + android:layout_marginTop="@dimen/chat.item.margin" + android:layout_marginBottom="@dimen/chat.item.margin"> diff --git a/app/src/main/res/layout/li_chat_my_message.xml b/app/src/main/res/layout/li_chat_my_message.xml index 5b74398f43..9b38ee3fa5 100644 --- a/app/src/main/res/layout/li_chat_my_message.xml +++ b/app/src/main/res/layout/li_chat_my_message.xml @@ -1,34 +1,48 @@ - - - + android:layout_marginStart="64dp" + android:layout_marginTop="@dimen/chat.item.margin" + android:layout_marginBottom="@dimen/chat.item.margin"> - - \ No newline at end of file + android:background="@drawable/grey_chat_bubble" + android:orientation="vertical" + android:paddingBottom="2dp" + android:paddingEnd="20dp" + android:paddingStart="20dp" + android:paddingTop="6dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/li_chat_other_image_message.xml b/app/src/main/res/layout/li_chat_other_image_message.xml index 5904a56dae..b239183f58 100644 --- a/app/src/main/res/layout/li_chat_other_image_message.xml +++ b/app/src/main/res/layout/li_chat_other_image_message.xml @@ -9,7 +9,9 @@ android:paddingBottom="4dp" android:paddingEnd="4dp" android:paddingStart="4dp" - android:paddingTop="4dp"> + android:paddingTop="4dp" + android:layout_marginTop="@dimen/chat.item.margin" + android:layout_marginBottom="@dimen/chat.item.margin"> \ No newline at end of file diff --git a/app/src/main/res/layout/li_chat_other_message.xml b/app/src/main/res/layout/li_chat_other_message.xml index b1746a7599..a8d50205c6 100644 --- a/app/src/main/res/layout/li_chat_other_message.xml +++ b/app/src/main/res/layout/li_chat_other_message.xml @@ -1,14 +1,16 @@ - + android:layout_height="wrap_content" + android:layout_marginEnd="36dp" + android:layout_marginStart="24dp" + android:layout_marginTop="@dimen/chat.item.margin" + android:layout_marginBottom="@dimen/chat.item.margin"> - + android:textSize="@dimen/chat.text.size" + tools:text="dsfsdfsdf" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/partial_chat_header.xml b/app/src/main/res/layout/partial_chat_header.xml index 188f3eaf8a..07d98c486c 100644 --- a/app/src/main/res/layout/partial_chat_header.xml +++ b/app/src/main/res/layout/partial_chat_header.xml @@ -16,17 +16,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:paddingRight="75dp" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingRight="75dp"> 240dp + + + 18sp + + -7dp \ No newline at end of file -- GitLab