Skip to content

Fixed issue #3195 ordering contribution list #3589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neslihanturan merged 2 commits into from
Apr 6, 2020
Merged

Fixed issue #3195 ordering contribution list #3589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9559453
issue-#3195: order contribution list refactored
isnirp Mar 28, 2020
9f941a4
issue-#3195: ordered contribution list
isnirp Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package fr.free.nrw.commons.contributions;

import java.util.Comparator;

public class ContributionComparator implements Comparator<Contribution> {

@Override
public int compare(Contribution c1, Contribution c2) {
return c1.dateUploaded.compareTo(c2.dateUploaded);
Copy link
Member

@sivaraam sivaraam Mar 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not really sure if this would happen practically but I believe there might chance of c1.dateUploaded being null (just as Android Studio suggests). To add to the suspicion, the dateUploaded field itself seems to be marked as @Nullable. So, I think it might be better to handle the possible null. I'll defer the decision to the other reviewers, though.

Copy link
Contributor Author

@isnirp isnirp Mar 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sivaraam you are right dateUploaded is marked @nullable hence my decision to use dateCreated. but since the value provided for them is synonymous it will work for now. Let's see what other reviewers have to say like you said... thanks

}
}
3 changes: 3 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.google.android.material.floatingactionbutton.FloatingActionButton;

import java.util.ArrayList;
import java.util.Collections;
Copy link
Collaborator

@ashishkumar468 ashishkumar468 Apr 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert this?

import java.util.List;

import javax.inject.Inject;
Expand Down Expand Up @@ -185,6 +186,8 @@ public void showNoContributionsUI(boolean shouldShow) {
}

public void setContributions(List<Contribution> contributionList) {
Collections.sort(contributionList, new ContributionComparator());
Collections.reverse(contributionList);
this.contributions.clear();
this.contributions.addAll(contributionList);
adapter.setContributions(contributions);
Expand Down