Bottom sheet: fix RecyclerView usage

vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt

@@ -30,6 +30,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import im.vector.riotx.core.di.DaggerScreenComponent
 import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.utils.DimensionConverter
 import java.util.*
 
 /**
@@ -68,14 +69,11 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return super.onCreateDialog(savedInstanceState).apply {
+            val dialog = this as? BottomSheetDialog
+            bottomSheetBehavior = dialog?.behavior
+            bottomSheetBehavior?.setPeekHeight(DimensionConverter(resources).dpToPx(400), false)
             if (showExpanded) {
-                setOnShowListener { dialog ->
-                    val d = dialog as BottomSheetDialog
-
-                    val bottomSheet = d.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as FrameLayout?
-                    bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet!!)
-                    bottomSheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED
-                }
+                bottomSheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED
             }
         }
     }

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

@@ -23,9 +23,10 @@ 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
-import com.airbnb.epoxy.EpoxyRecyclerView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.args
 import im.vector.riotx.R
@@ -33,7 +34,7 @@ import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData
 import kotlinx.android.parcel.Parcelize
-import kotlinx.android.synthetic.main.bottom_sheet_epoxylist_with_title.*
+import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
 @Parcelize
@@ -48,8 +49,8 @@ class DisplayReadReceiptsBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @Inject lateinit var epoxyController: DisplayReadReceiptsController
 
-    @BindView(R.id.bottom_sheet_display_reactions_list)
-    lateinit var epoxyRecyclerView: EpoxyRecyclerView
+    @BindView(R.id.bottomSheetRecyclerView)
+    lateinit var recyclerView: RecyclerView
 
     private val displayReadReceiptArgs: DisplayReadReceiptArgs by args()
 
@@ -58,17 +59,15 @@ class DisplayReadReceiptsBottomSheet : VectorBaseBottomSheetDialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.bottom_sheet_epoxylist_with_title, container, false)
+        val view = inflater.inflate(R.layout.bottom_sheet_generic_list_with_title, container, false)
         ButterKnife.bind(this, view)
         return view
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        epoxyRecyclerView.setController(epoxyController)
-        val dividerItemDecoration = DividerItemDecoration(epoxyRecyclerView.context,
-                                                          LinearLayout.VERTICAL)
-        epoxyRecyclerView.addItemDecoration(dividerItemDecoration)
+        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.adapter = epoxyController.adapter
         bottomSheetTitle.text = getString(R.string.read_at)
         epoxyController.setData(displayReadReceiptArgs.readReceipts)
     }

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

@@ -19,26 +19,34 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import butterknife.BindView
+import butterknife.ButterKnife
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
-import kotlinx.android.synthetic.main.bottom_sheet_generic_recycler_epoxy.*
+import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
 /**
  * Bottom sheet fragment that shows a message preview with list of contextual actions
  */
 class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), MessageActionsEpoxyController.MessageActionsEpoxyControllerListener {
+
     @Inject lateinit var messageActionViewModelFactory: MessageActionsViewModel.Factory
     @Inject lateinit var messageActionsEpoxyController: MessageActionsEpoxyController
 
-    private val viewModel: MessageActionsViewModel by fragmentViewModel(MessageActionsViewModel::class)
+    @BindView(R.id.bottomSheetRecyclerView)
+    lateinit var recyclerView: RecyclerView
 
-    override val showExpanded = true
+    private val viewModel: MessageActionsViewModel by fragmentViewModel(MessageActionsViewModel::class)
 
     private lateinit var actionHandlerModel: ActionsHandler
 
@@ -47,14 +55,16 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.bottom_sheet_generic_recycler_epoxy, container, false)
+        val view = inflater.inflate(R.layout.bottom_sheet_generic_list, container, false)
+        ButterKnife.bind(this, view)
+        return view
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         actionHandlerModel = ViewModelProviders.of(requireActivity()).get(ActionsHandler::class.java)
-
-        bottomSheetEpoxyRecyclerView.setController(messageActionsEpoxyController)
+        recyclerView.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+        recyclerView.adapter = messageActionsEpoxyController.adapter
         messageActionsEpoxyController.listener = this
     }
 

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

@@ -21,9 +21,10 @@ 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
-import com.airbnb.epoxy.EpoxyRecyclerView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -33,7 +34,7 @@ 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
 import im.vector.riotx.features.html.EventHtmlRenderer
