From 99ed39481f6c3567f5304bdced46adfc64d0b434 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 8 Aug 2017 12:57:09 +0300 Subject: [PATCH 1/3] working commit, need to check margins, --- .../ui/fragments/contacts/HistoryFragment.java | 3 +-- app/src/main/res/layout/fragment_history.xml | 11 ++++++++++- app/src/main/res/values/strings.xml | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) 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 a12b3537e2..70b8d5412a 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 @@ -15,7 +15,6 @@ import com.ninja.mobile.communicator.data.models.mqtt.Contact; import com.ninja.mobile.communicator.mvp.presenters.HistoryPresenter; import com.ninja.mobile.communicator.mvp.view.HistoryView; import com.ninja.mobile.communicator.ui.adapters.HistoryAdapter; -import com.ninja.mobile.communicator.ui.adapters.decorators.SpacesItemDecoration; import com.ninja.mobile.communicator.ui.base.BaseFragment; import java.util.List; @@ -50,7 +49,7 @@ public class HistoryFragment extends BaseFragment implements HistoryView { @Override public void setAllContacts(List contactList) { HistoryAdapter adapter = new HistoryAdapter(contactList, (item, position) -> mPresenter.acceptContact(item)); mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - mRecyclerView.addItemDecoration(new SpacesItemDecoration(0, 0, 16, 16)); +// mRecyclerView.addItemDecoration(new SpacesItemDecoration(0, 0, 16, 16)); mRecyclerView.setAdapter(adapter); } diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 14f7f1f727..2b16eabe24 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -4,11 +4,20 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + tools:listitem="@layout/li_history" + android:layout_below="@+id/screen_name" /> Accept Added Requested + History Switch to Audio -- GitLab From 6db2e0b550ea6a295b78cc6bfeade31767651811 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 8 Aug 2017 13:57:50 +0300 Subject: [PATCH 2/3] added history sort --- .../communicator/mvp/presenters/HistoryPresenter.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 1effc4536f..641004e093 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 @@ -6,6 +6,7 @@ import com.ninja.mobile.communicator.data.models.mqtt.Response; import com.ninja.mobile.communicator.mvp.view.HistoryView; import java.util.ArrayList; +import java.util.Collections; @InjectViewState @@ -38,6 +39,11 @@ public class HistoryPresenter extends BasePresenter { filtredList.add(contact); } } + + Collections.sort(filtredList, (o1, o2) -> { + if (o1.update == null || o2.update == null) return 0; + return (int) (o1.update - o2.update); + }); return filtredList; } } -- GitLab From 847163719ddca6e7c06b5281dde762f2038f5e2a Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 8 Aug 2017 14:30:34 +0300 Subject: [PATCH 3/3] added history sort, removed layout compression on add request --- .../mobile/communicator/mvp/presenters/HistoryPresenter.java | 5 ++--- .../communicator/ui/fragments/contacts/HistoryFragment.java | 1 - 2 files changed, 2 insertions(+), 4 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 641004e093..ba12efd1d4 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 @@ -18,8 +18,7 @@ public class HistoryPresenter extends BasePresenter { @Override protected void handleResponse(Response response) { if (response.data instanceof Contact) { - getViewState().setAllContacts(filterList( - mDataManager.getProfile().getRoster().userlist, mDataManager.getPhoneNumber())); + getViewState().setAllContacts(filterList(mDataManager.getProfile().getRoster().userlist, mDataManager.getPhoneNumber())); } } @@ -42,7 +41,7 @@ public class HistoryPresenter extends BasePresenter { Collections.sort(filtredList, (o1, o2) -> { if (o1.update == null || o2.update == null) return 0; - return (int) (o1.update - o2.update); + return (int) (o2.update - o1.update); }); return filtredList; } 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 70b8d5412a..4875fdd115 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 @@ -49,7 +49,6 @@ public class HistoryFragment extends BaseFragment implements HistoryView { @Override public void setAllContacts(List contactList) { HistoryAdapter adapter = new HistoryAdapter(contactList, (item, position) -> mPresenter.acceptContact(item)); mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); -// mRecyclerView.addItemDecoration(new SpacesItemDecoration(0, 0, 16, 16)); mRecyclerView.setAdapter(adapter); } -- GitLab