Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 16f8170

Browse files
author
Evgenii Kanivets
authored
Merge pull request #115 from evgenii-kanivets/111_sort_users_by_rating
#111. Add some fixes.
2 parents 0954569 + 84b098f commit 16f8170

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

app/src/main/java/com/bogdan/codeforceswatcher/activity/MainActivity.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ class MainActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener,
8787
liveData.observe(this, Observer<List<User>> { userList ->
8888
userList?.let {
8989
when (counterIcon) {
90-
0 -> userAdapter.setItems(it.sortedBy(User::rating))
90+
0 -> userAdapter.setItems(it.reversed())
9191
1 -> userAdapter.setItems(it.sortedByDescending(User::rating))
92-
2 -> userAdapter.setItems(it.reversed())
92+
2 -> userAdapter.setItems(it.sortedBy(User::rating))
9393
}
9494
}
9595
})
@@ -111,16 +111,16 @@ class MainActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener,
111111
val users = CwApp.app.userDao.getAll()
112112
when (counterIcon) {
113113
0 -> {
114-
userAdapter.setItems(users.sortedBy { it.rating })
115-
item.icon = resources.getDrawable(R.drawable.ic_sort_descending_white)
114+
userAdapter.setItems(users.reversed())
115+
item.icon = resources.getDrawable(R.drawable.ic_sort_descending_grey)
116116
}
117117
1 -> {
118118
userAdapter.setItems(users.sortedByDescending { it.rating })
119-
item.icon = resources.getDrawable(R.drawable.ic_sort_ascending)
119+
item.icon = resources.getDrawable(R.drawable.ic_sort_descending_white)
120120
}
121121
2 -> {
122-
userAdapter.setItems(users.reversed())
123-
item.icon = resources.getDrawable(R.drawable.ic_sort_descending_grey)
122+
userAdapter.setItems(users.sortedBy { it.rating })
123+
item.icon = resources.getDrawable(R.drawable.ic_sort_ascending)
124124
}
125125
}
126126
}

0 commit comments

Comments
 (0)