prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missed git conflicts

Browse Source
This commit is contained in:
Koitharu
2022-07-12 09:58:03 +03:00
parent 5b10d697f6
commit a36abe0272
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
View File

@@ -115,13 +115,8 @@ class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>
}
private fun initSortSpinner() {
<<<<<<< Updated upstream
val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, entries)
=======
val entries = FavouriteCategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
val adapter = SortAdapter(this, entries)
>>>>>>> Stashed changes
binding.editSort.setAdapter(adapter)
binding.editSort.onItemClickListener = this
}