-import kotlinx.android.synthetic.main.bottom_sheet_epoxylist_with_title.*
+import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
 /**
@@ -46,8 +47,8 @@ class ViewEditHistoryBottomSheet : VectorBaseBottomSheetDialogFragment() {
     @Inject lateinit var viewEditHistoryViewModelFactory: ViewEditHistoryViewModel.Factory
     @Inject lateinit var eventHtmlRenderer: EventHtmlRenderer
 
-    @BindView(R.id.bottom_sheet_display_reactions_list)
-    lateinit var epoxyRecyclerView: EpoxyRecyclerView
+    @BindView(R.id.bottomSheetRecyclerView)
+    lateinit var recyclerView: RecyclerView
 
     private val epoxyController by lazy {
         ViewEditHistoryEpoxyController(requireContext(), viewModel.dateFormatter, eventHtmlRenderer)
@@ -58,17 +59,17 @@ class ViewEditHistoryBottomSheet : VectorBaseBottomSheetDialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.bottom_sheet_epoxylist_with_title, container, false)
+        val view = inflater.inflate(R.layout.bottom_sheet_generic_list_with_title, container, false)
         ButterKnife.bind(this, view)
         return view
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        epoxyRecyclerView.setController(epoxyController)
-        val dividerItemDecoration = DividerItemDecoration(epoxyRecyclerView.context,
-                LinearLayout.VERTICAL)
-        epoxyRecyclerView.addItemDecoration(dividerItemDecoration)
+        recyclerView.adapter = epoxyController.adapter
+        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        val dividerItemDecoration = DividerItemDecoration(requireContext(), LinearLayout.VERTICAL)
+        recyclerView.addItemDecoration(dividerItemDecoration)
         bottomSheetTitle.text = context?.getString(R.string.message_edits)
     }
 

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

@@ -22,9 +22,10 @@ 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
-import com.airbnb.epoxy.EpoxyRecyclerView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -33,7 +34,7 @@ import im.vector.riotx.core.di.ScreenComponent
 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
-import kotlinx.android.synthetic.main.bottom_sheet_epoxylist_with_title.*
+import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
 import javax.inject.Inject
 
 /**
@@ -45,8 +46,8 @@ class ViewReactionsBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @Inject lateinit var viewReactionsViewModelFactory: ViewReactionsViewModel.Factory
 
-    @BindView(R.id.bottom_sheet_display_reactions_list)
-    lateinit var epoxyRecyclerView: EpoxyRecyclerView
+    @BindView(R.id.bottomSheetRecyclerView)
+    lateinit var recyclerView: RecyclerView
 
     @Inject lateinit var epoxyController: ViewReactionsEpoxyController
 
@@ -55,17 +56,15 @@ class ViewReactionsBottomSheet : VectorBaseBottomSheetDialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.bottom_sheet_epoxylist_with_title, container, false)
+        val view = inflater.inflate(R.layout.bottom_sheet_generic_list_with_title, container, false)
         ButterKnife.bind(this, view)
         return view
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        epoxyRecyclerView.setController(epoxyController)
-        val dividerItemDecoration = DividerItemDecoration(epoxyRecyclerView.context,
-                LinearLayout.VERTICAL)
-        epoxyRecyclerView.addItemDecoration(dividerItemDecoration)
+        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        recyclerView.adapter = epoxyController.adapter
         bottomSheetTitle.text = context?.getString(R.string.reactions)
     }
 

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/bottomSheetRecyclerView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fadeScrollbars="false"
+    android:scrollbars="vertical"
+    tools:itemCount="5"
+    tools:listitem="@layout/item_bottom_sheet_action" />

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

@@ -3,24 +3,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="400dp"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/bottomSheetTitle"
         android:layout_width="match_parent"
-        android:layout_height="44dp"
+        android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:padding="8dp"
         android:textColor="?android:textColorSecondary"
         android:textSize="16sp"
         tools:text="@string/reactions" />
 
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/bottom_sheet_display_reactions_list"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/bottomSheetRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
+        android:layout_height="match_parent"
         android:fadeScrollbars="false"
         android:scrollbars="vertical"
         tools:itemCount="15"

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Min height, else the recycler view is not rendered -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="400dp"
-    android:orientation="vertical">
-
-    <com.airbnb.epoxy.EpoxyRecyclerView
-        android:id="@+id/bottomSheetEpoxyRecyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fadeScrollbars="false"
-        android:scrollbars="vertical"
-        tools:itemCount="5"
-        tools:listitem="@layout/item_bottom_sheet_action" />
-
-</LinearLayout>