Merge branch 'bugfix/28-fix-app-crash-on-search' into 'develop'

#28: Create adapter after repo initialization

See merge request funkwhale/funkwhale-android!106
This commit is contained in:
Ryan Harg 2021-09-12 07:34:35 +00:00
commit e67f7a787b
1 changed files with 11 additions and 11 deletions

View File

@ -52,17 +52,6 @@ class SearchActivity : AppCompatActivity() {
setContentView(binding.root)
adapter =
SearchAdapter(
layoutInflater,
this,
SearchResultClickListener(),
FavoriteListener(favoritesRepository)
).also {
binding.results.layoutManager = LinearLayoutManager(this)
binding.results.adapter = it
}
binding.search.requestFocus()
}
@ -97,6 +86,17 @@ class SearchActivity : AppCompatActivity() {
tracksRepository = TracksSearchRepository(this@SearchActivity, "")
favoritesRepository = FavoritesRepository(this@SearchActivity)
adapter =
SearchAdapter(
layoutInflater,
this,
SearchResultClickListener(),
FavoriteListener(favoritesRepository)
).also {
binding.results.layoutManager = LinearLayoutManager(this)
binding.results.adapter = it
}
binding.search.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(rawQuery: String?): Boolean {