fenix
/
Simple-Contacts
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated sortFavourites function

This commit is contained in:
merkost 2023-07-24 13:15:13 +10:00
parent f78edda1c4
commit 66f93e2ad8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
View File

@ -123,7 +123,13 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
val filtered = when (this) { val filtered = when (this) {
is GroupsFragment -> contacts is GroupsFragment -> contacts
is FavoritesFragment -> { is FavoritesFragment -> {
contacts.filter { it.starred == 1 }.sortFavourites(activity!!.config.isCustomOrderSelected) val favouriteContacts = contacts.filter { it.starred == 1 }
if (activity!!.config.isCustomOrderSelected) {
sortFavourites(favouriteContacts)
} else {
favouriteContacts
}
} }
else -> { else -> {
@ -153,16 +159,16 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
} }
} }
private fun List<Contact>.sortFavourites(shouldSort: Boolean = true): List<Contact> { private fun sortFavourites(contacts: List<Contact>): List<Contact> {
val favoritesOrder = activity?.config?.favoritesContactsOrder val favoritesOrder = activity?.config?.favoritesContactsOrder
if (!shouldSort || favoritesOrder.isNullOrEmpty()) { if (favoritesOrder.isNullOrEmpty()) {
return this return contacts
} }
val orderList = Converters().jsonToStringList(favoritesOrder) val orderList = Converters().jsonToStringList(favoritesOrder)
val map = orderList.withIndex().associate { it.value to it.index } val map = orderList.withIndex().associate { it.value to it.index }
return sortedBy { contact -> return contacts.sortedBy { contact ->
map[contact.id.toString()] map[contact.id.toString()]
} }
} }