Commit 744f2f88 authored by Leonardo Aramaki's avatar Leonardo Aramaki

Remove ScrollingMovementMethod from composer editor

parent ce085768
...@@ -13,7 +13,6 @@ import android.support.v4.app.Fragment ...@@ -13,7 +13,6 @@ import android.support.v4.app.Fragment
import android.support.v7.widget.DefaultItemAnimator import android.support.v7.widget.DefaultItemAnimator
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.text.method.ScrollingMovementMethod
import android.view.* import android.view.*
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.chatroom.presentation.ChatRoomPresenter import chat.rocket.android.chatroom.presentation.ChatRoomPresenter
...@@ -274,7 +273,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiFragment.EmojiKeyboardLi ...@@ -274,7 +273,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiFragment.EmojiKeyboardLi
input_container.setVisible(false) input_container.setVisible(false)
} else { } else {
var playAnimation = true var playAnimation = true
text_message.movementMethod = ScrollingMovementMethod()
text_message.asObservable(0) text_message.asObservable(0)
.subscribe({ t -> .subscribe({ t ->
if (t.isNotEmpty() && playAnimation) { if (t.isNotEmpty() && playAnimation) {
......
...@@ -4,13 +4,17 @@ import android.content.Context ...@@ -4,13 +4,17 @@ import android.content.Context
import android.support.v7.widget.AppCompatEditText import android.support.v7.widget.AppCompatEditText
import android.util.AttributeSet import android.util.AttributeSet
import android.view.KeyEvent import android.view.KeyEvent
import android.view.MotionEvent
class ComposerEditText : AppCompatEditText { class ComposerEditText : AppCompatEditText {
var listener: ComposerEditTextListener? = null var listener: ComposerEditTextListener? = null
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
super(context, attrs, defStyleAttr) super(context, attrs, defStyleAttr) {
isFocusable = true
isFocusableInTouchMode = true
isClickable = true
isLongClickable = true
}
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, android.support.v7.appcompat.R.attr.editTextStyle) constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, android.support.v7.appcompat.R.attr.editTextStyle)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment