Fix rebase issues

Author: jmartinesp

vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt

@@ -128,7 +128,6 @@ import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.composer.CanSendStatus
-import im.vector.app.features.home.room.detail.composer.MessageComposer
 import im.vector.app.features.home.room.detail.composer.MessageComposerAction
 import im.vector.app.features.home.room.detail.composer.MessageComposerFragment
 import im.vector.app.features.home.room.detail.composer.MessageComposerViewModel
@@ -680,7 +679,6 @@ class TimelineFragment :
         modelBuildListener = null
         debouncer.cancelAll()
         views.timelineRecyclerView.cleanup()
-        composerVoiceRecorderCoordinator.destroy()
         super.onDestroyView()
     }
 

vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt

@@ -184,7 +184,7 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
         setupEmojiButton()
 
         views.composerLayout.isGone = vectorPreferences.isRichTextEditorEnabled()
-        views.composerLayout.isVisible = vectorPreferences.isRichTextEditorEnabled()
+        views.richTextComposerLayout.isVisible = vectorPreferences.isRichTextEditorEnabled()
 
         messageComposerViewModel.observeViewEvents {
             when (it) {
@@ -307,7 +307,7 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
             }
 
             override fun onExpandOrCompactChange() {
-                views.composerLayout.views.composerEmojiButton.isVisible = isEmojiKeyboardVisible
+                composer.emojiButton?.isVisible = isEmojiKeyboardVisible
             }
 
             override fun onSendMessage(text: CharSequence) {
@@ -448,11 +448,11 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
 
     private fun handleSendButtonVisibilityChanged(event: MessageComposerViewEvents.AnimateSendButtonVisibility) {
         if (event.isVisible) {
-            views.root.views.sendButton.alpha = 0f
-            views.root.views.sendButton.isVisible = true
-            views.root.views.sendButton.animate().alpha(1f).setDuration(150).start()
+            composer.sendButton.alpha = 0f
+            composer.sendButton.isVisible = true
+            composer.sendButton.animate().alpha(1f).setDuration(150).start()
         } else {
-            views.root.views.sendButton.isInvisible = true
+            composer.sendButton.isInvisible = true
         }
     }
 
@@ -758,7 +758,7 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
                                 requireContext(),
                                 MatrixItem.UserItem(userId, displayName, roomMember?.avatarUrl)
                         )
-                                .also { it.bind(views.composerLayout.views.composerEditText) },
+                                .also { it.bind(composer.editText) },
                         0,
                         displayName.length,
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -772,7 +772,7 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
                 }
                 composer.editText.append(pill)
             } else {
-                composer.editText.text?.insert(views.composerLayout.views.composerEditText.selectionStart, pill)
+                composer.editText.text?.insert(composer.editText.selectionStart, pill)
             }
         }
         focusComposerAndShowKeyboard()

vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerView.kt

@@ -89,7 +89,7 @@ class RichTextComposerView @JvmOverloads constructor(
 
         collapse(false)
 
-        views.composerEditText.addTextChangedListener(object: TextWatcher {
+        views.composerEditText.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable) {
@@ -132,7 +132,7 @@ class RichTextComposerView @JvmOverloads constructor(
     private fun addRichTextMenuItem(@DrawableRes iconId: Int, description: String, action: () -> Unit) {
         val inflater = LayoutInflater.from(context)
         val button = ViewRichTextMenuButtonBinding.inflate(inflater, views.richTextMenu, true)
-        with (button.root) {
+        with(button.root) {
             contentDescription = description
             setImageResource(iconId)
             setOnClickListener {