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 c5b2c32c1c840ccf2c61c8f8d6ab8e486909382f..836e65fa24c30c14f58c249e1dd7aa124fd56f22 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 44b198c248ccf830e764acca1a2a434324c0dda2..061b03f608ac6528d18005be4bc9ac9a83da0236 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) { - 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 b1391f20f033bea14ab56be061762c5c4353ce4f..d8154179f86aadc1c89b34adc57bcceb92e30633 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 d4a1e828d26fa9d54805ffcb46bad80639a2bfee..d3fb72dd098226b31858211b44de39208884edc3 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(); }