Cleanup

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

@@ -15,22 +15,16 @@
  */
 package im.vector.riotx.features.home.room.detail.timeline.action
 
-import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import androidx.lifecycle.ViewModelProviders
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import im.vector.riotx.EmojiCompatFontProvider
 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.AvatarRenderer
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import kotlinx.android.synthetic.main.bottom_sheet_generic_recycler_epoxy.*
 import javax.inject.Inject
@@ -40,12 +34,10 @@ import javax.inject.Inject
  */
 class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), MessageActionsEpoxyController.MessageActionsEpoxyControllerListener {
     @Inject lateinit var messageActionViewModelFactory: MessageActionsViewModel.Factory
-    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var messageActionsEpoxyController: MessageActionsEpoxyController
-    @Inject lateinit var fontProvider: EmojiCompatFontProvider
 
     private val viewModel: MessageActionsViewModel by fragmentViewModel(MessageActionsViewModel::class)
 
-    private lateinit var messageActionsEpoxyController: MessageActionsEpoxyController
     private lateinit var actionHandlerModel: ActionsHandler
 
     override fun injectWith(screenComponent: ScreenComponent) {
@@ -60,7 +52,6 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message
         super.onActivityCreated(savedInstanceState)
         actionHandlerModel = ViewModelProviders.of(requireActivity()).get(ActionsHandler::class.java)
 
-        messageActionsEpoxyController = MessageActionsEpoxyController(requireContext(), avatarRenderer, fontProvider)
         bottomSheetEpoxyRecyclerView.setController(messageActionsEpoxyController)
         messageActionsEpoxyController.listener = this
     }
@@ -70,20 +61,6 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message
         dismiss()
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val dialog = super.onCreateDialog(savedInstanceState)
-        // We want to force the bottom sheet initial state to expanded
-        (dialog as? BottomSheetDialog)?.let { bottomSheetDialog ->
-            bottomSheetDialog.setOnShowListener { dialog ->
-                val d = dialog as BottomSheetDialog
-                (d.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet) as? FrameLayout)?.let {
-                    BottomSheetBehavior.from(it).state = BottomSheetBehavior.STATE_COLLAPSED
-                }
-            }
-        }
-        return dialog
-    }
-
     override fun invalidate() = withState(viewModel) {
         messageActionsEpoxyController.setData(it)
     }

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

@@ -15,18 +15,19 @@
  */
 package im.vector.riotx.features.home.room.detail.timeline.action
 
-import android.content.Context
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Success
 import im.vector.riotx.EmojiCompatFontProvider
 import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
 import im.vector.riotx.features.home.AvatarRenderer
+import javax.inject.Inject
 
 /**
  * Epoxy controller for message action list
  */
-class MessageActionsEpoxyController(private val context: Context,
+class MessageActionsEpoxyController @Inject constructor(private val stringProvider: StringProvider,
                                                         private val avatarRenderer: AvatarRenderer,
                                                         private val fontProvider: EmojiCompatFontProvider) : TypedEpoxyController<MessageActionState>() {
 
@@ -51,13 +52,13 @@ class MessageActionsEpoxyController(private val context: Context,
             bottomSheetItemSendState {
                 id("send_state")
                 showProgress(true)
-                text(context.getString(R.string.event_status_sending_message))
+                text(stringProvider.getString(R.string.event_status_sending_message))
             }
         } else if (state.informationData.sendState.hasFailed()) {
             bottomSheetItemSendState {
                 id("send_state")
                 showProgress(false)
-                text(context.getString(R.string.unable_to_send_message))
+                text(stringProvider.getString(R.string.unable_to_send_message))
                 drawableStart(R.drawable.ic_warning_small)
             }
         }
@@ -73,7 +74,7 @@ class MessageActionsEpoxyController(private val context: Context,
                 id("quick_reaction")
                 fontProvider(fontProvider)
                 texts(state.quickStates()?.map { it.reaction }.orEmpty())
-                selecteds(state.quickStates()?.map { it.isSelected }.orEmpty())
+                selecteds(state.quickStates.invoke().map { it.isSelected })
                 listener(object : BottomSheetItemQuickReactions.Listener {
                     override fun didSelect(emoji: String, selected: Boolean) {
                         listener?.didSelectMenuAction(SimpleAction.QuickReact(state.eventId, emoji, selected))

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

@@ -22,7 +22,6 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:fadeScrollbars="false"
-        android:orientation="vertical"
         android:scrollbars="vertical"
         tools:itemCount="15"
         tools:listitem="@layout/item_simple_reaction_info" />

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

@@ -14,7 +14,6 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:fadeScrollbars="false"
-        android:orientation="vertical"
         android:scrollbars="vertical"
         tools:itemCount="5"
         tools:listitem="@layout/item_bottom_sheet_action" />

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

@@ -11,8 +11,7 @@
     android:paddingLeft="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingRight="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp"
+    android:paddingBottom="8dp">
-    tools:layout_height="50dp">
 
     <ImageView
         android:id="@+id/action_icon"