From 65743257dd608cd269cf6793b271a4b0392a32c4 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 25 Jul 2017 13:13:54 +0300 Subject: [PATCH 1/3] added friend request accept --- .../communicator/mvp/presenters/HistoryPresenter.java | 6 +++--- .../mobile/communicator/ui/adapters/HistoryAdapter.java | 1 + .../communicator/ui/adapters/viewholders/HistoryVh.java | 5 +++-- .../communicator/ui/fragments/contacts/HistoryFragment.java | 3 +-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/HistoryPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/HistoryPresenter.java index c5b2c32c1c..836e65fa24 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/HistoryPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/HistoryPresenter.java @@ -12,12 +12,12 @@ import java.util.ArrayList; public class HistoryPresenter extends BasePresenter { @Override protected Class[] getFilter() { - //TODO HZ + //TODO something in case you accept friend request from other device return new Class[0]; } @Override protected void handleResponse(Response response) { - //TODO HZ + //TODO something in case you accept friend request from other device } public void getHistory(){ @@ -26,7 +26,7 @@ public class HistoryPresenter extends BasePresenter { } public void acceptContact(Contact item) { - //TODO + mDataManager.confirmFriendRequest(item.phoneId); } public ArrayList filterList(ArrayList userList, String userPhone) { diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java index 44b198c248..0acd3f8e0d 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java @@ -28,6 +28,7 @@ public class HistoryAdapter extends BaseAdapter { @Override public void onBindViewHolder(BaseViewHolder holder, int position) { + super.onBindViewHolder(holder, position); holder.setData(getItem(position)); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/HistoryVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/HistoryVh.java index b1391f20f0..d8154179f8 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/HistoryVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/HistoryVh.java @@ -36,12 +36,13 @@ public class HistoryVh extends BaseViewHolder { mAdd.setText(getContext().getString(R.string.history_added)); mAdd.setGravity(Gravity.END | Gravity.CENTER_VERTICAL); mAdd.setBackground(null); - mAdd.setTextColor(ContextCompat.getColor(getContext(), R.color.white)); + mAdd.setTextColor(ContextCompat.getColor(getContext(), R.color.pencil_color)); } else if (Contact.ACCEPT.equalsIgnoreCase(status)) { mAdd.setText(getContext().getString(R.string.history_accept)); mAdd.setGravity(Gravity.CENTER); mAdd.setBackgroundResource(R.drawable.red_round_button); - mAdd.setTextColor(ContextCompat.getColor(getContext(), R.color.pencil_color)); + mAdd.setTextColor(ContextCompat.getColor(getContext(), R.color.white)); + mAdd.setOnClickListener(v -> mListener.onItemClick(item, getAdapterPosition())); } else if (Contact.REQUESTED.equalsIgnoreCase(status)) { mAdd.setText(getContext().getString(R.string.history_requested)); mAdd.setGravity(Gravity.END | Gravity.CENTER_VERTICAL); diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/HistoryFragment.java b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/HistoryFragment.java index d4a1e828d2..d3fb72dd09 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/HistoryFragment.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/contacts/HistoryFragment.java @@ -12,7 +12,6 @@ import android.widget.ProgressBar; import com.arellomobile.mvp.presenter.InjectPresenter; import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.Contact; -import com.ninja.mobile.communicator.data.models.mqtt.History; import com.ninja.mobile.communicator.mvp.presenters.HistoryPresenter; import com.ninja.mobile.communicator.mvp.view.HistoryView; import com.ninja.mobile.communicator.ui.adapters.HistoryAdapter; @@ -31,7 +30,7 @@ public class HistoryFragment extends BaseFragment implements HistoryView { private HistoryAdapter mAdapter; - public static HistoryFragment newInstance(){ + public static HistoryFragment newInstance() { return new HistoryFragment(); } -- GitLab From 673695c69e584c72b7655316f8953db060014846 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 25 Jul 2017 13:29:13 +0300 Subject: [PATCH 2/3] removed on bind view holder --- .../ninja/mobile/communicator/ui/adapters/HistoryAdapter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java index 0acd3f8e0d..f35e94f75e 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java @@ -29,7 +29,6 @@ public class HistoryAdapter extends BaseAdapter { @Override public void onBindViewHolder(BaseViewHolder holder, int position) { super.onBindViewHolder(holder, position); - holder.setData(getItem(position)); } -- GitLab From b9f122399f5abd91226710c92b21ac242bc1bcb2 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 25 Jul 2017 13:31:40 +0300 Subject: [PATCH 3/3] removed on bind view holder full method --- .../mobile/communicator/ui/adapters/HistoryAdapter.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java index f35e94f75e..061b03f608 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/HistoryAdapter.java @@ -26,10 +26,4 @@ public class HistoryAdapter extends BaseAdapter { return new HistoryVh(parent); } - @Override - public void onBindViewHolder(BaseViewHolder holder, int position) { - super.onBindViewHolder(holder, position); - } - - } -- GitLab