Skip to content

sort vowels to the end of the trackers animation to avoid dodgy words #852

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
merged 3 commits into from
Jun 8, 2020
Merged

sort vowels to the end of the trackers animation to avoid dodgy words #852

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
723279b
sort vowels to the end of the trackers animation to avoid dodgy words
brindy Jun 8, 2020
0716eda
extract sorting logic to private sequence extension
brindy Jun 8, 2020
0d2fdee
fix lint problem
brindy Jun 8, 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
5 changes: 5 additions & 0 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserTrackersAnimatorHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ class BrowserTrackersAnimatorHelper {
.asSequence()
.distinct()
.take(MAX_LOGOS_SHOWN + 1)
.sortedWithDisplayNamesStartingWithVowelsToTheEnd()
.map {
val resId = TrackersRenderer().networkLogoIcon(activity, it.name)
if (resId == null) {
Expand Down Expand Up @@ -417,6 +418,10 @@ class BrowserTrackersAnimatorHelper {
}
}

private fun Sequence<Entity>.sortedWithDisplayNamesStartingWithVowelsToTheEnd(): Sequence<Entity> {
return sortedWith(compareBy { "AEIOU".contains(it.displayName.take(1)) })
}

companion object {
private const val TRACKER_LOGOS_DELAY_ON_SCREEN = 2400L
private const val DEFAULT_ANIMATION_DURATION = 150L
Expand Down