Improved sortFavourites readability

This commit is contained in:
merkost
2023-07-22 00:05:25 +10:00
parent 955efe9442
commit fd24f1ed6c

View File

@ -154,19 +154,16 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
} }
private fun List<Contact>.sortFavourites(shouldSort: Boolean = true): List<Contact> { private fun List<Contact>.sortFavourites(shouldSort: Boolean = true): List<Contact> {
return if (shouldSort) { val favoritesOrder = activity?.config?.favoritesContactsOrder
val favoritesOrder = activity!!.config.favoritesContactsOrder if (!shouldSort || favoritesOrder.isNullOrEmpty()) {
return this
}
if (favoritesOrder.isEmpty()) { val orderList = Converters().jsonToStringList(favoritesOrder)
return this val map = orderList.withIndex().associate { it.value to it.index }
}
val orderList = Converters().jsonToStringList(favoritesOrder) return sortedBy { contact ->
val map = orderList.withIndex().associate { it.value to it.index } map[contact.id.toString()]
return sortedBy { map[it.id.toString()] }
} else {
this
} }
} }