-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Fixed issue #3195 ordering contribution list #3589
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
app/src/main/java/fr/free/nrw/commons/contributions/ContributionComparator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,6 +21,7 @@ | |
import com.google.android.material.floatingactionbutton.FloatingActionButton; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collections; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you revert this? |
||
import java.util.List; | ||
|
||
import javax.inject.Inject; | ||
|
@@ -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); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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, thedateUploaded
field itself seems to be marked as@Nullable
. So, I think it might be better to handle the possiblenull
. I'll defer the decision to the other reviewers, though.There was a problem hiding this comment.
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