Create RecyclerView extensions and cleanup all the recycler views

vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt

@@ -18,10 +18,10 @@ package im.vector.riotx.features.debug.sas
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import im.vector.matrix.android.api.crypto.getAllVerificationEmojis
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 
 class DebugSasEmojiActivity : AppCompatActivity() {
@@ -29,9 +29,9 @@ class DebugSasEmojiActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.fragment_generic_recycler)
+        // TODO Inject
         val controller = SasEmojiController()
-        recyclerView.adapter = controller.adapter
+        recyclerView.configureWith(controller)
-        recyclerView.layoutManager = LinearLayoutManager(this)
         controller.setData(SasState(getAllVerificationEmojis()))
     }
 

vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt

@@ -16,12 +16,22 @@
 
 package im.vector.riotx.core.extensions
 
-import android.content.Context
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
 
-fun RecyclerView.configureWith(context: Context, controller: EpoxyController) {
+/**
-
+ * Apply a Vertical LinearLayout Manager to the recyclerView and set the adapter from the epoxy controller
+ */
+fun RecyclerView.configureWith(epoxyController: EpoxyController,
+                               itemAnimator: RecyclerView.ItemAnimator? = null,
+                               itemDecoration: RecyclerView.ItemDecoration? = null,
+                               hasFixedSize: Boolean = true) {
+    layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+    itemAnimator?.let { this.itemAnimator = it }
+    itemDecoration?.let { addItemDecoration(it) }
+    setHasFixedSize(hasFixedSize)
+    adapter = epoxyController.adapter
 }
 
 /**

vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt

@@ -18,11 +18,11 @@ package im.vector.riotx.features.crypto.keysbackup.settings
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
 import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
@@ -39,8 +39,7 @@ class KeysBackupSettingsFragment @Inject constructor(private val keysBackupSetti
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        keysBackupSettingsRecyclerView.layoutManager = LinearLayoutManager(requireContext())
+        keysBackupSettingsRecyclerView.configureWith(keysBackupSettingsRecyclerViewController)
-        keysBackupSettingsRecyclerView.adapter = keysBackupSettingsRecyclerViewController.adapter
         keysBackupSettingsRecyclerViewController.listener = this
     }
 

vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomDirectoryUsersFragment.kt

@@ -18,17 +18,12 @@ package im.vector.riotx.features.home.createdirect
 
 import android.os.Bundle
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.textChanges
 import im.vector.matrix.android.api.session.user.model.User
 import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.*
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.setupAsSearch
-import im.vector.riotx.core.extensions.showKeyboard
 import im.vector.riotx.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_create_direct_room_directory_users.*
 import javax.inject.Inject
@@ -58,10 +53,8 @@ class CreateDirectRoomDirectoryUsersFragment @Inject constructor(
     }
 
     private fun setupRecyclerView() {
-        recyclerView.setHasFixedSize(true)
         directRoomController.callback = this
-        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(directRoomController)
-        recyclerView.adapter = directRoomController.adapter
     }
 
     private fun setupSearchByMatrixIdView() {

vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomKnownUsersFragment.kt

@@ -24,7 +24,6 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ScrollView
 import androidx.core.view.size
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.chip.Chip
@@ -32,10 +31,7 @@ import com.google.android.material.chip.ChipGroup
 import com.jakewharton.rxbinding3.widget.textChanges
 import im.vector.matrix.android.api.session.user.model.User
 import im.vector.riotx.R
-import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.*
-import im.vector.riotx.core.extensions.hideKeyboard
-import im.vector.riotx.core.extensions.observeEvent
-import im.vector.riotx.core.extensions.setupAsSearch
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.core.utils.DimensionConverter
 import kotlinx.android.synthetic.main.fragment_create_direct_room.*
@@ -102,12 +98,10 @@ class CreateDirectRoomKnownUsersFragment @Inject constructor(
     }
 
     private fun setupRecyclerView() {
-        recyclerView.setHasFixedSize(true)
         // Don't activate animation as we might have way to much item animation when filtering
         recyclerView.itemAnimator = null
         knownUsersController.callback = this
-        recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        recyclerView.configureWith(knownUsersController)
-        recyclerView.adapter = knownUsersController.adapter
     }
 
     private fun setupFilterView() {

vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt

@@ -18,19 +18,18 @@ package im.vector.riotx.features.home.group
 
 import android.os.Bundle
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.fragmentViewModel
 import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.extensions.observeEvent
 import im.vector.riotx.core.platform.StateView
 import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.HomeSharedActionViewModel
 import im.vector.riotx.features.home.HomeActivitySharedAction
+import im.vector.riotx.features.home.HomeSharedActionViewModel
 import kotlinx.android.synthetic.main.fragment_group_list.*
 import javax.inject.Inject
 
@@ -49,8 +48,7 @@ class GroupListFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
         groupController.callback = this
         stateView.contentView = groupListView
-        groupListView.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+        groupListView.configureWith(groupController)
-        groupListView.adapter = groupController.adapter
         viewModel.subscribe { renderState(it) }
         viewModel.openGroupLiveData.observeEvent(this) {
             sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)

vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt

@@ -18,10 +18,10 @@ package im.vector.riotx.features.home.room.breadcrumbs
 
 import android.os.Bundle
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.fragmentViewModel
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.features.home.room.detail.RoomDetailSharedAction
 import im.vector.riotx.features.home.room.detail.RoomDetailSharedActionViewModel
@@ -52,11 +52,8 @@ class BreadcrumbsFragment @Inject constructor(
     }
 
     private fun setupRecyclerView() {
-        val layoutManager = LinearLayoutManager(context)
+        breadcrumbsRecyclerView.configureWith(breadcrumbsController, BreadcrumbsAnimator(), hasFixedSize = false)
-        breadcrumbsRecyclerView.layoutManager = layoutManager
-        breadcrumbsRecyclerView.itemAnimator = BreadcrumbsAnimator()
         breadcrumbsController.listener = this
-        breadcrumbsRecyclerView.setController(breadcrumbsController)
     }
 
     private fun renderState(state: BreadcrumbsViewState) {

vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt

@@ -21,7 +21,6 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -30,6 +29,7 @@ import com.airbnb.mvrx.args
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
 import kotlinx.android.parcel.Parcelize
@@ -65,8 +65,7 @@ class DisplayReadReceiptsBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(epoxyController, hasFixedSize = false)
-        recyclerView.adapter = epoxyController.adapter
         bottomSheetTitle.text = getString(R.string.seen_by)
         epoxyController.setData(displayReadReceiptArgs.readReceipts)
     }

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt

@@ -25,7 +25,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.VisibilityState
-import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.message.*
 import im.vector.matrix.android.api.session.room.timeline.Timeline
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt

@@ -19,7 +19,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -28,8 +27,10 @@ import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import kotlinx.android.synthetic.main.activity_image_media_viewer.*
 import javax.inject.Inject
 
 /**
@@ -62,8 +63,7 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
-        recyclerView.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(messageActionsEpoxyController, hasFixedSize = false)
-        recyclerView.adapter = messageActionsEpoxyController.adapter
         // Disable item animation
         recyclerView.itemAnimator = null
         messageActionsEpoxyController.listener = this
@@ -88,7 +88,7 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message
 
     override fun didSelectMenuAction(eventAction: EventSharedAction) {
         if (eventAction is EventSharedAction.ReportContent) {
-            // Toggle report menu
+            // Toggle report menu // TODO Reanable item animation?
             viewModel.handle(MessageActionsAction.ToggleReportMenu)
         } else {
             sharedActionViewModel.post(eventAction)

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt

@@ -19,9 +19,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
 import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -31,6 +29,7 @@ import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
@@ -67,10 +66,10 @@ class ViewEditHistoryBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        recyclerView.adapter = epoxyController.adapter
+        recyclerView.configureWith(
-        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+                epoxyController,
-        val dividerItemDecoration = DividerItemDecoration(requireContext(), LinearLayout.VERTICAL)
+                itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL),
-        recyclerView.addItemDecoration(dividerItemDecoration)
+                hasFixedSize = false)
         bottomSheetTitle.text = context?.getString(R.string.message_edits)
     }
 
@@ -79,7 +78,6 @@ class ViewEditHistoryBottomSheet : VectorBaseBottomSheetDialogFragment() {
         super.onDestroyView()
     }
 
-
     override fun invalidate() = withState(viewModel) {
         epoxyController.setData(it)
         super.invalidate()

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt

@@ -64,7 +64,6 @@ class ContentUploadStateTrackerBinder @Inject constructor(private val activeSess
             it.contentUploadProgressTracker().clear()
         }
     }
-
 }
 
 private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt

@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -30,6 +29,7 @@ import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
@@ -62,8 +62,7 @@ class ViewReactionsBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(epoxyController, hasFixedSize = false)
-        recyclerView.adapter = epoxyController.adapter
         bottomSheetTitle.text = context?.getString(R.string.reactions)
     }
 

vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt

@@ -21,7 +21,6 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -30,6 +29,7 @@ import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.navigation.Navigator
 import kotlinx.android.parcel.Parcelize
@@ -70,8 +70,7 @@ class RoomListQuickActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), R
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
-        recyclerView.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(roomListActionsEpoxyController, hasFixedSize = false)
-        recyclerView.adapter = roomListActionsEpoxyController.adapter
         // Disable item animation
         recyclerView.itemAnimator = null
         roomListActionsEpoxyController.listener = this

vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt

@@ -20,12 +20,12 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
 import butterknife.OnClick
 import com.airbnb.mvrx.args
 import im.vector.riotx.R
 import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.utils.openUrlInExternalBrowser
 import im.vector.riotx.features.login.AbstractLoginFragment
 import im.vector.riotx.features.login.LoginAction
@@ -57,9 +57,7 @@ class LoginTermsFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        loginTermsPolicyList.setHasFixedSize(true)
+        loginTermsPolicyList.configureWith(policyController)
-        loginTermsPolicyList.layoutManager = LinearLayoutManager(requireContext())
-        loginTermsPolicyList.adapter = policyController.adapter
         policyController.listener = this
 
         val list = ArrayList<LocalizedFlowDataLoginTermsChecked>()

vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt

@@ -18,12 +18,11 @@ package im.vector.riotx.features.reactions
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.core.utils.LiveEvent
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
@@ -50,11 +49,7 @@ class EmojiSearchResultFragment @Inject constructor(
             }
         }
 
-        val lmgr = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(epoxyController, itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL))
-        recyclerView.layoutManager = lmgr
-        val dividerItemDecoration = DividerItemDecoration(recyclerView.context, lmgr.orientation)
-        recyclerView.addItemDecoration(dividerItemDecoration)
-        recyclerView.adapter = epoxyController.adapter
     }
 
     override fun onDestroyView() {

vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt

@@ -19,7 +19,6 @@ package im.vector.riotx.features.roomdirectory
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
@@ -29,6 +28,7 @@ import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
 import im.vector.riotx.R
 import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.extensions.observeEvent
 import im.vector.riotx.core.platform.VectorBaseFragment
 import io.reactivex.rxkotlin.subscribeBy
@@ -103,9 +103,8 @@ class PublicRoomsFragment @Inject constructor(
     private fun setupRecyclerView() {
         val epoxyVisibilityTracker = EpoxyVisibilityTracker()
         epoxyVisibilityTracker.attach(publicRoomsList)
-        publicRoomsList.layoutManager = LinearLayoutManager(context)
+        publicRoomsList.configureWith(publicRoomsController)
         publicRoomsController.callback = this
-        publicRoomsList.adapter = publicRoomsController.adapter
     }
 
     override fun onPublicRoomClicked(publicRoom: PublicRoom, joinState: JoinState) {

vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt

@@ -19,12 +19,12 @@ package im.vector.riotx.features.roomdirectory.createroom
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel
@@ -69,10 +69,8 @@ class CreateRoomFragment @Inject constructor(private val createRoomController: C
     }
 
     private fun setupRecyclerView() {
-        val layoutManager = LinearLayoutManager(context)
+        createRoomForm.configureWith(createRoomController)
-        createRoomForm.layoutManager = layoutManager
         createRoomController.listener = this
-        createRoomForm.adapter = createRoomController.adapter
     }
 
     override fun onNameChange(newName: String) {

vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt

@@ -19,13 +19,13 @@ package im.vector.riotx.features.roomdirectory.picker
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.features.roomdirectory.RoomDirectoryAction
 import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction
@@ -80,10 +80,8 @@ class RoomDirectoryPickerFragment @Inject constructor(val roomDirectoryPickerVie
     }
 
     private fun setupRecyclerView() {
-        val layoutManager = LinearLayoutManager(context)
+        roomDirectoryPickerList.configureWith(roomDirectoryPickerController)
-        roomDirectoryPickerList.layoutManager = layoutManager
         roomDirectoryPickerController.callback = this
-        roomDirectoryPickerList.adapter = roomDirectoryPickerController.adapter
     }
 
     override fun onRoomDirectoryClicked(roomDirectoryData: RoomDirectoryData) {

vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt

@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.fragmentViewModel
@@ -28,6 +27,7 @@ import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.extensions.observeEvent
 import im.vector.riotx.core.platform.VectorBaseActivity
 import im.vector.riotx.core.platform.VectorBaseFragment
@@ -51,8 +51,7 @@ class VectorSettingsIgnoredUsersFragment @Inject constructor(
         waiting_view_status_text.setText(R.string.please_wait)
         waiting_view_status_text.isVisible = true
         ignoredUsersController.callback = this
-        recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        recyclerView.configureWith(ignoredUsersController)
-        recyclerView.adapter = ignoredUsersController.adapter
         ignoredUsersViewModel.requestErrorLiveData.observeEvent(this) {
             displayErrorDialog(it)
         }

vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt

@@ -19,13 +19,12 @@ package im.vector.riotx.features.settings.push
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseActivity
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.core.resources.StringProvider
@@ -50,12 +49,7 @@ class PushGatewaysFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val lmgr = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(epoxyController, itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL))
-        recyclerView.layoutManager = lmgr
-        val dividerItemDecoration = DividerItemDecoration(recyclerView.context,
-                lmgr.orientation)
-        recyclerView.addItemDecoration(dividerItemDecoration)
-        recyclerView.adapter = epoxyController.adapter
     }
 
     override fun onDestroyView() {
@@ -67,6 +61,7 @@ class PushGatewaysFragment @Inject constructor(
         epoxyController.setData(state)
     }
 
+    // TODO Move to a proper file
     class PushGateWayController(private val stringProvider: StringProvider) : TypedEpoxyController<PushGatewayViewState>() {
         override fun buildModels(data: PushGatewayViewState?) {
             data?.pushGateways?.invoke()?.let { pushers ->

vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt

@@ -18,13 +18,12 @@ package im.vector.riotx.features.settings.push
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.platform.VectorBaseActivity
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.core.resources.StringProvider
@@ -47,12 +46,7 @@ class PushRulesFragment : VectorBaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val lmgr = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.configureWith(epoxyController, itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL))
-        recyclerView.layoutManager = lmgr
-        val dividerItemDecoration = DividerItemDecoration(recyclerView.context,
-                lmgr.orientation)
-        recyclerView.addItemDecoration(dividerItemDecoration)
-        recyclerView.adapter = epoxyController.adapter
     }
 
     override fun onDestroyView() {

vector/src/main/res/layout/fragment_breadcrumbs.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.airbnb.epoxy.EpoxyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/breadcrumbsRecyclerView"
     android:layout_width="wrap_content"