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 1effc4536f29ec1e82a2d6f5d831fdc6d699e3f7..ba12efd1d44427893693030bead6dc9301d4e526 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 @@ -17,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())); } } @@ -38,6 +38,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) (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 a12b3537e27be4dbe29ff6f48c8465b6b2e59d38..4875fdd1159fc77bbbf934b06aff32ed3d7f0ac6 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,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); } diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 14f7f1f7275118911d4b2c00a678ee5913e28f03..2b16eabe24da8fe3d852fdd776025eaef427165b 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