Merge branch 'devel' into feature/nextgen
# Conflicts: # app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
This commit is contained in:
@@ -7,6 +7,7 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.AdapterView
|
||||
import android.widget.ArrayAdapter
|
||||
import android.widget.Filter
|
||||
import androidx.core.graphics.Insets
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.core.view.updateLayoutParams
|
||||
@@ -115,7 +116,7 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
|
||||
|
||||
private fun initSortSpinner() {
|
||||
val entries = FavouriteCategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
|
||||
val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, entries)
|
||||
val adapter = SortAdapter(this, entries)
|
||||
binding.editSort.setAdapter(adapter)
|
||||
binding.editSort.onItemClickListener = this
|
||||
}
|
||||
@@ -127,6 +128,19 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
|
||||
return FavouriteCategoriesActivity.SORT_ORDERS.getOrNull(index) ?: SortOrder.NEWEST
|
||||
}
|
||||
|
||||
private class SortAdapter(
|
||||
context: Context,
|
||||
entries: List<String>,
|
||||
) : ArrayAdapter<String>(context, android.R.layout.simple_spinner_dropdown_item, entries) {
|
||||
|
||||
override fun getFilter(): Filter = EmptyFilter
|
||||
|
||||
private object EmptyFilter : Filter() {
|
||||
override fun performFiltering(constraint: CharSequence?) = FilterResults()
|
||||
override fun publishResults(constraint: CharSequence?, results: FilterResults?) = Unit
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
private const val EXTRA_ID = "id"
|
||||
|
||||
Reference in New Issue
Block a user