Skip to content
This repository was archived by the owner on Feb 17, 2020. It is now read-only.

Commit a76281c

Browse files
committed
Make SearchAdapter only deal in search result items
1 parent fd08dbc commit a76281c

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

app/src/main/java/net/squanchy/search/view/SearchAdapter.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import net.squanchy.schedule.view.EventItemView
1515
import net.squanchy.search.SearchListElement
1616
import net.squanchy.search.SearchListElement.EventElement
1717
import net.squanchy.search.SearchListElement.SpeakerElement
18-
import net.squanchy.search.SearchResult
1918
import net.squanchy.search.view.SearchItemViewHolder.AlgoliaLogoViewHolder
2019
import net.squanchy.search.view.SearchItemViewHolder.HeaderViewHolder
2120
import net.squanchy.search.view.SearchItemViewHolder.SearchEventViewHolder
@@ -28,8 +27,6 @@ internal class SearchAdapter(activity: AppCompatActivity) : ListAdapter<SearchLi
2827

2928
private lateinit var listener: SearchRecyclerView.OnSearchResultClickListener
3029

31-
private var searchResult = SearchResult.Success(emptyList())
32-
3330
init {
3431
this.activity = activity
3532

@@ -95,19 +92,17 @@ internal class SearchAdapter(activity: AppCompatActivity) : ListAdapter<SearchLi
9592

9693
private fun isEmpty() = itemCount == 0
9794

98-
fun updateWith(searchResult: SearchResult.Success, listener: SearchRecyclerView.OnSearchResultClickListener) {
95+
fun updateWith(items: List<SearchListElement>, listener: SearchRecyclerView.OnSearchResultClickListener) {
9996
this.listener = listener
100-
this.searchResult = searchResult
101-
102-
super.submitList(searchResult.elements)
97+
super.submitList(items)
10398
}
10499

105100
@Deprecated(
106101
message = "Use updateWith() instead",
107-
replaceWith = ReplaceWith("updateWith(searchResult, onSearchResultClickListener)"),
102+
replaceWith = ReplaceWith("updateWith(items, onSearchResultClickListener)"),
108103
level = DeprecationLevel.ERROR
109104
)
110-
override fun submitList(list: MutableList<SearchListElement>?) {
105+
override fun submitList(items: MutableList<SearchListElement>?) {
111106
throw UnsupportedOperationException("Use updateWith() instead")
112107
}
113108

app/src/main/java/net/squanchy/search/view/SearchRecyclerView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SearchRecyclerView @JvmOverloads constructor(
4242
fun updateWith(searchResult: SearchResult.Success, listener: OnSearchResultClickListener) {
4343
setAdapterIfNone(adapter)
4444

45-
adapter.updateWith(searchResult, listener)
45+
adapter.updateWith(searchResult.elements, listener)
4646

4747
val spanSizeLookup = adapter.createSpanSizeLookup(columnsCount)
4848
(layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup

0 commit comments

Comments
 (0)