Fix rebase
This commit is contained in:
parent
77863e2e88
commit
7583b0a358
@ -93,7 +93,7 @@ class UserListFragment @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
override fun onDestroyView() {
|
||||||
recyclerView.cleanup()
|
userListRecyclerView.cleanup()
|
||||||
super.onDestroyView()
|
super.onDestroyView()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,7 +115,7 @@ class UserListFragment @Inject constructor(
|
|||||||
private fun setupRecyclerView() {
|
private fun setupRecyclerView() {
|
||||||
userListController.callback = this
|
userListController.callback = this
|
||||||
// Don't activate animation as we might have way to much item animation when filtering
|
// Don't activate animation as we might have way to much item animation when filtering
|
||||||
recyclerView.configureWith(userListController, disableItemAnimation = true)
|
userListRecyclerView.configureWith(userListController, disableItemAnimation = true)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupSearchView() {
|
private fun setupSearchView() {
|
||||||
|
@ -122,7 +122,7 @@
|
|||||||
tools:visibility="visible" />
|
tools:visibility="visible" />
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/knownUsersRecyclerView"
|
android:id="@+id/userListRecyclerView"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:fastScrollEnabled="true"
|
android:fastScrollEnabled="true"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user